feature: 设备唤醒设置分包

app.json

@@ -3,13 +3,7 @@
     "pages/pageA/index/index",
     "pages/pageA/login/login",
     "pages/pageA/deviceList/deviceList",
-
-    "pages/repeat/repeat",
-    "pages/deviceWake/deviceWake",
-    "pages/channelDetails/channelDetails",
     "pages/download/download",
-    "pages/wakeList/wakeList",
-    "pages/deviceDetail/detail",
     "pages/piano/wallpaper/wallpaper",
     "pages/ota/ota",
     "pages/piano/cropper/cropper",
@@ -31,7 +25,17 @@
     {
       "root": "pages/pageC/",
       "pages": [
-        "aboutInfo/aboutInfo"
+        "aboutInfo/aboutInfo",
+        "channelDetails/channelDetails",
+        "deviceDetail/detail"
+      ]
+    },
+    {
+      "root": "pages/pageD/",
+      "pages": [
+        "repeat/repeat",
+        "deviceWake/deviceWake",
+        "wakeList/wakeList"
       ]
     }
   ],

pages/channelDetails/channelDetails.js

@@ -1,45 +0,0 @@
-// pages/channelDetails/channelDetails.js
-const {
-  pageByDevice
-} = require('./../../utils/api.js');
-const app = getApp();
-Page({
-
-  data: {
-    nvabarData: {
-      showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
-      title: '', //导航栏 中间的标题
-    },
-    navBarHeight: app.globalData.navBarHeight,
-    MenuButtonTop: app.globalData.MenuButtonTop,
-    thisChannel: {},
-    pageIndex: 1,
-    channelList: [],
-  },
-
-  onLoad() {
-    var that = this;
-    wx.getStorage({
-      key: "channelDeta",
-      success(r) {
-        that.setData({
-          thisChannel: r.data
-        });
-
-        pageByDevice({
-          channelId: r.data.channelId,
-          pageNum: 1,
-          pageSize: 300
-        }).then((res) => {
-          that.setData({
-            channelList: res.records
-          })
-          wx.removeStorage({
-            key: 'channelDeta',
-          })
-        })
-      }
-    })
-  },
-
-})

pages/channelDetails/channelDetails.json

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

pages/channelDetails/channelDetails.wxml

@@ -1,27 +0,0 @@
-<!--pages/channelDetails/channelDetails.wxml-->
-<view class="channelDetails">
-  <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>
-  <view class="content">
-    <view class="headInfo">
-      <view class="channelInfo">
-        <view class="pic">
-          <image src="{{thisChannel.channelPic}}"></image>
-        </view>
-        <view class="textInfo">
-          <text>FM.{{thisChannel.channelNum !== null ? (thisChannel.channelNum < 10 ? "0" + (thisChannel.channelNum) : thisChannel.channelNum) : 00}}</text>
-              <text>{{thisChannel.channelName}}</text>
-        </view>
-      </view>
-      <!-- <image class="bgPic_1" src="./../../img/pd1.png" mode="heightFix"></image> -->
-      <image class="bgPic_3" src="./../../img/pd3.png" mode="widthFix"></image>
-      <image class="bgPic_2" src="./../../img/pd2.png" mode="heightFix"></image>
-    </view>
-    <view class="list" style="height: calc(100vh - {{navBarHeight}}px - 260rpx);">
-      <view class="info" wx:for="{{channelList}}">
-        <image src="{{item.audioPic}}" mode="scaleToFill"></image>
-        <text>{{item.audioName}}</text>
-      </view>
-    </view>
-  </view>
-</view>

pages/channelDetails/channelDetails.wxss

@@ -1,91 +0,0 @@
-/* pages/channelDetails/channelDetails.wxss */
-.headInfo{
-  width: 100vw;
-  height: 260rpx;
-  background: rgba(0, 1, 3, 0.8);
-  filter: blur(0px);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-}
-.headInfo .channelInfo{
-  width: calc(100vw - 64rpx);
-  height: 160rpx;
-  display: flex;
-  align-items: center;
-}
-.headInfo .channelInfo .pic{
-  width: 160rpx;
-  height: 160rpx;
-  margin-right: 20rpx;
-}
-.headInfo .channelInfo .pic image{
-  width: 160rpx;
-  height: 160rpx;
-  border-radius: 18rpx;
-}
-.headInfo .channelInfo .textInfo{
-  height: 160rpx;
-  display: flex;
-  justify-content: center;
-  flex-direction: column;
-}
-.headInfo .channelInfo .textInfo text:first-child{
-  font-size: 48rpx;
-  font-weight: 600;
-  color: #FFFFFF;
-  line-height: 66rrpx;
-}
-.headInfo .channelInfo .textInfo text:last-child{
-  font-size: 30rpx;
-  font-weight: 500;
-  color: #FFFFFF;
-  line-height: 38rpx;
-  text-shadow: 0px 4rpx 8rpx rgba(0,0,0,0.5);
-  opacity: 0.8;
-}
-.headInfo>image{
-  position: absolute;
-}
-.headInfo .bgPic_1{
-  height: 48rpx;
-  top: 30rpx;
-  right: 30rpx;
-}
-.headInfo .bgPic_2{
-  height: 172rpx;
-  bottom: -6rpx;
-  left: 94rpx;
-}
-.headInfo .bgPic_3{
-  width: 100vw;
-  bottom: 0rpx;
-  left:0rpx;
-}
-.list{
-  padding: 0 6rpx;
-  overflow: auto;
-}
-.list .info{
-  margin: 40rpx 26rpx 0;
-  width: 192rpx;
-  float: left;
-}
-.list .info image{
-  height: 192rpx;
-  width: 192rpx;
-  border-radius: 18rpx;
-}
-.list .info text{
-  width: 192rpx;
-  height: 76rpx;
-  font-size: 30rpx;
-  font-weight: 400;
-  color: #353535;
-  line-height: 38rpx;
-  display:-webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp:2;
-  overflow:hidden;
-}

pages/deviceDetail/detail.json

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

pages/pageB/deviceConMode/deviceConMode.js

@@ -52,18 +52,12 @@ Page({
     console.log("选择模式", type)
     ///蓝牙模式
     if (type == 1) {
-      // let device = e.currentTarget.dataset.data
-      let json = JSON.stringify(this.data.connectDevice)
-      routeUtil.jumpParam(route_constant.connectBle, json)
-      // wx.navigateTo({
-      //   url: './../deviceDetail/detail',
-      // });
+      var param = '?param=' + JSON.stringify(this.data.connectDevice);
+      routeUtil.jumpParam(route_constant.connectBle, param);
     }
     ///Wifi模式
     else if (type == 2) {
-      wx.navigateTo({
-        url: './../deviceConnect0/deviceConnect0',
-      });
+      routeUtil.jump(route_constant.deviceConnect0);
     } else if (type == 3) {
       // btHelper.stopSearch()
     }

pages/pageC/channelDetails/channelDetails.js

@@ -0,0 +1,66 @@
+// pages/pageC/channelDetails/channelDetails.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/pageC/channelDetails/channelDetails.json

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

pages/pageC/channelDetails/channelDetails.wxml

@@ -0,0 +1,2 @@
+<!--pages/pageC/channelDetails/channelDetails.wxml-->
+<text>pages/pageC/channelDetails/channelDetails.wxml</text>

pages/pageC/channelDetails/channelDetails.wxss

@@ -0,0 +1 @@
+/* pages/pageC/channelDetails/channelDetails.wxss */

pages/deviceDetail/detail.js

@@ -1,15 +1,15 @@
 const {
   BtHelper
-} = require('../../devices/bt_helper');
+} = require('../../../devices/bt_helper');
 const {
   deviceVersion
-} = require('../../request/deviceListRequest')
+} = require('../../../request/deviceListRequest')
 import {
   EnumCmdEvent,
   CmdEvent
-} from '../../devices/cmd_key_event';
-import EventManager from '../../utils/event_bus'
-import route_util from '../../utils/route_util';
+} from '../../../devices/cmd_key_event';
+import EventManager from '../../../utils/event_bus'
+import route_util from '../../../utils/route_util';
 
 Page({
   data: {

pages/pageC/deviceDetail/detail.json

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

pages/deviceDetail/detail.wxml

@@ -1,4 +1,4 @@
-<!-- pages/deviceDetail/detail.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>
     <view class="img_section">

pages/deviceWake/deviceWake.js

@@ -1,13 +1,13 @@
 const app = getApp();
 const {
   formatNumber
-} = require('./../../utils/util.js');
+} = require('../../../utils/util.js');
 const {
   deviceWakedetail
-} = require('./../../utils/api.js');
+} = require('../../../utils/api.js');
 
-import lexin_devices from '../../utils/lexin/devices.js';
-import lexin_util from '../../utils/lexin/util.js';
+import lexin_devices from '../../../utils/lexin/devices.js';
+import lexin_util from '../../../utils/lexin/util.js';
 
 Page({
   data: {