소스 검색

feature: 合并方法类到contants

332777428@qq.com 3 달 전
부모
커밋
2f3f5ebc07
4개의 변경된 파일17개의 추가작업 그리고 24개의 파일을 삭제
  1. 11 17
      pages/pageA/deviceList/deviceList.js
  2. 5 5
      pages/pageB/deviceConnect2/deviceConnect2.js
  3. 0 1
      request/deviceListRequest.js
  4. 1 1
      utils/blue_ble/util.js

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 11 - 17
pages/pageA/deviceList/deviceList.js


+ 5 - 5
pages/pageB/deviceConnect2/deviceConnect2.js

@@ -2,7 +2,7 @@ const app = getApp();
 let xBlufi = require("../../../utils/blufi/xBlufi.js");
 import strings from '../../../utils/strings.js';
 import lexin_devices from '../../../utils/lexin/devices';
-import junzheng_util from '../../../utils/junzheng/util';
+import junzhengUtil from '../../../utils/junzheng/util';
 import routeUtil from '../../../utils/routeUtil.js';
 import routePath from '../../../utils/routePath.js';
 
@@ -109,8 +109,8 @@ Page({
           var devicesList = options.data.filter((v) => {
             var name = v.name;
             var isLexin = name.indexOf(lexin_devices.leXin) !== -1;
-            var isJungzheng1 = junzheng_util.isJungzheng1(name);
-            var isJungzheng2 = junzheng_util.isJungzheng2(name);
+            var isJungzheng1 = junzhengUtil.isJungzheng1(name);
+            var isJungzheng2 = junzhengUtil.isJungzheng2(name);
             return isLexin || isJungzheng1 || isJungzheng2;
             ///2AXD
             // return v.name == "AIrSMArT_d0311004155e";
@@ -205,8 +205,8 @@ Page({
 
     var name = devicesList[0].name;
     var deviceId = devicesList[0].deviceId;
-    var isJungzheng1 = junzheng_util.isJungzheng1(name);
-    var isJungzheng2 = junzheng_util.isJungzheng2(name);
+    var isJungzheng1 = junzhengUtil.isJungzheng1(name);
+    var isJungzheng2 = junzhengUtil.isJungzheng2(name);
 
     if (isJungzheng1 || isJungzheng2) {
       var param = 'deviceId=' + deviceId + '&name=' + name + "&param=" + JSON.stringify(that.data.connectDevice)

+ 0 - 1
request/deviceListRequest.js

@@ -1,4 +1,3 @@
-// const { request } = require('../utils/util.js')
 const requestUtil = require('../utils/requestUtil');
 
 module.exports = {

+ 1 - 1
utils/blue_ble/util.js

@@ -1,5 +1,5 @@
 const Manager = require('./manager');
-const BtParse = require('../../devices/bluetooth/bt_parse');
+
 
 /// MW-X4 (BZK)
 class BleUtil {