feature：修改详情页的时间

devices/bluetooth/bt_cmd.js

@@ -108,6 +108,7 @@ class BtCmd {
 
     // 设置闹钟
     static setAlarm(switchStatus, weekCycle, hour, minutes, channel = 1) {
+        console.log("setAlarm=====", switchStatus, "=", weekCycle, "=", hour, "=", minutes);
         const weeks = CmdWeek.week2Cmd(weekCycle);
         return this._build(CmdRtc.setAlarm, [switchStatus, weeks, hour, minutes, channel]);
     }
@@ -123,11 +124,11 @@ class BtCmd {
 
     static setSleepAfterPlayPause(time) {
         if (time > 0) {
-            let day = (60 * 60 * 24)
-            let hour = 60 * 60
+            let day = (60 * 60)
+            let hour = 60
             const hours = Math.floor(time / day);
             const minutes = Math.floor((time % day) / hour);
-            const seconds = Math.floor((time % day % hour / 60));
+            const seconds = Math.floor((time % day % hour));
             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]);

devices/bt_helper.js

@@ -66,15 +66,17 @@ class BtHelper {
     that.queueManager = new QueueManager();
     that.queueManager.clear();
     that.queueManager.listenTask((task) => {
-      _this.bleManager.sendData(task);
+      that.bleManager.sendData(task);
     });
     addNotification(CmdEvent.eventName, function (event) {
-      console.log("蓝牙helper：", event)
+      // console.log("蓝牙helper：", event)
       let device = getApp().globalData.mDeviceList[0] ?? {};
       if (device.connectType != 1 && device.state != "online") {
         return;
       }
-      _this.handleCommand(event, device);
+
+      that.handleCommand(event, device);
+
     }, this)
   }
 
@@ -99,7 +101,8 @@ class BtHelper {
   }
 
   handleCommand(event, mDevice) {
-    let name = event.name;
+
+    let name = event.cmdEvent;
     switch (name) {
       ///音量  设备控制手机
       case EnumCmdEvent.volume:
@@ -114,18 +117,18 @@ class BtHelper {
         mDevice.volume = volume;
         break;
 
-        ///电量
+      ///电量
       case EnumCmdEvent.battery:
         mDevice.kwh = event.kwh;
         break;
 
-        ///低时延模式  低时延模式开启 1:音乐 , 2: 游戏 , 3: movie
+      ///低时延模式  低时延模式开启 1:音乐 , 2: 游戏 , 3: movie
       case EnumCmdEvent.lowDelayMode:
         mDevice.lowDelayMode = event.lowDelayMode;
         mDevice.lowDelayModeOpen = event.lowDelayModeOpen;
         break;
 
-        ///电量 耳机电量
+      ///电量 耳机电量
       case EnumCmdEvent.batteryEarphone:
         mDevice.kwh = event.kwh;
         mDevice.kwhLeft = event.kwhLeft;
@@ -133,12 +136,12 @@ class BtHelper {
         mDevice.kwhBox = event.kwhBox;
         break;
 
-        ///是否支持TTS
+      ///是否支持TTS
       case EnumCmdEvent.enableTTS:
         mDevice.enableTTS = event.enableTTS;
         break;
 
-        ///切换设备连接模式 0:未知 1：低功耗蓝牙 2：wifi类型 3：经典蓝牙(不做任何操作) 4：4G类型
+      ///切换设备连接模式 0:未知 1：低功耗蓝牙 2：wifi类型 3：经典蓝牙(不做任何操作) 4：4G类型
       case EnumCmdEvent.switchDeviceMode:
         var deviceMode = event.deviceMode.index;
         if (deviceMode != null) {
@@ -147,14 +150,14 @@ class BtHelper {
         }
         break;
 
-        ///4G外插卡  4G虚拟卡 当前使用的sim卡
+      ///4G外插卡  4G虚拟卡 当前使用的sim卡
       case EnumCmdEvent.sim:
         mDevice.sim = event.sim;
         mDevice.eSim = event.eSim;
         mDevice.simIndex = event.simIndex;
         break;
 
-        ///闹钟是否开启  闹钟周期 闹钟唤醒时间
+      ///闹钟是否开启  闹钟周期 闹钟唤醒时间
       case EnumCmdEvent.wake:
         mDevice.wakeSwitch = event.wakeSwitch;
         mDevice.wakeCycle = event.wakeCycle;
@@ -162,14 +165,14 @@ class BtHelper {
         mDevice.wakeMinutes = event.wakeMinutes;
         break;
 
-        ///休眠是否开启 休眠时间
+      ///休眠是否开启 休眠时间
       case EnumCmdEvent.sleep:
         mDevice.sleepSwitch = event.sleepSwitch;
         mDevice.sleepHour = event.sleepHour;
         mDevice.sleepMinutes = event.sleepMinutes;
         break;
 
-        ///版本和型号
+      ///版本和型号
       case EnumCmdEvent.version:
         mDevice.version = event.version;
         var clientType = mDevice.clientType ?? "";
@@ -202,7 +205,7 @@ class BtHelper {
         // }
         break;
 
-        ///云小微授权
+      ///云小微授权
       case EnumCmdEvent.auth:
         var authInfo = event.authInfo;
         mDevice.authInfo = authInfo;
@@ -218,17 +221,17 @@ class BtHelper {
         // });
         break;
 
-        ///EQ音效
+      ///EQ音效
       case EnumCmdEvent.eq:
         mDevice.eqs = event.eqs;
         break;
 
-        ///payId 充流量使用
+      ///payId 充流量使用
       case EnumCmdEvent.payId:
         mDevice.payId = event.payId;
         break;
 
-        ///QQ音乐使用dsn授权
+      ///QQ音乐使用dsn授权
       case EnumCmdEvent.dsn:
         var dsn = event.dsn;
         mDevice.dsn = dsn;
@@ -237,13 +240,13 @@ class BtHelper {
         // ProviderUtil.twelvePublic.wifiDeviceConnected();
         break;
 
-        ///自动切换 0，1不能
-        ///
+      ///自动切换 0，1不能
+      ///
       case EnumCmdEvent.netModeAuto:
         mDevice.netModeAuto = event.netModeAuto;
         break;
 
-        ///解绑设备
+      ///解绑设备
       case EnumCmdEvent.unbind:
         //   let unbindAddress = event.item.address ?? "";
         //     if (unbindAddress != mDevice.address) {
@@ -259,7 +262,7 @@ class BtHelper {
 
         break;
 
-        ///解绑设备
+      ///解绑设备
       case EnumCmdEvent.ctrlStatus:
         // List < int > ctrlList = event.ctrlStatus;
         // if (ctrlList.length == 3) {
@@ -281,7 +284,7 @@ class BtHelper {
         notifyListeners();
         break;
 
-        ///设备信息
+      ///设备信息
       case EnumCmdEvent.getDeviceInfo:
         //   List list = [];
         //   String userId = ProviderUtil.user.userModel.uid ?? "";
@@ -451,7 +454,7 @@ class BtHelper {
     var that = this;
     ///是否已打开蓝牙
     var adpter = await that.bleManager.initBluetoothAdapter((res) => {
-      console.log("gadsfadfqwerqwerqr==000====" + res);
+
       if (!res) {
         wx.showToast({
           title: '请开启蓝牙功能',
@@ -466,7 +469,6 @@ class BtHelper {
       ///获取蓝牙权限
       console.log("gadsfadfqwerqwerqr==111====" + res);
       that.bleManager.checkBluetoothPermission(function (per) {
-        console.log("gadsfadfqwerqwerqr==222====" + per);
         if (!per) {
           wx.showToast({
             title: '没有蓝牙权限',
@@ -569,9 +571,7 @@ class BtHelper {
 
   async setAutoPlay(open) {
     var that = this;
-    that.send(BtCmd.setAutoPlay({
-      switchStatus: open
-    }));
+    that.send(BtCmd.setAutoPlay(open));
   }
 
   async getAutoPlay() {
@@ -581,16 +581,12 @@ class BtHelper {
 
   async setLowKwhWarningTone(notify) {
     var that = this;
-    that.send(BtCmd.setLowKwhWarningTone({
-      notify
-    }));
+    that.send(BtCmd.setLowKwhWarningTone(notify));
   }
 
   async setPauseSleep(time) {
     var that = this;
-    that.send(BtCmd.setSleepAfterPlayPause({
-      time
-    }));
+    that.send(BtCmd.setSleepAfterPlayPause(time));
   }
 
   async getPauseSleep() {

pages/connectBle/connectBle.js

@@ -36,6 +36,7 @@ Page({
     var b = BtHelper.getInstance();
     that.data.btHelper = b;
     b.initBluetooth(function (adapterState, hasPermission) {
+      console.log("蓝牙状态：", adapterState, hasPermission)
       if (adapterState && hasPermission) {
         that.startSearch();
       } else {
@@ -125,7 +126,7 @@ Page({
         break;
       case 1:
       case 4:
-        // 搜索失败，点击重新搜索
+        // 搜索失败，点击重新搜索了
         that.startSearch()
         break;
       case 2:
@@ -177,10 +178,16 @@ Page({
   findAllDevice() {
     var that = this;
     that.data.btHelper.findDevices(function (devices) {
+      let hasFind = false;
       devices.forEach(element => {
         console.log('发现设备2:', element);
-        that.didFindDevice(element)
+        if (that.didFindDevice(element)) {
+          hasFind = true
+        }
       });
+      if (!hasFind) {
+        that.setStatus(1)
+      }
     });
   },
 
@@ -209,8 +216,10 @@ Page({
         that.data.connectDevice.deviceId = element.deviceId
         that.data.btHelper.stopSearch()
         that.setStatus(2)
+        return true
       }
     }
+    return false
   },
 
   onUnload() {

pages/deviceDetail/detail.js

@@ -61,7 +61,7 @@ Page({
   powerTap(e) {
     console.log(e)
     let btHelper = BtHelper.getInstance();
-    btHelper.setPauseSleep(!this.data.powerOpen ? 60 * 20 : -1)
+    btHelper.setPauseSleep(!this.data.powerOpen ? 1200 : -1)
     this.setData({
       powerOpen: !this.data.powerOpen
     })
@@ -108,7 +108,7 @@ Page({
 
     let _this = this;
     EventManager.addNotification(CmdEvent.eventName, function (event) {
-      let name = event.name;
+      let name = event.cmdEvent;
       console.log("详情页：", event)
       switch (name) {
         case EnumCmdEvent.version:

pages/piano/wallpaper/wallpaper.js

@@ -68,36 +68,34 @@ Page({
       sourceType: ['album'], // 从相册选择
       success: function (res) {
         const tempFilePaths = res.tempFilePaths;
-        console.log('获取图片信息成功', res);
-        wx.cropImage({
-          src: tempFilePaths[0], // 图片路径
-          cropScale: '1:1', // 裁剪比例
-          success: (res) => {
-            console.log('裁剪成功', res);
-
+        // console.log('获取图片信息成功', res);
+        // wx.cropImage({
+        //   src: tempFilePaths[0], // 图片路径
+        //   cropScale: '1:1', // 裁剪比例
+        //   success: (res) => {
+        //     console.log('裁剪成功', res);
+
+        //     that.setData({
+        //       src: res.tempFilePath
+        //     })
+        //   }
+        // })
+
+        wx.getImageInfo({
+          src: tempFilePaths[0],
+          success: function (imageInfo) {
+            console.log('获取图片信息成功', imageInfo);
+            //获取到image-cropper实例
+            //开始裁剪
             that.setData({
-              src: res.tempFilePath
+              src: imageInfo.path,//要裁剪的图片
             })
-          }
-        })
 
-        // wx.getImageInfo({
-        //   src: tempFilePaths[0],
-        //   success: function (imageInfo) {
-        //     console.log(imageInfo);
-        //     //获取到image-cropper实例
-        //     //开始裁剪
-        //     // that.setData({
-        //     //   src: imageInfo.path,//要裁剪的图片
-        //     // })
-        //     // wx.navigateTo({
-        //     //   url: `/pages/crop/crop?path=${tempFilePaths[0]}&width=${imageInfo.width}&height=${imageInfo.height}`
-        //     // });
-        //   },
-        //   fail: function (err) {
-        //     console.error('获取图片信息失败', err);
-        //   }
-        // });
+          },
+          fail: function (err) {
+            console.error('获取图片信息失败', err);
+          }
+        });
       },
       fail: function (err) {
         console.error('选择图片失败', err);
@@ -147,7 +145,7 @@ Page({
   },
 
   imageTap(e) {
-    console.log(e)
+    // console.log(e)
     // wxfile://tmp_d3e57489ead39c698676ff860df9cb8a37f66ee1a4777dbb.jpg
     let image = e.currentTarget.dataset.image;
     _this.setData({
@@ -176,7 +174,6 @@ Page({
   },
 
   startImage() {
-    let _this = this;
     BtHelper.sendData(BtCmd.wallPaper(1));
   },
   sendImage(imageBuffer) {
@@ -200,7 +197,7 @@ Page({
 
     let _this = this;
     EventManager.addNotification(CmdEvent.eventName, function (event) {
-      let name = event.name;
+      let name = event.cmdEvent;
       console.log("壁纸页：", event)
       switch (name) {
         case EnumCmdEvent.wallPaper: