feature：修改冲突的报错。详情页的时间

devices/bluetooth/bt_cmd.js

@@ -122,12 +122,19 @@ class BtCmd {
     }
 
     static setSleepAfterPlayPause(time) {
-        const hours = Math.floor(time / (1000 * 60 * 60));
-        const minutes = Math.floor((time % (1000 * 60 * 60)) / (1000 * 60));
-        const seconds = Math.floor((time % (1000 * 60)) / 1000);
-        console.log(`${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`);
+        if (time > 0) {
+            let day = (60 * 60 * 24)
+            let hour = 60 * 60
+            const hours = Math.floor(time / day);
+            const minutes = Math.floor((time % day) / hour);
+            const seconds = Math.floor((time % day % hour / 60));
+            console.log(`${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`);
+
+            return this._build(CmdRtc.setSleepAfterPlayPause, [hours, minutes, seconds]);
+        } else {
+            return this._build(CmdRtc.setSleepAfterPlayPause, [-1]);
+        }
 
-        return this._build(CmdRtc.setSleepAfterPlayPause, [hours, minutes, seconds]);
     }
 
     // 设置休眠

pages/connectBle/connectBle.js

@@ -67,7 +67,7 @@ Page({
     let typeList = that.data.connectDevice.typeList ?? []
     let bleTypes = typeList.find(v => v.connectType == 1)
     let deviceLinkResp = bleTypes.deviceLinkResp ?? {}
-
+  
     console.log("搜索状态", bleType)
     switch (bleType) {
       case 0:
@@ -112,7 +112,7 @@ Page({
       subTips: subTips,
       buttonTips: buttonTips,
       connectStatus: bleType,
-      deviceImg: deviceImg
+      deviceImg: that.data.deviceImg
     })
   },
 
@@ -171,7 +171,7 @@ Page({
         console.log('已连接的蓝牙设备:', element);
         that.didFindDevice(element)
       });
-    } else {}
+    } else { }
     return connectedDevices;
   },
 

pages/deviceDetail/detail.js

@@ -52,16 +52,38 @@ Page({
       //   url: '/pages/ota/ota' + "?param=" + param
       // });
       route_util.jumpParam('/pages/ota/ota', newParam)
+    } else {
+      wx.showToast({
+        title: '没有新版本',
+      })
     }
   },
   powerTap(e) {
     console.log(e)
     let btHelper = BtHelper.getInstance();
-    btHelper.setPauseSleep(this.data.powerOpen ? 60 * 20 : -1)
+    btHelper.setPauseSleep(!this.data.powerOpen ? 60 * 20 : -1)
     this.setData({
       powerOpen: !this.data.powerOpen
     })
   },
+  questionTap() {
+    wx.showModal({
+      title: '省电模式',
+      content: '开启省电模式，设备无蓝牙连接或内容播放20分钟后进入自动休眠，任意按键可唤醒。',
+      showCancel: false,
+      complete: (res) => {
+        if (res.cancel) {
+
+        }
+
+        if (res.confirm) {
+          // setSleepAfterPlayPause
+          const btHelper = BtHelper.getInstance();
+          btHelper.setPauseSleep(1200)
+        }
+      }
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */
@@ -97,24 +119,6 @@ Page({
     }, this)
   },
 
-  questionTap() {
-    wx.showModal({
-      title: '省电模式',
-      content: '开启省电模式，设备无蓝牙连接或内容播放20分钟后进入自动休眠，任意按键可唤醒。',
-      showCancel: false,
-      complete: (res) => {
-        if (res.cancel) {
-
-        }
-
-        if (res.confirm) {
-          // setSleepAfterPlayPause
-          const btHelper = BtHelper.getInstance();
-          btHelper.setPauseSleep(1200)
-        }
-      }
-    })
-  },
   onUnload() {
     EventManager.removeNotification(CmdEvent.eventName, this)
   },

pages/piano/wallpaper/wallpaper.js

@@ -7,6 +7,7 @@ const {
 } = require('../../../devices/bt_helper');
 const { BtCmd } = require('../../../devices/bluetooth/bt_cmd');
 import EventManager from '../../../utils/event_bus'
+import { EnumCmdEvent, CmdEvent } from '../../../devices/cmd_key_event';
 
 // import EventManager from '../../utils/event_bus'
 
@@ -200,7 +201,7 @@ Page({
     let _this = this;
     EventManager.addNotification(CmdEvent.eventName, function (event) {
       let name = event.name;
-      console.log("OTA页：", event)
+      console.log("壁纸页：", event)
       switch (name) {
         case EnumCmdEvent.wallPaper:
           let otaCmd = event.wallPaper;

pages/piano/wallpaper/wallpaper.wxml

@@ -1,7 +1,7 @@
 <!-- pages/piano/wallpaper/wallpaper.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">
+    <view wx:if="{{imageList}}" class="img_section">
         <image src="{{topImg.pic}}" class="select_img"></image>
         <image src="../../../images/common/icon_sel.png" class="select_icon"></image>
     </view>