feature：修改进度条的UI，指令的解析

devices/bluetooth/bt_cmd.js

@@ -129,11 +129,12 @@ class BtCmd {
             const hours = Math.floor(time / day);
             const minutes = Math.floor((time % day) / hour);
             const seconds = Math.floor((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]);
         } else {
-            return this._build(CmdRtc.setSleepAfterPlayPause, [-1]);
+            return this._build(CmdRtc.setSleepAfterPlayPause, [0]);
         }
 
     }

devices/bluetooth/bt_parse.js

@@ -170,7 +170,7 @@ class BtParse {
         const type = cmd[6];
         const value = cmd[8];
         // mqttAddDebugCmd("收到蓝牙指令：" + cmd);
-        console.log("收到控制指令：", cmd, type)
+        // console.log("收到控制指令：", cmd, type)
 
         switch (type) {
             // 校验设备
@@ -407,10 +407,13 @@ class BtParse {
             case CmdRtc.querySleepAfterPlayPause:
             case CmdRtc.setSleepAfterPlayPause:
                 {
-                    const hour = parseInt(cmd[8], 16) ?? 0;
-                    const minutes = parseInt(cmd[9], 16) ?? 0;
-                    const seconds = parseInt(cmd[10], 16) ?? 0;
+                    let hour = cmd[8] ?? 0;
+                    let minutes = cmd[9] ?? 0;
+                    var seconds = cmd[10] ?? 0;
                     console.log("hour=====", hour, "minutes=====", minutes, "seconds=====", seconds)
+                    hour = hour > 24 ? 0 : hour;
+                    minutes = minutes > 60 ? 0 : minutes;
+                    seconds = seconds > 60 ? 0 : seconds;
                     let allSeconds = hour * 3600 + minutes * 60 + seconds;
                     //            [84, 68, 68, 72, 1, 12, 90, 4, 0, 14, 0, 72]
                     EventManager.fire(CmdEvent.pauseSleep({ pauseSleep: allSeconds }));

pages/deviceDetail/detail.js

@@ -56,7 +56,7 @@ Page({
   powerTap(e) {
     console.log(e)
     let btHelper = BtHelper.getInstance();
-    btHelper.setPauseSleep(!this.data.powerOpen ? 1200 : -1)
+    btHelper.setPauseSleep(!this.data.powerOpen ? 1200 : 0)
     this.setData({
       powerOpen: !this.data.powerOpen
     })
@@ -121,7 +121,7 @@ Page({
 
           _this.checkOtaVersion(_this.data.device);
           break;
-        case EnumCmdEvent.setPauseSleep:
+        case EnumCmdEvent.authSleepStatus:
           let value = event.pauseSleep;
           console.log("详情页2：", value)
           _this.setData({

pages/deviceDetail/detail.wxml

@@ -2,7 +2,7 @@
 <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">
-        <image src="{{device.image}}" class="avatar"></image>
+        <image src="{{device.img}}" class="avatar"></image>
         <!-- <image src="https://music-play.oss-cn-shenzhen.aliyuncs.com/device/20220909100711728016597.png" class="avatar"></image> -->
     </view>
     <view class="section">

pages/ota/ota.wxml

@@ -22,7 +22,7 @@
     <view class="content">
         <view class="pro_title">正在升级</view>
         <view class="progress-container">
-            <progress class="progress" percent="{{progress}}" activeColor="#6546A3" backgroundColor="rgba(101,70,163,0.16)" stroke-width="26" border-radius="13" />
+            <progress class="progress" border-radius="16rpx" stroke-width="32rpx" percent="{{progress}}" activeColor="#6546A3" backgroundColor="rgba(101,70,163,0.16)" stroke-width="26" border-radius="13" />
             <view class="progress-text" style="left: {{progressTextLeft}};">
                 {{progressPercent}}%
             </view>

pages/ota/ota.wxss

@@ -78,7 +78,6 @@
 
 .progress {
 	width: 100%;
-	height: 32rpx;
 }
 
 .progress-text {

pages/piano/wallpaper/wallpaper.wxml

@@ -21,7 +21,7 @@
     </view> -->
     <!-- <image-cropper bind:close="hideCut" cutRatio="1" wx:if="{{showCrop}}" imageSrc="{{imageSrc}}" /> -->
     <view wx:if="{{showProgress}}" class="progress-container">
-        <progress class="progress"  percent="{{progress}}" activeColor="#6546A3" backgroundColor="rgba(0,0,0,0.4)" stroke-width="26" border-radius="13" />
+        <progress class="progress" border-radius="26rpx" stroke-width="52rpx" percent="{{progress}}" activeColor="#6546A3" backgroundColor="rgba(0,0,0,0.4)" stroke-width="26" border-radius="13" />
         <view class="progress-text">保存壁纸中…{{progressPercent}}%</view>
     </view>
 </view>

pages/piano/wallpaper/wallpaper.wxss

@@ -92,24 +92,4 @@
     font-size: 24rpx;
     z-index: 1;
     font-weight: 500;
-}
-
-/* 
-.bottom {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    padding: 0 32rpx;
-    box-sizing: border-box;
-}
-
-.bottom button {
-    flex: 1;
-    margin: 0 16rpx;
-    height: 88rpx;
-    font-size: 32rpx;
-} */
+}