Merge branch 'develop/3.2.4' of http://60.205.190.38:9000/zhaoheqing/wxmini into develop/3.2.4

devices/cmd_key_event.js

@@ -74,6 +74,7 @@ const EnumSupplier = {
 // 设备操作类
 class CmdEvent {
     constructor({ cmdEvent }) {
+//    this.cmdEvent =  EnumCmdEvent.value
         this.cmdEvent = cmdEvent;
         this.channelId = 1;
         this.wakeSwitch = null;
@@ -226,6 +227,8 @@ class CmdEvent {
     static pauseSleep({ pauseSleep }) {
         const event = new CmdEvent({ cmdEvent: EnumCmdEvent.authSleepStatus });
         event.pauseSleep = pauseSleep;
+                console.log("pauseSleep：", pauseSleep)
+
         return event;
     }
 
@@ -313,6 +316,7 @@ class CmdEvent {
 
     static version({ version }) {
         const event = new CmdEvent({ cmdEvent: EnumCmdEvent.version });
+        console.log('版本号:', version, {version});
         event.version = version;
         return event;
     }
@@ -324,6 +328,7 @@ class CmdEvent {
     }
     static clientType({ clientType }) {
         const event = new CmdEvent({ cmdEvent: EnumCmdEvent.clientType });
+        console.log("clientType：", clientType)
         event.clientType = clientType;
         return event;
     }

pages/deviceDetail/detail.js

@@ -25,7 +25,7 @@ Page({
   checkOtaVersion(device) {
     let _this = this;
     deviceVersion(device.clienlType, device.connectType, device.version).then(res => {
-      console.log(res);
+      console.log("OTA：", res);
       let updateData = res.data ?? {};
       let hasNewVersion = updateData.isEnforcement === 1 || updateData.isEnforcement === 2;
       _this.setData({
@@ -109,12 +109,18 @@ Page({
     let _this = this;
     EventManager.addNotification(CmdEvent.eventName, function (event) {
       let name = event.cmdEvent;
-      console.log("详情页：", event)
+      console.log("详情页：", name, event)
       switch (name) {
         case EnumCmdEvent.version:
           _this.data.device.version = event.version;
           _this.checkOtaVersion(_this.data.device);
           break;
+             case EnumCmdEvent.setPauseSleep:
+             let value = event.value;
+      _this.setData({
+         powerOpen: (value??-1) > -1
+       })
+          break;
       }
     }, this)
   },

pages/piano/wallpaper/wallpaper.js

@@ -18,37 +18,14 @@ Page({
    * 页面的初始数据
    */
   data: {
-    topImg: {
-      pic: "wxfile://tmp_d3e57489ead39c698676ff860df9cb8a37f66ee1a4777dbb.jpg",
-      id: "",
-      name: ""
+    topImg:
+     {
+//      pic: "",
+//      id: "",
+//      name: ""
     },
     imageList: [
-      {
-        pic: "https://inews.gtimg.com/om_bt/OAVMydtx9BsJxf5i_thi4Oll9sR1px-Esmtv6UHSxoisEAA/641",
-        id: "",
-        name: ""
-      },
-      {
-        pic: "https://inews.gtimg.com/om_bt/OAVMydtx9BsJxf5i_thi4Oll9sR1px-Esmtv6UHSxoisEAA/641",
-        id: "",
-        name: ""
-      },
-      {
-        pic: "https://inews.gtimg.com/om_bt/OAVMydtx9BsJxf5i_thi4Oll9sR1px-Esmtv6UHSxoisEAA/641",
-        id: "",
-        name: ""
-      },
-      {
-        pic: "https://inews.gtimg.com/om_bt/OAVMydtx9BsJxf5i_thi4Oll9sR1px-Esmtv6UHSxoisEAA/641",
-        id: "",
-        name: ""
-      },
-      {
-        pic: "https://inews.gtimg.com/om_bt/OAVMydtx9BsJxf5i_thi4Oll9sR1px-Esmtv6UHSxoisEAA/641",
-        id: "",
-        name: ""
-      }
+
     ],
     selectIndex: 0,
     nvabarData: {
@@ -68,7 +45,7 @@ Page({
       sourceType: ['album'], // 从相册选择
       success: function (res) {
         const tempFilePaths = res.tempFilePaths;
-        // console.log('获取图片信息成功', res);
+//         console.log('获取图片信息成功', res);
         // wx.cropImage({
         //   src: tempFilePaths[0], // 图片路径
         //   cropScale: '1:1', // 裁剪比例

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 wx:if="{{imageList}}" class="img_section">
+    <view wx:if="{{imageList.length>0}}" class="img_section">
         <image src="{{topImg.pic}}" class="select_img"></image>
         <image src="../../../images/common/icon_sel.png" class="select_icon"></image>
     </view>
@@ -14,7 +14,7 @@
         <image src="../../../images/common/icon_add.png" mode="aspectFill" />
         <view>上传图片</view>
     </view>
-    <image-cropper wx:if="{{scr}}" src="{{src}}" bind:cropSuccess="cropSuccess" bind:cropCancel="cropCancel" bind:cropClose="cropClose" :showCropper="showCropper" :cropRatio="cropRatio" :cropWidth="cropWidth" :cropHeight="cropHeight" :cropTop="cropTop" :cropLeft="cropLeft" :cropBgColor="cropBgColor" :cropBgImage></image-cropper>
+    <image-cropper wx:if="{{scr}}" imageSrc="{{src}}" bind:cropSuccess="cropSuccess" bind:cropCancel="cropCancel" bind:cropClose="cropClose" :showCropper="showCropper" :cropRatio="cropRatio" :cropWidth="cropWidth" :cropHeight="cropHeight" :cropTop="cropTop" :cropLeft="cropLeft" :cropBgColor="cropBgColor" :cropBgImage></image-cropper>
     <!-- <view wx:if="{{src}}" class='bottom'>
         <button catchtap='updateImage'>更换照片</button>
         <button type="primary" bindtap='submit'>确定裁剪</button>