feature: 加入设备wifi、4G、蓝牙连接分包

app.json

@@ -4,7 +4,6 @@
     "pages/pageA/login/login",
     "pages/pageA/deviceList/deviceList",
     "pages/channelDetail/channelDetail",
-    "pages/connectBle/connectBle",
     "pages/setWifi/setWifi",
     "pages/vipPurchase/vipPurchase",
     "pages/vipRecord/vipRecord",
@@ -16,6 +15,7 @@
       "pages": [
         "repeat/repeat",
         "wakeList/wakeList",
+        "connectBle/connectBle",
         "deviceMode/deviceMode",
         "deviceWake/deviceWake",
         "deviceConnect0/deviceConnect0",

devices/ble_manager.js

@@ -343,7 +343,7 @@ class bleManager {
     const routeRoot = require('../utils/routeRoot');
 
     const indexRoot = routeRoot.index;
-    const connectBleRoot = routeRoot.connectBleRoot;
+    const connectBleRoot = routeRoot.connectBle;
     var lastPageRoute = routeUtil.getLastPageRoute();
     if (lastPageRoute != indexRoot && lastPageRoute != connectBleRoot) {
       console.log("搜索蓝牙设备失败，请返回首页0");

pages/connectBle/connectBle.json

@@ -1,5 +0,0 @@
-{
-  "usingComponents": {
-    "nav-bar": "./../../components/navbar/navbar"
-  }
-}

pages/connectBle/connectBle.js

@@ -1,9 +1,9 @@
 const {
   BtHelper
-} = require('../../devices/bt_helper');
+} = require('../../../devices/bt_helper');
 
-import routeRoot from '../../utils/routeRoot.js'
-import routeUtil from '../../utils/routeUtil.js';
+import routeRoot from '../../../utils/routeRoot.js'
+import routeUtil from '../../../utils/routeUtil.js';
 Page({
   data: {
     connectDevice: {},

pages/pageB/connectBle/connectBle.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "nav-bar": "./../../../components/navbar/navbar"
+  }
+}

pages/connectBle/connectBle.wxml

@@ -1,4 +1,3 @@
-<!-- pages/connectBle/connectBle.wxml -->
 <view class="container">
   <nav-bar bind:goBack="_goBack" nav-bgc-class="ex-nav-bgc-class" nav-title-class="ex-nav-title-class" ex-back-pre="ex-back-pre" navbar-data='{{nvabarData}}'></nav-bar>
   <image class="device_pic" src="{{deviceImg}}" mode="aspectFill" />

pages/connectBle/connectBle.wxss

@@ -1,4 +1,3 @@
-/* pages/connectBle/connectBle.wxss */
 .container {
 	position: relative;
 	height: 100vh;

utils/routePath.js

@@ -8,6 +8,7 @@ const deviceList = "../../pageA/deviceList/deviceList";
 /// B
 const repeat = "../../pageB/repeat/repeat";
 const wakeList = "../../pageB/wakeList/wakeList";
+const connectBle = "../../pageB/connectBle/connectBle";
 const deviceMode = "../../pageB/deviceMode/deviceMode";
 const deviceWake = "../../pageB/deviceWake/deviceWake";
 const deviceConnect0 = "../../pageB/deviceConnect0/deviceConnect0";
@@ -32,7 +33,6 @@ const deviceDetail = "../../piano/deviceDetail/deviceDetail";
 
 /// 抽奖记录
 const connectMode = "../deviceConMode/index";
-const connectBle = "../connectBle/connectBle";
 const setWifi = "../setWifi/setWifi";
 
 module.exports = {
@@ -43,6 +43,7 @@ module.exports = {
   /// B
   repeat: repeat,
   wakeList: wakeList,
+  connectBle: connectBle,
   deviceMode: deviceMode,
   deviceWake: deviceWake,
   deviceConnect0: deviceConnect0,

utils/routeRoot.js

@@ -6,9 +6,7 @@ const login = "pages/pageA/login/login";
 
 /// B
 const deviceWake = "pages/pageB/deviceWake/deviceWake";
-
-
-const connectBleRoot = "pages/connectBle/connectBle";
+const connectBle = "pages/pageB/connectBle/connectBle";
 
 
 module.exports = {
@@ -17,6 +15,5 @@ module.exports = {
   login: login,
   /// B
   deviceWake: deviceWake,
-
-  connectBleRoot: connectBleRoot,
+  connectBle: connectBle,
 }