feature：修改配网的型号判断。默认休眠的指令问题

app.js

@@ -82,7 +82,7 @@ App({
     update.update();
   },
 
-  onHide: function () {},
+  onHide: function () { },
 
   ///连接设备
   connect() {
@@ -127,7 +127,7 @@ App({
 
     // 重连
     that.globalData.client.on("reconnect", function (errr) {
-      console.log("reconnect的回调==" + JSON.stringify(errr))
+      // console.log("reconnect的回调==" + JSON.stringify(errr))
       var page = getCurrentPages()[getCurrentPages().length - 1];
       if (!strings.isEmpty(page.mqttCallback)) {
         page.mqttCallback("reconnect")
@@ -136,7 +136,7 @@ App({
 
     // 离线回调
     that.globalData.client.on("offline", function (errr) {
-      console.log("offline的回调==" + JSON.stringify(errr))
+      // console.log("offline的回调==" + JSON.stringify(errr))
       var page = getCurrentPages()[getCurrentPages().length - 1];
       if (!strings.isEmpty(page.mqttCallback)) {
         page.mqttCallback("offline")
@@ -145,7 +145,7 @@ App({
 
     // 错误回调
     that.globalData.client.on("error", function (error) {
-      console.log("错误码的回调==" + JSON.stringify(errr))
+      // console.log("错误码的回调==" + JSON.stringify(errr))
       var page = getCurrentPages()[getCurrentPages().length - 1];
       if (!strings.isEmpty(page.mqttCallback)) {
         page.mqttCallback("error", {})

devices/bluetooth/bt_cmd.js

@@ -124,15 +124,16 @@ class BtCmd {
 
     static setSleepAfterPlayPause(time) {
         if (time > 0) {
-            let day = (60 * 60)
-            let hour = 60
-            const hours = time / day;
-            const minutes = (time % day) / hour;
-            const seconds = (time % day % hour);
+            // let day = (60 * 60)
+            // let hour = 60
+            // const hours = time / day;
+            // const minutes = (time % day) / hour;
+            // const seconds = (time % day % hour);
             // 将小时、分钟和秒转换为16进制字符串并转为大写
             //            console.log(`${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`);
-            console.log("休眠:", hour, minutes, seconds)
-            return this._build(CmdRtc.setSleepAfterPlayPause, [hours, minutes, seconds]);
+            // console.log("休眠:", hour, minutes, seconds)
+            // 跟app一样错误的处理方式
+            return this._build(CmdRtc.setSleepAfterPlayPause, [time]);
         } else {
             return this._build(CmdRtc.setSleepAfterPlayPause, [0]);
         }

pages/deviceConMode/index.js

@@ -50,6 +50,9 @@ Page({
   },
 
   nextTap(e) {
+    if (this.nullTips()) {
+      return
+    }
     let device = this.data.typeList[0];
     let type = device.type ?? 0;
     console.log("选择模式", type)
@@ -102,25 +105,36 @@ Page({
     })
 
   },
-
+  nullTips() {
+    if (this.data.typeList.length === 0) {
+      wx.showToast({
+        title: '暂不支持该设备配网',
+        icon: 'none',
+      })
+      return true
+    }
+    return false
+  },
   onLoad: function (options) {
-    let json = JSON.parse(options.param) || {}
-    console.log(json)
-    let device = json
+    let device = JSON.parse(options.param) || {}
+    console.log("配网配对的设备：", device)
     if (Object.keys(device).length === 0) {
       wx.showToast({
         title: '设备数据为空，返回刷新列表试试看',
       })
       return;
     }
+    let _this = this
+    let isWifi = device.clientType != "MW-S2";
+    let isS2 = device.clientType === "MW-S2";
 
-    let _typeList = json.typeList.map(e => {
-      return {
+    let _typeList = device.typeList
+      .filter(e => (isWifi && e.type == 2) || isS2)
+      .map(e => ({
         icon: "../../images/device/mode_" + e.type + ".png",
-        text: this.getModeName(e),
+        text: _this.getModeName(e),
         type: e.type
-      }
-    })
+      }));
 
     var list = []
 
@@ -133,6 +147,7 @@ Page({
       typeList: list,
       connectDevice: device
     })
+    this.nullTips()
 
   },
 

pages/deviceConMode/index.wxml

@@ -17,6 +17,6 @@
       </block>
     </view>
   </view>
-  <view class="setDeviceModelTips">开启后点击“下一步”</view>
+  <view wx:if="{{typeList.length > 0}}" class="setDeviceModelTips">开启后点击“下一步”</view>
   <view class="main_color connect_button" bind:tap="nextTap">连接设备</view>
 </view>

pages/deviceConMode/index.wxss

@@ -2,7 +2,6 @@
 
 .main {
   position: relative;
-  width: 100vw;
   height: 100vh;
 }
 
@@ -14,7 +13,7 @@
   height: 100%;
   z-index: -1;
   background-size: cover;
-  background-position: center;
+
 }
 
 .select_tips {

pages/deviceDetail/detail.js

@@ -116,11 +116,9 @@ Page({
     const btHelper = BtHelper.getInstance();
     let isShowOta = device.clientType === 'MW-S2(BLE)' || device.clientType === 'MW-S2'
     if (isShowOta) {
-      // btHelper.getVersion()
+      btHelper.getVersion()
     }
-    // btHelper.getPauseSleep()
-
-    this.checkOtaVersion(device)
+    btHelper.getPauseSleep()
 
     let _this = this;
     EventManager.addNotification(CmdEvent.eventName, function (event) {