ソースを参照

feature: 对页时间获取当前时间类修改名称

332777428@qq.com 4 ヶ月 前
コミット
41f05624cc
3 ファイル変更6 行追加6 行削除
  1. 4 4
      devices/ble_manager.js
  2. 2 2
      pages/index/index.js
  3. 0 0
      utils/timeUtil.js

+ 4 - 4
devices/ble_manager.js

@@ -311,7 +311,7 @@ class bleManager {
     var that = this;
 
     ///限制搜索没有打开蓝牙一直询问打开蓝牙
-    const time_util = require('./../utils/time_util');
+    const time_util = require('../utils/timeUtil');
     if (!that.isAvailable) {
       if (callBackConnect == null) {
         return;
@@ -391,7 +391,7 @@ class bleManager {
 
   search(connectWillDevice, boolean, callBackConnect) {
     var that = this;
-    const time_util = require('./../utils/time_util');
+    const timeUtil = require('../utils/timeUtil');
     wx.startBluetoothDevicesDiscovery({
       allowDuplicatesKey: true,
       success: function (res) {
@@ -399,7 +399,7 @@ class bleManager {
         that.getConnectedDevices();
 
         that.doStartScaning = false;
-        that.requestBlueTime = time_util.getCurrentMills();
+        that.requestBlueTime = timeUtil.getCurrentMills();
         if (boolean != null) {
           boolean(true);
         }
@@ -410,7 +410,7 @@ class bleManager {
       fail(err) {
         console.log("开始搜索设备失败", err);
         that.doStartScaning = false;
-        that.requestBlueTime = time_util.getCurrentMills();
+        that.requestBlueTime = timeUtil.getCurrentMills();
         if (err.errMsg.indexOf("location") >= 0) {
           wx.showToast({
             title: '搜索失败,请检查下手机设置的微信定位权限是否开启',

+ 2 - 2
pages/index/index.js

@@ -5,7 +5,7 @@ const {
   getBanner
 } = require('../../utils/api.js');
 
-import time_util from '../../utils/time_util.js';
+import timeUtil from '../../utils/timeUtil.js';
 import strings from '../../utils/strings.js';
 import store from '../../utils/store.js';
 import routePath from '../../utils/routePath.js';
@@ -1178,7 +1178,7 @@ Page({
   },
 
   getGreetBuNickName(nickName) {
-    var greeting = time_util.getGreet();
+    var greeting = timeUtil.getGreet();
     if (nickName != "" && nickName != "未登录") {
       greeting = greeting + ',' + nickName;;
     }

utils/time_util.js → utils/timeUtil.js