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

app.json

@@ -19,7 +19,8 @@
     "pages/deviceDetail/detail",
     "pages/piano/wallpaper/wallpaper",
     "pages/ota/ota",
-    "pages/blueDemos/blueDemos"
+    "pages/blueDemos/blueDemos",
+    "pages/piano/cropper/cropper"
   ],
   "window": {
     "backgroundTextStyle": "light",
@@ -40,7 +41,5 @@
   "requiredPrivateInfos": [
     "getFuzzyLocation"
   ],
-
   "deviceOrientation": "portrait"
-
 }

devices/bt_helper.js

@@ -141,18 +141,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;
@@ -160,12 +160,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) {
@@ -174,14 +174,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;
@@ -189,14 +189,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 ?? "";
@@ -229,7 +229,7 @@ class BtHelper {
         // }
         break;
 
-        ///云小微授权
+      ///云小微授权
       case EnumCmdEvent.auth:
         var authInfo = event.authInfo;
         mDevice.authInfo = authInfo;
@@ -245,17 +245,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;
@@ -264,13 +264,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) {
@@ -286,7 +286,7 @@ class BtHelper {
 
         break;
 
-        ///解绑设备
+      ///解绑设备
       case EnumCmdEvent.ctrlStatus:
         // List < int > ctrlList = event.ctrlStatus;
         // if (ctrlList.length == 3) {
@@ -308,7 +308,7 @@ class BtHelper {
         // notifyListeners();
         break;
 
-        ///设备信息
+      ///设备信息
       case EnumCmdEvent.getDeviceInfo:
         //   List list = [];
         //   String userId = ProviderUtil.user.userModel.uid ?? "";
@@ -465,13 +465,17 @@ class BtHelper {
       this.bleManager.sendData(cmd)
     }
   }
-  async send(cmd, type) {
+  async send(cmd) {
     if (cmd) {
       this.queueManager.addTask(cmd)
     }
     // QueueManager.instance.addTask({ task: cmd });
   }
 
+  static sendData(value) {
+    BtHelper.getInstance().send(BtCmd.otaData(value));
+  }
+
   // onLoad: function () {
   //     bleManager = new bleManager();
   //     this.initBluetooth();

pages/components/image-cropper/image-cropper.json

@@ -0,0 +1,3 @@
+{
+	"component": true
+}

pages/components/image-cropper/image-cropper.wxml

@@ -0,0 +1,24 @@
+<view class='image-cropper' catchtouchmove='_preventTouchMove'>
+    <view class='main' bindtouchend="_cutTouchEnd" bindtouchstart="_cutTouchStart" bindtouchmove="_cutTouchMove" bindtap="_click">
+        <view class='content'>
+            <view class='content_top bg_gray {{_flag_bright?"":"bg_black"}}' style="height:{{cut_top}}px;transition-property:{{_cut_animation?'':'background'}}"></view>
+            <view class='content_middle' style="height:{{height}}px;">
+                <view class='content_middle_left bg_gray {{_flag_bright?"":"bg_black"}}' style="width:{{cut_left}}px;transition-property:{{_cut_animation?'':'background'}}"></view>
+                <view class='content_middle_middle' style="width:{{width}}px;height:{{height}}px;transition-duration: .3s;transition-property:{{_cut_animation?'':'background'}};">
+                    <view class="border border-top-left"></view>
+                    <view class="border border-top-right"></view>
+                    <view class="border border-right-top"></view>
+                    <view class="border border-right-bottom"></view>
+                    <view class="border border-bottom-right"></view>
+                    <view class="border border-bottom-left"></view>
+                    <view class="border border-left-bottom"></view>
+                    <view class="border border-left-top"></view>
+                </view>
+                <view class='content_middle_right bg_gray {{_flag_bright?"":"bg_black"}}' style="transition-property:{{_cut_animation?'':'background'}}"></view>
+            </view>
+            <view class='content_bottom bg_gray {{_flag_bright?"":"bg_black"}}' style="transition-property:{{_cut_animation?'':'background'}}"></view>
+        </view>
+        <image bindload="imageLoad" bindtouchstart="_start" bindtouchmove="_move" bindtouchend="_end" style="width:{{img_width ? img_width + 'px' : 'auto'}};height:{{img_height ? img_height + 'px' : 'auto'}};transform:translate3d({{_img_left-img_width/2}}px,{{_img_top-img_height/2}}px,0) scale({{scale}}) rotate({{angle}}deg);transition-duration:{{_cut_animation?.4:0}}s;" class='img' src='{{imgSrc}}'></image>
+    </view>
+    <canvas canvas-id='image-cropper' disable-scroll="true" style="width:{{_canvas_width * export_scale}}px;height:{{_canvas_height * export_scale}}px;left:{{canvas_left}}px;top:{{canvas_top}}px" class='image-cropper-canvas'></canvas>
+</view>

pages/components/image-cropper/image-cropper.wxss

@@ -0,0 +1,143 @@
+.image-cropper {
+    background: rgba(14, 13, 13, .8);
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100vw;
+    height: 100vh;
+    z-index: 1;
+}
+
+.image-cropper .main {
+    position: absolute;
+    width: 100vw;
+    height: 100vh;
+    overflow: hidden;
+}
+
+.image-cropper .content {
+    z-index: 9;
+    position: absolute;
+    width: 100vw;
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    pointer-events: none;
+}
+
+.image-cropper .bg_black {
+    background: rgba(0, 0, 0, 0.8) !important;
+}
+
+.image-cropper .bg_gray {
+    background: rgba(0, 0, 0, 0.45);
+    transition-duration: .35s;
+}
+
+.image-cropper .content>.content_top {
+    pointer-events: none;
+}
+
+.image-cropper .content>.content_middle {
+    display: flex;
+    height: 200px;
+    width: 100%;
+}
+
+.image-cropper .content_middle_middle {
+    width: 200px;
+    box-sizing: border-box;
+    position: relative;
+    transition-duration: .3s;
+}
+
+.image-cropper .content_middle_right {
+    flex: auto;
+}
+
+.image-cropper .content>.content_bottom {
+    flex: auto;
+}
+
+.image-cropper .img {
+    z-index: 2;
+    top: 0;
+    left: 0;
+    position: absolute;
+    border: none;
+    width: 100%;
+    backface-visibility: hidden;
+    transform-origin: center;
+}
+
+.image-cropper .image-cropper-canvas {
+    position: fixed;
+    background: white;
+    width: 150px;
+    height: 150px;
+    z-index: 10;
+    top: -200%;
+    pointer-events: none;
+}
+
+.image-cropper .border {
+    background: white;
+    pointer-events: auto;
+    position: absolute;
+}
+
+.image-cropper .border-top-left {
+    left: -2.5px;
+    top: -2.5px;
+    height: 2.5px;
+    width: 33rpx;
+}
+
+.image-cropper .border-top-right {
+    right: -2.5px;
+    top: -2.5px;
+    height: 2.5px;
+    width: 33rpx;
+}
+
+.image-cropper .border-right-top {
+    top: -1px;
+    width: 2.5px;
+    height: 30rpx;
+    right: -2.5px;
+}
+
+.image-cropper .border-right-bottom {
+    width: 2.5px;
+    height: 30rpx;
+    right: -2.5px;
+    bottom: -1px;
+}
+
+.image-cropper .border-bottom-left {
+    height: 2.5px;
+    width: 33rpx;
+    bottom: -2.5px;
+    left: -2.5px;
+}
+
+.image-cropper .border-bottom-right {
+    height: 2.5px;
+    width: 33rpx;
+    bottom: -2.5px;
+    right: -2.5px;
+}
+
+.image-cropper .border-left-top {
+    top: -1px;
+    width: 2.5px;
+    height: 30rpx;
+    left: -2.5px;
+}
+
+.image-cropper .border-left-bottom {
+    width: 2.5px;
+    height: 30rpx;
+    left: -2.5px;
+    bottom: -1px;
+}

pages/components/imageCrop/index.js

@@ -1,727 +0,0 @@
-// cropper/cropper.js
-Component({
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-    /**
-     * @type         number
-     * @description  组件裁剪显示区域的最大比例，如果裁剪的图片过长，则做限制，默认最大宽高比例为 宽640 / 高960 (宽高比例)
-     * @example 1    如果CROPPER_WIDTH宽度是720px，那么裁剪区域的高度也就是 CROPPER_WIDTH / cropperRatio 为 720px;
-     */
-    cropperRatio: {
-      type: Number,
-      value: 1
-    },
-
-    /**
-     * @type         number
-     * @description  初始化的裁剪比例
-     * @example 0    默认初始化的裁剪区域宽高为图片的宽高，且裁剪比例不固定
-     * @example 0.5  宽高比例固定，且宽和高的比例为 1 : 2 的比例
-     * @example 2    宽高比例固定，且宽和高的比例为 2 : 1 的比例
-     */
-    cutRatio: {
-      type: Number,
-      value: 1
-    },
-
-    /**
-     * @type         string
-     * @description  需要裁剪的图片地址
-     */
-    imageSrc: {
-      type: String,
-      value: ''
-    },
-
-    /**
-     * @type         number
-     * @description  裁剪区域的宽度
-     */
-    cropperWidth: {
-      type: Number,
-      value: 720
-    },
-
-    /**
-     * @type          number
-     * @description   最小裁剪的范围
-     */
-    minCropperW: {
-      type: Number,
-      value: 100
-    }
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-    /**
-     * @type         boolean
-     * @description  图片在进行网络请求完成之后显示，showImg用于控制图片显示时机
-     */
-    showImg: false,
-
-    /**
-     * @
-     */
-    // 动态的宽高
-    cropperW: null,
-    cropperH: null,
-
-    // 图片缩放值
-    scaleP: 0,
-    // 裁剪框 宽高
-    cutL: 0,
-    cutT: 0,
-    cutB: 0,
-    cutR: 0,
-
-    qualityWidth: null,
-    innerAspectRadio: null,
-
-    filePath: null
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-    close() {
-      wx.hideLoading()
-      this.triggerEvent('close')
-    },
-
-    /**
-     * 初始化变量信息
-     */
-    initStaticData() {
-      this.drag = {
-        CUT_L: null,  // 初始化拖拽元素的left值
-        CUT_T: null,  // ...top值
-        CUT_R: null,  // ...right值
-        CUT_B: null,  // ...bottom值
-
-        CUT_W: null,  // 初始化拖拽元素的宽度
-        CUT_H: null,  // 初始化拖拽元素的高度
-
-        IS_TOUCH_CONTENT: false,  // 是否是可拖动的状态（拖拽裁剪框）
-        IS_TOUCH_SIDE: false,  // 是否可以拖拽边框
-        IS_NO_DRAG: false,
-
-        // 拖拽区域的时候设置
-        TOUCH_OFFSET_X: null, // 手按下相对于裁剪框左边的距离
-        TOUCH_OFFSET_Y: null, // 手按下相对于裁剪框上边的距离
-
-        TOUCH_MAX_MOVE_SECTION_X: null, // 移动区域的时候移动的x方向最大区间
-        TOUCH_MAX_MOVE_SECTION_Y: null, // 移动区域的时候移动的y方向最大区间
-
-        MOVE_PAGE_X: null,  // 手移动的时候x的位置
-        MOVE_PAGE_Y: null,  // 手移动的时候Y的位置
-
-        SPACE_TOP_POSITION: null,
-        SPACE_LEFT_POSITION: null,
-        SPACE_RIGHT_POSITION: null,
-        SPACE_BOTTOM_POSITION: null
-      }
-
-      this.conf = {
-        // 图片比例
-        IMG_RATIO: null,
-
-        // 图片实际宽高
-        IMG_REAL_W: null,   // 图片实际的宽度
-        IMG_REAL_H: null,   // 图片实际的高度
-
-        // 裁剪除黑色区域以内的高度
-        CROPPER_HEIGHT: null,   // 图片背景区域宽度
-        CROPPER_WIDTH: null,    // 图标背景区域高度
-
-        // 设置最小裁剪宽度高度
-        CUT_MIN_W: null,  // 最小限制多宽
-        CUT_MIN_H: null,  // 最小限制多高
-
-        // 裁剪图片区域的信息
-        // CROPPER_IMG_W: null,    // 也就是 data.cropperW
-        // CROPPER_IMG_H: null,    // 也就是 data.cropperH
-
-        // 移动的比例
-        DRAG_MOVE_RATIO: 750 / wx.getSystemInfoSync().windowWidth,  //移动时候的比例,
-
-        INIT_DRAG_POSITION: 0,    // 初始化屏幕宽度和裁剪区域的宽度之差，用于设置初始化裁剪的宽度
-        DRAW_IMAGE_W: null,       // 设置生成的图片宽度
-
-        // 最大可显示得图片宽度，需要设定最大值，否则安卓部分机器会闪退, 控制qualityWidth的最大值
-        MAX_QW: 2550,
-
-        /**
-         * 最小裁剪宽度  由于设置了裁剪的UI样式，裁剪的宽高必须要有最小宽度，这个宽度是裁剪长或者宽的最短一方的宽度
-         * 如 400 200
-         * 那么如果只能设置为100的时候
-         * 那么最小缩放到200 100的效果，之后只能放大不能缩小
-         */
-        MIN_CROPPER_DIS: 100
-      }
-    },
-
-    /**
-     * 选择本地图片
-     * 基于底部中间的按钮的点击事件
-     */
-    getImage() {
-      const _this = this
-      wx.chooseMedia({
-        count: 1,
-        mediaType: ['image'],
-        sourceType: ['album'],
-        success(res) {
-          _this.setData({
-            isShowImg: false,
-            filePath: res.tempFiles[0].tempFilePath,
-          })
-          _this.loadImage(_this.data.filePath)
-        },
-      })
-    },
-
-    /**
-     * 初始化加载图片
-     */
-    loadImage(src) {
-      const _this = this
-
-      wx.showLoading({
-        title: '图片加载中...',
-      })
-      wx.getImageInfo({
-        src: src ? src : this.properties.imageSrc,
-        success: function (res) {
-          /**
-           * 获取图片真实宽高
-           * 设置DRAW_IMAGE_W
-           */
-          _this.conf.DRAW_IMAGE_W = _this.conf.IMG_REAL_W = res.width
-          _this.conf.IMG_REAL_H = res.height
-          _this.conf.IMG_RATIO = Number((_this.conf.IMG_REAL_W / _this.conf.IMG_REAL_H).toFixed(5))
-          _this.conf.CROPPER_HEIGHT = Math.ceil(_this.properties.cropperWidth / _this.conf.IMG_RATIO)
-
-          const scaleP = Number((_this.conf.IMG_REAL_W / _this.properties.cropperWidth).toFixed(5))
-          const qualityWidth = _this.conf.DRAW_IMAGE_W > _this.conf.MAX_QW ? _this.conf.MAX_QW : _this.conf.DRAW_IMAGE_W
-          // const MIN_RANG
-          const p = _this.initPosition()
-
-          // 根据图片的宽高显示不同的效果 保证图片可以正常显示 (横屏)
-          console.log(_this.conf.IMG_RATIO)
-          console.log(_this.conf)
-          console.log(_this.drag)
-          console.log(_this.data)
-          console.log(p)
-          if (_this.conf.IMG_RATIO >= 1) {
-            _this.conf.CROPPER_WIDTH = _this.properties.cropperWidth
-            _this.setData({
-              cropperW: _this.properties.cropperWidth,
-              cropperH: _this.conf.CROPPER_HEIGHT,
-
-              // 初始化left right
-              cutL: p.left,
-              cutT: p.top,
-              cutR: p.right,
-              cutB: p.bottom,
-
-              // 图片缩放值
-              scaleP,
-              qualityWidth,
-              innerAspectRadio: _this.conf.IMG_RATIO,
-              filePath: res.path
-            })
-          } else {
-            // 竖屏初始化
-            _this.setData({
-              cropperW: _this.conf.CROPPER_WIDTH,
-              cropperH: _this.conf.CROPPER_HEIGHT,
-
-              // 初始化left right
-              cutL: p.left,
-              cutT: p.top,
-              cutR: p.right,
-              cutB: p.bottom,
-
-              // 图片缩放值
-              scaleP,
-              qualityWidth,
-              innerAspectRadio: _this.conf.IMG_RATIO,
-              filePath: res.path
-            })
-          }
-
-          // 设置裁剪最小限制
-          _this.setMinCutInfo()
-
-          _this.setData({
-            showImg: true
-          })
-
-          wx.hideLoading()
-        }
-      })
-    },
-
-    /**
-     * 点击完成裁剪图片并返回图片信息
-     * width 宽度
-     * height  高度
-     * url  图片的临时存储地址
-     */
-    getImageInfo() {
-      const _this = this
-      wx.showLoading({
-        title: '图片生成中...',
-      })
-      this.drag.IS_NO_DRAG = true
-      // 将图片写入画布
-      const ctx = wx.createCanvasContext('wxCropperCanvas', _this)
-      const w = this.data.qualityWidth
-      const h = Math.ceil(this.data.qualityWidth / this.data.innerAspectRadio)
-      ctx.drawImage(_this.data.filePath, 0, 0, w, h)
-      ctx.draw(true, () => {
-        // 获取画布要裁剪的位置和宽度   均为百分比 * 画布中图片的宽度    保证了在微信小程序中裁剪的图片模糊  位置不对的问题
-        const canvasW = Math.ceil(((_this.data.cropperW - _this.data.cutL - _this.data.cutR) / _this.data.cropperW) * w)
-        const canvasH = Math.ceil(((_this.data.cropperH - _this.data.cutT - _this.data.cutB) / _this.data.cropperH) * h)
-        const canvasL = Math.ceil((_this.data.cutL / _this.data.cropperW) * w)
-        const canvasT = Math.ceil((_this.data.cutT / _this.data.cropperH) * h)
-        // console.log(canvasW, canvasH, canvasL, canvasT)
-        // 生成图片
-        wx.canvasToTempFilePath({
-          x: canvasL,
-          y: canvasT,
-          width: canvasW,
-          height: canvasH,
-          destWidth: canvasW,
-          destHeight: canvasH,
-          quality: 0.9,
-          canvasId: 'wxCropperCanvas',
-          success: function (res) {
-            // console.log(res.tempFilePath)
-            const img = {
-              path: res.tempFilePath,
-              width: canvasW,
-              height: canvasH
-            }
-            _this.triggerEvent('close', img)
-          },
-          complete: function () {
-            // 结束之后可拖拽放大缩小
-            // 关闭loading
-            wx.hideLoading()
-            _this.drag.IS_NO_DRAG = false
-          }
-        }, _this)
-      })
-    },
-
-    /**
-     * 设置最小裁剪宽度高度限制
-     */
-    setMinCutInfo() {
-      this.conf.CUT_MIN_W = this.properties.minCropperW
-      if (this.properties.cutRatio) {
-        this.conf.CUT_MIN_H = this.conf.CUT_MIN_W / this.properties.cutRatio
-        // console.log('this.conf.CUT_MIN_H', this.conf.CUT_MIN_H)
-        return
-      }
-      this.conf.CUT_MIN_H = this.conf.CUT_MIN_W
-      // console.log('this.conf.CUT_MIN_H', this.conf.CUT_MIN_H)
-    },
-
-    /**
-     * 初始化裁剪位置
-     * 需要 cutRatio 来判断
-     * @return 返回裁剪的left, right, top bottom的值
-     */
-    initPosition() {
-      // 定义返回的对象
-      const left = 0,
-        right = 0,
-        top = 0,
-        bottom = 0
-      // cutRatio为0 且为横行  则为不等比裁剪
-      if (this.properties.cutRatio === 0 && this.conf.IMG_RATIO >= 1) {
-        return { left, right, top, bottom }
-      }
-
-      // 如果图片宽度大于等于高度（横向）
-      if (this.conf.IMG_RATIO >= 1) {
-        // 获取基本宽度
-        // 图片显示区域比裁剪比例大的时候
-        if (this.conf.IMG_RATIO >= this.properties.cutRatio) {
-          // left的值
-          let leftRight = Math.ceil((this.properties.cropperWidth - (this.conf.CROPPER_HEIGHT * this.properties.cutRatio)) / 2)
-          return {
-            left: leftRight,
-            right: leftRight,
-            top: 0,
-            bottom: 0
-          }
-        }
-        // 否则
-        const bottomTop = Math.ceil((this.conf.CROPPER_HEIGHT - (this.properties.cropperWidth / this.properties.cutRatio)) / 2)
-        return {
-          left: 0,
-          right: 0,
-          top: bottomTop,
-          bottom: bottomTop
-        }
-      }
-
-      // 如果图片宽度小于高度 (竖向)
-      // const r = _this.properties.cropperRatio > _this.conf.IMG_RATIO ? _this.properties.cropperRatio : _this.conf.IMG_RATIO
-      if (this.properties.cropperRatio > this.conf.IMG_RATIO) {
-        this.conf.CROPPER_WIDTH = this.properties.cropperWidth / this.properties.cropperRatio * this.conf.IMG_RATIO
-        this.conf.CROPPER_HEIGHT = this.properties.cropperWidth / this.properties.cropperRatio
-      } else {
-        this.conf.CROPPER_WIDTH = this.properties.cropperWidth
-        this.conf.CROPPER_HEIGHT = this.properties.cropperWidth / this.conf.IMG_RATIO
-      }
-      // 定义四个位置  如果不比例裁剪
-      if (this.properties.cutRatio === 0) return { left, right, top, bottom }
-      // 否则
-
-      if (this.conf.IMG_RATIO >= this.properties.cutRatio) {
-        const leftRight = Math.ceil((this.conf.CROPPER_WIDTH - (this.conf.CROPPER_HEIGHT * this.properties.cutRatio)) / 2)
-        return {
-          left: leftRight,
-          right: leftRight,
-          top: 0,
-          bottom: 0
-        }
-      }
-      const bottomTop = Math.ceil((this.conf.CROPPER_HEIGHT - (this.conf.CROPPER_WIDTH / this.properties.cutRatio)) / 2)
-      return {
-        left: 0,
-        right: 0,
-        top: bottomTop,
-        bottom: bottomTop
-      }
-    },
-
-    /**
-     * 裁剪框的拖动事件
-     */
-    contentDragStart(e) {
-      if (this.drag.IS_NO_DRAG) return
-      this.drag.IS_TOUCH_CONTENT = true
-
-      this.drag.TOUCH_OFFSET_X = (e.touches[0].pageX * this.conf.DRAG_MOVE_RATIO - this.data.cutL)
-      this.drag.TOUCH_OFFSET_Y = (e.touches[0].pageY * this.conf.DRAG_MOVE_RATIO - this.data.cutT)
-
-      /**
-       * 获取可移动的最大值 xy方向
-       */
-      const cc = this.cropperCurrentInfo()
-      this.drag.TOUCH_MAX_MOVE_SECTION_X = cc.x
-      this.drag.TOUCH_MAX_MOVE_SECTION_Y = cc.y
-    },
-
-    /**
-     * 获取裁剪区域信息
-     */
-    cropperCurrentInfo() {
-      const x = this.data.cutL + this.data.cutR
-      const y = this.data.cutT + this.data.cutB
-
-      // 获取拖拽元素的宽高
-      this.drag.CUT_W = this.data.cropperW - x
-      this.drag.CUT_H = this.data.cropperH - y
-
-      // 返回x, y
-      return {
-        x,
-        y
-      }
-    },
-
-    /**
-     * 裁剪框拖动
-     */
-    contentDragMove(e) {
-      if (this.drag.IS_NO_DRAG) return
-      if (!this.drag.IS_TOUCH_CONTENT) return
-      const MOVE_X = e.touches[0].pageX * this.conf.DRAG_MOVE_RATIO - this.drag.TOUCH_OFFSET_X
-      const MOVE_Y = e.touches[0].pageY * this.conf.DRAG_MOVE_RATIO - this.drag.TOUCH_OFFSET_Y
-
-      const drag_x = Math.min(this.drag.TOUCH_MAX_MOVE_SECTION_X, Math.max(0, MOVE_X))
-      const drag_y = Math.min(this.drag.TOUCH_MAX_MOVE_SECTION_Y, Math.max(0, MOVE_Y))
-
-      this.setData({
-        cutL: Math.ceil(drag_x),
-        cutR: Math.ceil(this.data.cropperW - this.drag.CUT_W - drag_x),
-        cutT: Math.ceil(drag_y),
-        cutB: Math.ceil((this.data.cropperH - this.drag.CUT_H - drag_y))
-      })
-
-      // 需要初始化
-      this.drag.TOUCH_OFFSET_X = (e.touches[0].pageX * this.conf.DRAG_MOVE_RATIO - this.data.cutL)
-      this.drag.TOUCH_OFFSET_Y = (e.touches[0].pageY * this.conf.DRAG_MOVE_RATIO - this.data.cutT)
-    },
-
-    /**
-     * 裁剪框拖动结束
-     */
-    contentTouchEnd() {
-      this.drag.IS_TOUCH_CONTENT = false
-    },
-
-    /**
-     * 裁剪框4个方向的拖拽
-     */
-    sideDragStart(e) {
-      if (this.drag.IS_NO_DRAG) return
-      this.drag.IS_TOUCH_SIDE = true
-      this.drag.MOVE_PAGE_X = e.touches[0].pageX
-      this.drag.MOVE_PAGE_Y = e.touches[0].pageY
-
-      // 初始化设置
-      this.conf.CUT_T = this.data.cutT
-      this.conf.CUT_L = this.data.cutL
-      this.conf.CUT_R = this.data.cutR
-      this.conf.CUT_B = this.data.cutB
-
-      // 初始化最大移动区域
-      this.drag.SPACE_TOP_POSITION = this.conf.CROPPER_HEIGHT - this.conf.CUT_B - this.conf.CUT_MIN_H
-      this.drag.SPACE_BOTTOM_POSITION = this.conf.CROPPER_HEIGHT - this.conf.CUT_T - this.conf.CUT_MIN_H
-      this.drag.SPACE_RIGHT_POSITION = this.conf.CROPPER_WIDTH - this.conf.CUT_L - this.conf.CUT_MIN_W
-      this.drag.SPACE_LEFT_POSITION = this.conf.CROPPER_WIDTH - this.conf.CUT_R - this.conf.CUT_MIN_W
-    },
-
-    /**
-     *  拖拽中
-     */
-    sideDragMove(e) {
-      if (this.drag.IS_NO_DRAG) return
-      if (!this.drag.IS_TOUCH_SIDE) return
-      const type = e.target.dataset.drag
-      if (this.properties.cutRatio === 0) {
-        this.sideDragMoveDefault(e, type)
-      } else {
-        this.sideDragMoveConst(e, type)
-      }
-    },
-
-    /**
-     * 拖拽结束
-     */
-    sideDragEnd() {
-      this.drag.IS_TOUCH_SIDE = false
-      // console.log('sideDragEnd')
-    },
-
-    /**
-     * 开始拖拽
-     * 等比例的拖拽方式
-     */
-    sideDragMoveConst(e, type) {
-      const xLength = (e.touches[0].pageX - this.drag.MOVE_PAGE_X) * this.conf.DRAG_MOVE_RATIO
-      const yLength = (e.touches[0].pageY - this.drag.MOVE_PAGE_Y) * this.conf.DRAG_MOVE_RATIO
-      switch (type) {
-        case 'top':
-          let top = this.conf.CUT_T + yLength
-          top = Math.ceil(top >= this.drag.SPACE_TOP_POSITION ? this.drag.SPACE_TOP_POSITION : top)
-
-          let topL = this.conf.CUT_L + yLength * this.properties.cutRatio
-          topL = Math.ceil(topL >= this.drag.SPACE_LEFT_POSITION ? this.drag.SPACE_LEFT_POSITION : topL)
-
-          if (topL < 0) {
-            if (this.data.cutT <= 0) return
-            if (this.data.cutL >= 0) return
-            this.setData({
-              cutL: 0
-            })
-            return
-          }
-
-          if (top <= 0) {
-            this.setData({
-              cutT: 0
-            })
-            return
-          }
-
-          this.setData({
-            cutT: top,
-            cutL: topL
-          })
-          break
-        case 'left':
-          let left = this.conf.CUT_L + xLength
-          left = Math.ceil(left >= this.drag.SPACE_LEFT_POSITION ? this.drag.SPACE_LEFT_POSITION : left)
-
-          let leftB = this.conf.CUT_B + xLength / this.properties.cutRatio
-          leftB = Math.ceil(leftB >= this.drag.SPACE_BOTTOM_POSITION ? this.drag.SPACE_BOTTOM_POSITION : leftB)
-
-          // console.log(leftB)
-          // console.log(left)
-          if (leftB < 0) {
-            if (this.data.cutL <= 0) return
-            if (this.data.cutB >= 0) return
-            this.setData({
-              cutB: 0
-            })
-            return
-          }
-
-          if (left <= 0) {
-            this.setData({
-              cutL: 0
-            })
-            return
-          }
-
-          this.setData({
-            cutL: left,
-            cutB: leftB
-          })
-          break
-        case 'bottom':
-          let bottom = this.conf.CUT_B - yLength
-          bottom = Math.ceil(bottom >= this.drag.SPACE_BOTTOM_POSITION ? this.drag.SPACE_BOTTOM_POSITION : bottom)
-
-          let bottomR = this.conf.CUT_R - yLength * this.properties.cutRatio
-          bottomR = Math.ceil(bottomR >= this.drag.SPACE_RIGHT_POSITION ? this.drag.SPACE_RIGHT_POSITION : bottomR)
-
-          if (bottomR < 0) {
-            if (this.data.cutB <= 0) return
-            if (this.data.cutR >= 0) return
-            this.setData({
-              cutR: 0
-            })
-            return
-          }
-
-          if (bottom <= 0) {
-            this.setData({
-              cutB: 0
-            })
-            return
-          }
-
-          this.setData({
-            cutR: bottomR,
-            cutB: bottom
-          })
-          break
-        case 'right':
-          let right = this.conf.CUT_R - xLength
-          right = Math.ceil(right >= this.drag.SPACE_RIGHT_POSITION ? this.drag.SPACE_RIGHT_POSITION : right)
-
-          let rightT = this.conf.CUT_T - xLength / this.properties.cutRatio
-          rightT = Math.ceil(rightT >= this.drag.SPACE_TOP_POSITION ? this.drag.SPACE_TOP_POSITION : rightT)
-
-          if (rightT < 0) {
-            if (this.data.cutR <= 0) return
-            if (this.data.cutT >= 0) return
-            this.setData({
-              cutT: 0
-            })
-            return
-          }
-
-          if (right <= 0) {
-            this.setData({
-              cutR: 0
-            })
-            return
-          }
-
-          this.setData({
-            cutR: right,
-            cutT: rightT
-          })
-          break
-      }
-    },
-
-    /**
-     * 非等比例拖拽的操作
-     */
-    sideDragMoveDefault(e, type) {
-      const xLength = (e.touches[0].pageX - this.drag.MOVE_PAGE_X) * this.conf.DRAG_MOVE_RATIO
-      const yLength = (e.touches[0].pageY - this.drag.MOVE_PAGE_Y) * this.conf.DRAG_MOVE_RATIO
-      switch (type) {
-        case 'top':
-          let top = this.conf.CUT_T + yLength
-          top = top <= 0 ? 0 : top
-          top = Math.ceil(top >= this.drag.SPACE_TOP_POSITION ? this.drag.SPACE_TOP_POSITION : top)
-          this.setData({
-            cutT: top
-          })
-          break
-        case 'bottom':
-          let bottom = this.conf.CUT_B - yLength
-          bottom = bottom <= 0 ? 0 : bottom
-          bottom = Math.ceil(bottom >= this.drag.SPACE_BOTTOM_POSITION ? this.drag.SPACE_BOTTOM_POSITION : bottom)
-          this.setData({
-            cutB: bottom
-          })
-          break
-        case 'right':
-          let right = this.conf.CUT_R - xLength
-          right = right <= 0 ? 0 : right
-          right = Math.ceil(right >= this.drag.SPACE_RIGHT_POSITION ? this.drag.SPACE_RIGHT_POSITION : right)
-          this.setData({
-            cutR: right
-          })
-          break
-        case 'left':
-          let left = this.conf.CUT_L + xLength
-          left = left <= 0 ? 0 : left
-          left = Math.ceil(left >= this.drag.SPACE_LEFT_POSITION ? this.drag.SPACE_LEFT_POSITION : left)
-          this.setData({
-            cutL: left
-          })
-          break
-        case 'rightBottom':
-          let rightBottomR = this.conf.CUT_R - xLength
-          rightBottomR = rightBottomR <= 0 ? 0 : rightBottomR
-          rightBottomR = Math.ceil(rightBottomR >= this.drag.SPACE_RIGHT_POSITION ? this.drag.SPACE_RIGHT_POSITION : rightBottomR)
-
-          let rightBottomB = this.conf.CUT_B - yLength
-          rightBottomB = rightBottomB <= 0 ? 0 : rightBottomB
-          rightBottomB = Math.ceil(rightBottomB >= this.drag.SPACE_BOTTOM_POSITION ? this.drag.SPACE_BOTTOM_POSITION : rightBottomB)
-          this.setData({
-            cutB: rightBottomB,
-            cutR: rightBottomR
-          })
-          break
-        default:
-          break
-      }
-    },
-  },
-
-  created: function () {
-    this.initStaticData()
-    // console.log(this.drag)
-    // console.log(this.conf)
-    // console.log(this.data)
-    // console.log(this.conf.DRAG_MOVE_RATIO)
-  },
-
-  attached: function () {
-    // console.log('attached')
-    this.loadImage()
-  },
-
-  ready: function () {
-    // console.log('ready')
-  },
-
-  moved: function () {
-    // console.log('moved')
-  },
-
-  detached: function () {
-    // console.log('detached')
-  }
-})

pages/components/imageCrop/index.json

@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}

pages/components/imageCrop/index.wxml

@@ -1,41 +0,0 @@
-<!-- cropper/cropper.wxml -->
-<view class="wx-content-info">
-  <view class='cropper-content'>
-    <view wx:if="{{showImg}}" class="wx-corpper" style="background:#000;">
-      <view class="wx-corpper-content" style="width:{{cropperW}}rpx;height:{{cropperH}}rpx;">
-        <view class="wx-corpper-content-bg">
-          <!-- <view class="mask" hover-class="none" hover-stop-propagation="false"></view> -->
-          <image src="{{filePath}}" style="width:{{cropperW}}rpx;height:{{cropperH}}rpx"></image>
-        </view>
-        <view class="wx-corpper-crop-box" bind:touchstart="contentDragStart" bind:touchmove="contentDragMove" bind:touchend="contentTouchEnd" style="left:{{cutL}}rpx;top:{{cutT}}rpx;right:{{cutR}}rpx;bottom:{{cutB}}rpx">
-          <!-- <view class="wx-corpper-crop-box" bind:touchstart="contentDragStart" bind:touchmove="contentDragMove" bind:touchend="contentTouchEnd" style="width:{{cropperW - cutL - cutR}}rpx;height:{{cropperH - cutT- cutB}}rpx; transform: translateX({{cutL}}rpx) translateY({{cutT}}rpx);"> -->
-          <view class="wx-cropper-view-box">
-            <!-- <view class="wx-cropper-view-box-img" style="width:100%;height:100%" hover-class="none" hover-stop-propagation="false">
-              <image src="{{imageSrc}}" style="width:{{cropperW}}rpx;height:{{cropperH}}rpx; transform: translateX({{-cutL}}rpx) translateY({{-cutT}}rpx);"></image>
-            </view> -->
-            <view class="wx-cropper-dashed-h"></view>
-            <view class="wx-cropper-dashed-v"></view>
-            <view class="wx-cropper-line-t" data-drag="top" catch:touchstart="sideDragStart" catch:touchmove="sideDragMove" catch:touchend="sideDragEnd"></view>
-            <view class="wx-cropper-line-r" data-drag="right" catch:touchstart="sideDragStart" catch:touchmove="sideDragMove" catch:touchend="sideDragEnd"></view>
-            <view class="wx-cropper-line-b" data-drag="bottom" catch:touchstart="sideDragStart" catch:touchmove="sideDragMove" catch:touchend="sideDragEnd"></view>
-            <view class="wx-cropper-line-l" data-drag="left" catch:touchstart="sideDragStart" catch:touchmove="sideDragMove" catch:touchend="sideDragEnd"></view>
-            <view class="wx-cropper-point point-t" data-drag="top" catch:touchstart="sideDragStart" catch:touchmove="sideDragMove" catch:touchend="sideDragEnd"></view>
-            <view class="wx-cropper-point point-tr" data-drag="topTight"></view>
-            <view class="wx-cropper-point point-r" data-drag="right" catch:touchstart="sideDragStart" catch:touchmove="sideDragMove" catch:touchend="sideDragEnd"></view>
-            <view class="wx-cropper-point point-rb" data-drag="rightBottom" catch:touchstart="sideDragStart" catch:touchmove="sideDragMove" catch:touchend="sideDragEnd"></view>
-            <view class="wx-cropper-point point-b" data-drag="bottom" catch:touchstart="sideDragStart" catch:touchmove="sideDragMove" catch:touchend="sideDragEnd"></view>
-            <view class="wx-cropper-point point-bl" data-drag="bottomLeft"></view>
-            <view class="wx-cropper-point point-l" data-drag="left" catch:touchstart="sideDragStart" catch:touchmove="sideDragMove" catch:touchend="sideDragEnd"></view>
-            <view class="wx-cropper-point point-lt" data-drag="leftTop"></view>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-  <view class='cropper-config'>
-    <text class="cropper-cancle cropper-cancel-color" bindtap="close">取消</text>
-    <!-- <text class="cropper-cancle" bindtap="getImage">选择图片</text> -->
-    <text class="cropper-save cropper-save-color" bindtap="getImageInfo">确定</text>
-  </view>
-  <canvas canvas-id="wxCropperCanvas" style="position:absolute; width:{{qualityWidth}}px;height:{{qualityWidth / innerAspectRadio }}px;top:-9999px;left:-9999px;"></canvas>
-</view>

pages/components/imageCrop/index.wxss

@@ -1,430 +0,0 @@
-/* pages/cropper/cropper.wxss */
-Page {
-  /* 点的颜色 */
-  --primary-color: rgb(255, 255, 255);
-  /* 边框颜色 */
-  --primary-color-outline: rgba(255, 255, 255, 0.75);
-  /* 虚线颜色 */
-  --primary-color-dashed: rgba(255, 255, 255, 0.46);
-  /* 裁剪区域背景色 */
-  --box-bg: transparent;
-  /* 裁剪所有的背景色 */
-  --cropper-bg: #000;
-}
-
-.wx-content-info {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: var(--cropper-bg);
-}
-
-.wx-content-info .cropper-content {
-  min-height: calc(20%);
-  width: 720rpx;
-  margin: 0 auto;
-  margin-top: 8rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  z-index: 2;
-  bottom: 88rpx;
-}
-
-.wx-content-info .cropper-content .wx-corpper {
-  position: relative;
-  overflow: visible;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-  -webkit-tap-highlight-color: transparent;
-  -webkit-touch-callout: none;
-  box-sizing: border-box;
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content {
-  position: relative;
-  /* 内部的信息 */
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-content-bg {
-  display: block;
-  width: 100%;
-  min-width: 0 !important;
-  max-width: none !important;
-  height: 100%;
-  min-height: 0 !important;
-  max-height: none !important;
-  image-orientation: 0deg !important;
-  margin: 0 auto;
-  position: relative;
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-content-bg .mask {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: rgba(0, 0, 0, 0.7);
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: var(--box-bg);
-  z-index: 2;
-  outline: 2500rpx solid rgba(0, 0, 0, 0.7);
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box {
-  position: relative;
-  display: block;
-  width: 100%;
-  height: 100%;
-  overflow: visible;
-  outline: 1px solid var(--primary-color-outline);
-  /* 横向虚线 */
-  /* 纵向虚线 */
-  /* 四个方向的线  为了之后的拖动事件*/
-  /* 右下 */
-  /* 右上 */
-  /* 左下 */
-  /* 左上 */
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-cropper-view-box-img {
-  position: absolute;
-  overflow: hidden;
-}
-
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .wx-cropper-dashed-h {
-  position: absolute;
-  top: 33.33333333%;
-  left: 0;
-  width: 100%;
-  height: 33.33333333%;
-  border-top: 1px dashed var(--primary-color-dashed);
-  border-bottom: 1px dashed var(--primary-color-dashed);
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .wx-cropper-dashed-v {
-  position: absolute;
-  left: 33.33333333%;
-  top: 0;
-  width: 33.33333333%;
-  height: 100%;
-  border-left: 1px dashed var(--primary-color-dashed);
-  border-right: 1px dashed var(--primary-color-dashed);
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .wx-cropper-line-t {
-  position: absolute;
-  display: block;
-  width: 100%;
-  background-color: var(--primary-color);
-  top: 0;
-  left: 0;
-  height: 1px;
-  opacity: 0.1;
-  cursor: n-resize;
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .wx-cropper-line-t::before {
-  content: '';
-  position: absolute;
-  top: 50%;
-  right: 0rpx;
-  width: 100%;
-  -webkit-transform: translate3d(0, -50%, 0);
-  transform: translate3d(0, -50%, 0);
-  bottom: 0;
-  height: 41rpx;
-  background: transparent;
-  z-index: 11;
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .wx-cropper-line-r {
-  position: absolute;
-  display: block;
-  background-color: var(--primary-color);
-  top: 0;
-  right: 0px;
-  width: 1px;
-  opacity: 0.1;
-  height: 100%;
-  cursor: e-resize;
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .wx-cropper-line-r::before {
-  content: '';
-  position: absolute;
-  top: 0;
-  left: 50%;
-  width: 41rpx;
-  -webkit-transform: translate3d(-50%, 0, 0);
-  transform: translate3d(-50%, 0, 0);
-  bottom: 0;
-  height: 100%;
-  background: transparent;
-  z-index: 11;
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .wx-cropper-line-b {
-  position: absolute;
-  display: block;
-  width: 100%;
-  background-color: var(--primary-color);
-  bottom: 0;
-  left: 0;
-  height: 1px;
-  opacity: 0.1;
-  cursor: s-resize;
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .wx-cropper-line-b::before {
-  content: '';
-  position: absolute;
-  top: 50%;
-  right: 0rpx;
-  width: 100%;
-  -webkit-transform: translate3d(0, -50%, 0);
-  transform: translate3d(0, -50%, 0);
-  bottom: 0;
-  height: 41rpx;
-  background: transparent;
-  z-index: 11;
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .wx-cropper-line-l {
-  position: absolute;
-  display: block;
-  background-color: var(--primary-color);
-  top: 0;
-  left: 0;
-  width: 1px;
-  opacity: 0.1;
-  height: 100%;
-  cursor: w-resize;
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .wx-cropper-line-l::before {
-  content: '';
-  position: absolute;
-  top: 0;
-  left: 50%;
-  width: 41rpx;
-  -webkit-transform: translate3d(-50%, 0, 0);
-  transform: translate3d(-50%, 0, 0);
-  bottom: 0;
-  height: 100%;
-  background: transparent;
-  z-index: 11;
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .wx-cropper-point {
-  width: 5px;
-  height: 5px;
-  /* background-color: var(--primary-color); */
-  opacity: .75;
-  position: absolute;
-  z-index: 3;
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-t {
-  top: -3px;
-  left: 50%;
-  margin-left: -3px;
-  cursor: n-resize;
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-r {
-  top: 50%;
-  left: 100%;
-  margin-left: -3px;
-  margin-top: -3px;
-  cursor: n-resize;
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-tr,
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-rb,
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-bl,
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-lt {
-  cursor: n-resize;
-  width: 29rpx;
-  height: 29rpx;
-  position: absolute;
-  z-index: 1112;
-  opacity: 1;
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-rb {
-  right: 0;
-  bottom: 0;
-  -webkit-transform: translate3d(50%, 50%, 0);
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-tr {
-  right: 0;
-  top: 0;
-  -webkit-transform: translate3d(50%, -50%, 0);
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-bl {
-  left: 0;
-  bottom: 0;
-  -webkit-transform: translate3d(-50%, 50%, 0);
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-lt {
-  top: 0;
-  left: 0;
-  -webkit-transform: translate3d(-50%, -50%, 0);
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-rb::before,
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-rb::after,
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-tr::before,
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-tr::after,
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-bl::before,
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-bl::after,
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-lt::before,
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-lt::after {
-  content: '';
-  position: absolute;
-  background-color: var(--primary-color);
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-rb::before {
-  width: 6rpx;
-  height: 30rpx;
-  right: calc(44%);
-  bottom: calc(44%);
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-rb::after {
-  height: 6rpx;
-  width: 30rpx;
-  right: calc(44%);
-  bottom: calc(44%);
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-tr::before {
-  width: 6rpx;
-  height: 30rpx;
-  right: calc(44%);
-  top: calc(44%);
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-tr::after {
-  height: 6rpx;
-  width: 30rpx;
-  right: calc(44%);
-  top: calc(44%);
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-bl::before {
-  width: 6rpx;
-  height: 30rpx;
-  left: calc(44%);
-  bottom: calc(44%);
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-bl::after {
-  height: 6rpx;
-  width: 30rpx;
-  left: calc(44%);
-  bottom: calc(44%);
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-lt::before {
-  width: 6rpx;
-  height: 30rpx;
-  left: calc(44%);
-  top: calc(44%);
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-lt::after {
-  height: 6rpx;
-  width: 30rpx;
-  left: calc(44%);
-  top: calc(44%);
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-b {
-  left: 50%;
-  top: 100%;
-  margin-left: -3px;
-  margin-top: -3px;
-  cursor: n-resize;
-}
-
-.wx-content-info .cropper-content .wx-corpper .wx-corpper-content .wx-corpper-crop-box .wx-cropper-view-box .point-l {
-  left: 0%;
-  top: 50%;
-  margin-left: -3px;
-  margin-top: -3px;
-  cursor: n-resize;
-}
-
-.wx-content-info .cropper-config {
-  position: absolute;
-  bottom: 100rpx;
-  left: 0;
-  right: 0;
-  height: 88rpx;
-  z-index: 3;
-  display: flex;
-  align-items: center;
-margin-left: 102rpx;
-margin-right: 102rpx;
-}
-
-.wx-content-info .cropper-config .cropper-cancle,
-.wx-content-info .cropper-config .cropper-save {
-  color: #fff;
-  font-size: 26rpx;
-  padding: 15rpx 25px;
-  display: block;
-  font-weight: bold;
-  width: 218rpx;
-  border-radius: 44rpx;
-  text-align: center;
-
-}
-
-.cropper-save-color {
-  background: #6546A3;
-}
-
-.cropper-cancel-color {
-  margin-right: 112rpx;
-  background: rgba(0, 0, 0, 0.4);
-}
-
-
-
-
-/* 裁剪框预览内容 */
-.wx-cropper-viewer {
-  position: relative;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-}
-
-.wx-cropper-viewer image {
-  position: absolute;
-  z-index: 2;
-}

pages/deviceConMode/index.js

@@ -123,8 +123,6 @@ Page({
     })
 
     var list = []
-    console.log(this.data.typeList)
-    console.log(_typeList)
 
     this.data.typeList.forEach(element => {
       if (_typeList.find(_type => _type.type === element.type)) {

pages/deviceList/deviceList.js

@@ -26,6 +26,7 @@ Page({
     }
     let param = JSON.stringify(device)
     routeUtil.jumpParam(route_constant.connectMode, param)
+    // routeUtil.jumpParam('/pages/piano/wallpaper/wallpaper', param)
   },
   /**
    * 生命周期函数--监听页面加载

pages/piano/cropper/cropper.js

@@ -0,0 +1,271 @@
+// pages/piano/cropper/cropper.js
+
+const { BtCmd } = require('../../../devices/bluetooth/bt_cmd');
+import EventManager from '../../../utils/event_bus'
+import { EnumCmdEvent, CmdEvent } from '../../../devices/cmd_key_event';
+const { BtHelper } = require('../../../devices/bt_helper');
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    src: "",
+    width: 300,//宽度
+    height: 300,//高度
+
+    max_width: 300,
+    max_height: 300,
+    disable_rotate: true, //是否禁用旋转
+    disable_ratio: true, //锁定比例
+    limit_move: true, //是否限制移动
+    showProgress: false,
+    _imageBuffer: null,
+    progress: 0,
+  },
+  cropper: null,
+
+
+  // 将 RGBA 数据转换为 RGB565 格式
+  RGBAtoRGB565(data) {
+    const rgb565Array = new Uint16Array(data.length / 4);
+
+    for (let i = 0; i < data.length; i += 4) {
+      const r = data[i];
+      const g = data[i + 1];
+      const b = data[i + 2];
+      // 转换为 RGB565
+      const rgb565 = ((r >> 3) << 11) | ((g >> 2) << 5) | (b >> 3);
+      rgb565Array[i / 4] = rgb565;
+    }
+
+    return rgb565Array;
+  },
+
+  // 保存为 .bin 文件
+  saveAsBinFile(data, width, height) {
+    const arrayBuffer = data.buffer;
+
+    wx.getFileSystemManager().writeFile({
+      filePath: `${wx.env.USER_DATA_PATH}/image_rgb565_${width}x${height}.bin`,
+      data: arrayBuffer,
+      encoding: 'binary',
+      success: () => {
+        wx.showToast({
+          title: '保存成功',
+          icon: 'success',
+        });
+      },
+      fail: (err) => {
+        console.error('文件保存失败：', err);
+      },
+    });
+  },
+  cropperload(e) {
+    console.log('cropper加载完成');
+  },
+  upload() {
+    let that = this;
+    wx.chooseImage({
+      count: 1,
+      sizeType: ['original', 'compressed'],
+      sourceType: ['album'],
+      success(res) {
+        wx.showLoading({
+          title: '加载中',
+        })
+        const tempFilePaths = res.tempFilePaths[0];
+        //重置图片角度、缩放、位置
+        that.cropper.imgReset();
+        that.setData({
+          src: tempFilePaths
+        });
+      }
+    })
+  },
+  loadimage(e) {
+    wx.hideLoading();
+    console.log('图片', e);
+    this.cropper.imgReset();
+  },
+  clickcut(e) {
+    console.log("clickcut:", e.detail);
+    //图片预览
+    wx.previewImage({
+      current: e.detail.url, // 当前显示图片的http链接
+      urls: [e.detail.url] // 需要预览的图片http链接列表
+    })
+  },
+  cancel() {
+    wx.navigateBack({
+      delta: -1
+    })
+  },
+  submit() {
+    let _this = this
+    this.cropper.getImg((obj) => {
+      // app.globalData.imgSrc = obj.url;
+      console.log("裁剪图片:", obj);
+      _this.readLocalFileAndConvertToBase64(obj.url);
+    });
+  },
+  // 读取本地文件并转换为 Base64 字符串
+  readLocalFileAndConvertToBase64(filePath) {
+    const fs = wx.getFileSystemManager();
+    let _this = this;
+    fs.readFile({
+      filePath: filePath,
+      encoding: 'base64',
+      success: (res) => {
+        // const base64Data = 'data:image/png;base64,' + res.data;
+        let rgbData = _this.RGBAtoRGB565(res.data)
+        console.log("转换rgb:", rgbData.length)
+        _this.data._imageBuffer = rgbData;
+        _this.startImage();
+      },
+      fail: (err) => {
+        console.error('读取文件失败：', err);
+      }
+    });
+  },
+
+  startImage() {
+    BtHelper.sendData(BtCmd.wallPaper(1));
+  },
+  sendImage(imageBuffer) {
+    if (imageBuffer == null) {
+      wx.showToast({
+        title: '图片裁剪失败',
+        icon: 'none'
+      })
+      _this.endImage(2)
+      return;
+    }
+    let chunkSize = 20;
+    let _this = this
+
+    let total = imageBuffer.length
+    for (let i = 0; i < total; i += chunkSize) {
+
+      const chunk = imageBuffer.slice(i, i + chunkSize);
+      BtHelper.wallPaperData(chunk)
+      updateProgress(i, total);
+      if (i >= chunkSize) {
+        _this.endImage(0)
+      }
+    }
+  },
+  endImage(value) {
+    BtHelper.sendData(BtCmd.wallPaper(value));
+  },
+  startProgress() {
+    this.setData({
+      progress: 0,
+      showProgress: true
+    })
+  },
+  updateProgress(chunk, total) {
+    let progress = chunk / total * 100;
+    let _this = this
+    if (progress >= 100) {
+      _this.setData({
+        progress: 0,
+        showProgress: false,
+        // showCropImg: false
+      });
+      wx.showToast({
+        title: '图片上传成功',
+      })
+    } else {
+      _this.setData({
+        progress: progress,
+      });
+    }
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    console.log(options.param)
+    // let json = JSON.parse(options.param)
+
+    this.cropper = this.selectComponent("#image-cropper");
+    this.cropper.imgReset();
+    // this.setData({
+    //   scr:json,
+    // })
+    this.upload(); //上传图片
+
+    let _this = this;
+    EventManager.addNotification(CmdEvent.eventName, function (event) {
+      let name = event.cmdEvent;
+      console.log("壁纸页：", event)
+      switch (name) {
+        case EnumCmdEvent.wallPaper:
+          let otaCmd = event.wallPaper;
+          let kind = event.kind;
+          if (otaCmd === 1 && kind == 1) {
+            // 开始发送
+            _this.sendImage(_this.data._imageBuffer)
+            _this.startProgress()
+          } else if (otaCmd === 0 && kind == 1) {
+            // 发送结束
+            _this.endImage(0)
+          }
+          break;
+        default:
+          break;
+      }
+    }, this)
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+    EventManager.removeNotification(CmdEvent.eventName, this);
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/piano/cropper/cropper.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "image-cropper": "./../../components/image-cropper/image-cropper"
+  }
+}

pages/piano/cropper/cropper.wxml

@@ -0,0 +1,12 @@
+<!-- pages/piano/cropper/cropper.wxml -->
+<view class="container">
+    <image-cropper id="image-cropper" bindload="cropperload" bindimageload="loadimage" bindtapcut="clickcut" limit_move="{{limit_move}}" disable_rotate="{{disable_rotate}}" width="{{width}}" height="{{height}}" imgSrc="{{src}}" angle="{{angle}}" disable_width="{{disable_width}}" max_width="{{max_width}}" max_height="{{max_height}}" disable_height="{{disable_height}}" disable_ratio="{{disable_ratio}}"></image-cropper>
+    <view wx:if="{{showProgress}}" class="progress-container">
+        <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">保存壁纸中…{{progress}}%</view>
+    </view>
+    <view wx:if="{{!showProgress}}" class='bottom'>
+        <view class="left_btn btn_title" catchtap='cancel'>取消</view>
+        <view class="right_btn btn_title" bindtap='submit'>确定</view>
+    </view>
+</view>

pages/piano/cropper/cropper.wxss

@@ -0,0 +1,72 @@
+/* pages/piano/cropper/cropper.wxss */
+.container {
+	position: relative;
+	height: 100vh;
+	/* 确保容器占满整个视口高度 */
+}
+
+.bottom {
+	display: flex;
+	flex-direction: row;
+	position: fixed;
+	bottom: 100rpx;
+	left: 0;
+	right: 0;
+	height: 88rpx;
+
+	background-color: rgba(0, 0, 0, 0.6);
+	z-index: 12;
+}
+
+.right_btn {
+	width: 218rpx;
+	height: 88rpx;
+	background: #6546A3;
+	border-radius: 44rpx;
+
+}
+
+.left_btn {
+	width: 218rpx;
+	height: 88rpx;
+	background: rgba(0, 0, 0, 0.4);
+	border-radius: 44rpx;
+	margin-left: 102rpx;
+	margin-right: 112rpx;
+}
+
+.btn_title {
+	font-weight: 600;
+	font-size: 34rpx;
+	font-style: normal;
+	color: white;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	text-align: center;
+	justify-content: center;
+	align-items: center;
+
+}
+
+
+.progress-container {
+	position: relative;
+	margin-inline: 56rpx;
+	margin-top: 615rpx;
+}
+
+.progress {
+	width: 100%;
+}
+
+.progress-text {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	color: white;
+	font-size: 24rpx;
+	z-index: 1;
+	font-weight: 500;
+}

pages/piano/wallpaper/wallpaper.js

@@ -2,12 +2,8 @@
 const { deviceWallPaper } = require('../../../request/deviceListRequest')
 // const sharp = require('sharp');
 // const fs = require('fs');
-const {
-  BtHelper
-} = 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 route_util from '../../../utils/route_util';
 
 // import EventManager from '../../utils/event_bus'
 
@@ -53,14 +49,8 @@ Page({
         }
       }
     },
-    src: '',
-    showProgress: false,
-    showCropImg: true,
-    width: 250,//宽度
-    height: 250,//高度
-    _imageBuffer: null,
-    progressPercent: 0,
-    _timer: null,
+    showCropImg: false,
+
 
   },
   closePage() {
@@ -68,6 +58,8 @@ Page({
 
   },
   footerTap() {
+    route_util.jump("../cropper/cropper")
+    return;
     const that = this;
 
     wx.chooseMedia({
@@ -76,125 +68,37 @@ Page({
       sourceType: ['album'],
       // camera: 'back',
       success(res) {
-        console.log(res.tempFiles[0].tempFilePath)
-        console.log(res.tempFiles[0].size)
-
-        // that.setData({
-        //   imageSrc: res.tempFiles[0].tempFilePath, // 图片路径
-        //   showCrop: true
+        // console.log(res.tempFiles[0].tempFilePath)
+        // console.log(res.tempFiles[0].size)
+        //重置图片角度、缩放、位置
+
+
+        // wx.getImageInfo({
+        //   src: res.tempFiles[0].tempFilePath,
+        //   success(res) {
+        //     console.log(res)
+        //     wx.cropImage({
+        //       src: res.path,// 图片路径
+        //       cropScale: '1:1', // 裁剪比例
+        //       success(res) {
+        //         console.log("裁剪后的图片", res)
+        //         that.setData({
+        //           showCropImg: true,
+        //           topImg: { "pic": res.tempFilePath }
+        //         })
+        //         that.convertImageToRGB565(res.tempFilePath)
+
+        //       },
+
+        //     })
+        //   }
         // })
 
-        // wx.editImage({
-        //   src: res.tempFiles[0].tempFilePath, // 图片路径
-        // })
-
-        wx.getImageInfo({
-          src: res.tempFiles[0].tempFilePath,
-          success(res) {
-            console.log(res)
-            wx.cropImage({
-              src: res.path,// 图片路径
-              cropScale: '1:1', // 裁剪比例
-              success(res) {
-                console.log("裁剪后的图片", res)
-                that.setData({
-                  showCropImg: true,
-                  topImg: { "pic": res.tempFilePath }
-                })
-                that.convertImageToRGB565(res.tempFilePath)
-
-              },
-
-            })
-          }
-        })
-
       }
     })
 
   },
 
-  // 将图片转换为 RGB565
-  convertImageToRGB565(imagePath) {
-    const ctx = wx.createCanvasContext('imageCanvas');
-    // const ctx = Canvas.getContext('imageCanvas');
-    let _this = this;
-    let width = 533;
-    let height = 533;
-    try {
-      // 设置 Canvas 尺寸
-      // _this.setData({ canvasWidth: width, canvasHeight: height });
-
-      // 在 Canvas 中绘制图片
-      ctx.drawImage(imagePath, 0, 0, width, height);
-      ctx.draw(false, () => {
-        // 获取图片像素数据
-        wx.canvasGetImageData({
-          canvasId: 'imageCanvas',
-          x: 0,
-          y: 0,
-          width,
-          height,
-          success: (res) => {
-            console.log('获取像素数据成功：', res.data);
-            if (res.data) {
-              _this.setData({
-                showCropImg: true,
-                topImg: { "pic": imagePath }
-              })
-              const rgb565Data = _this.RGBAtoRGB565(res.data);
-              _this.data.imageBuffer = rgb565Data;
-            }
-
-            // this.saveAsBinFile(rgb565Data, width, height);
-          },
-          fail: (err) => {
-            console.error('获取像素数据失败：', err);
-          },
-        });
-      });
-    } catch (error) {
-      console.log(error)
-    }
-
-  },
-
-  // 将 RGBA 数据转换为 RGB565 格式
-  RGBAtoRGB565(data) {
-    const rgb565Array = new Uint16Array(data.length / 4);
-
-    for (let i = 0; i < data.length; i += 4) {
-      const r = data[i];
-      const g = data[i + 1];
-      const b = data[i + 2];
-      // 转换为 RGB565
-      const rgb565 = ((r >> 3) << 11) | ((g >> 2) << 5) | (b >> 3);
-      rgb565Array[i / 4] = rgb565;
-    }
-
-    return rgb565Array;
-  },
-
-  // 保存为 .bin 文件
-  saveAsBinFile(data, width, height) {
-    const arrayBuffer = data.buffer;
-
-    wx.getFileSystemManager().writeFile({
-      filePath: `${wx.env.USER_DATA_PATH}/image_rgb565_${width}x${height}.bin`,
-      data: arrayBuffer,
-      encoding: 'binary',
-      success: () => {
-        wx.showToast({
-          title: '保存成功',
-          icon: 'success',
-        });
-      },
-      fail: (err) => {
-        console.error('文件保存失败：', err);
-      },
-    });
-  },
-
   imageTap(e) {
     // console.log(e)
     // wxfile://tmp_d3e57489ead39c698676ff860df9cb8a37f66ee1a4777dbb.jpg
@@ -230,71 +134,12 @@ Page({
     }
 
     this.setData({
-      imageSrc: "",//要裁剪的图片
-      showCrop: false
+      showCropImg: true,
+      topImg: { "pic": img.path }
     })
 
   },
-  startImage() {
-    BtHelper.sendData(BtCmd.wallPaper(1));
-  },
-  sendImage(imageBuffer) {
-    if (imageBuffer == null) {
-      wx.showToast({
-        title: '图片裁剪失败',
-        icon: 'none'
-      })
-      _this.endImage(2)
-      return;
-    }
-    let chunkSize = 20;
-    let _this = this
-
-    _this.setData({
-      progress: 0,
-      progressPercent: 0
-    });
-
-    for (let i = 0; i < imageBuffer.length; i += chunkSize) {
 
-      const chunk = imageBuffer.slice(i, i + chunkSize);
-      BtHelper.wallPaperData(chunk)
-      if (i >= chunkSize) {
-        _this.endImage(0)
-      }
-    }
-  },
-  endImage(value) {
-    BtHelper.sendData(BtCmd.wallPaper(value));
-  },
-  startProgress() {
-    let _this = this;
-    this.setData({
-      showProgress: true
-    })
-    // 定时器，每100毫秒执行一次
-    let progress = 0;
-    _this._timer = setInterval(function () {
-      if (progress >= 100) {
-        clearInterval(_this._timer); // 停止定时器
-        _this.setData({
-          progress: 0,
-          progressPercent: 0,
-          showProgress: false,
-          // showCropImg: false
-        });
-        wx.showToast({
-          title: '图片上传成功',
-        })
-      } else {
-        progress += 1; // 每次增加1%
-        _this.setData({
-          progress: progress,
-          progressPercent: progress
-        });
-      }
-    }, 100);
-  },
   /**
    * 生命周期函数--监听页面加载
    */
@@ -303,25 +148,7 @@ Page({
     console.log(param)
     this.wallpaperList();
 
-    let _this = this;
-    EventManager.addNotification(CmdEvent.eventName, function (event) {
-      let name = event.cmdEvent;
-      console.log("壁纸页：", event)
-      switch (name) {
-        case EnumCmdEvent.wallPaper:
-          let otaCmd = event.wallPaper;
-          let kind = event.kind;
-          if (otaCmd === 1 && kind == 1) {
-            // 开始发送
-            _this.sendImage(_this.data.imageBuffer)
-            _this.startProgress()
-          } else if (otaCmd === 0 && kind == 1) {
-            // 发送结束
-            _this.endEnd()
-          }
-          break;
-      }
-    }, this)
+
 
   },
 
@@ -350,7 +177,6 @@ Page({
    * 生命周期函数--监听页面卸载
    */
   onUnload() {
-    EventManager.removeNotification(CmdEvent.eventName, this);
   },
 
   /**

pages/piano/wallpaper/wallpaper.json

@@ -1,6 +1,5 @@
 {
   "usingComponents": {
-    "nav-bar": "./../../components/navbar/navbar",
-    "image-cropper": "./../../components/imageCrop/index"
+    "nav-bar": "./../../components/navbar/navbar"
   }
 }

pages/piano/wallpaper/wallpaper.wxml

@@ -2,9 +2,9 @@
 <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='{{navbarData}}'></nav-bar>
     <view class="img_section">
-        <image wx:if="{{!showCropImg}}" src="{{topImg.pic}}" class="select_img"></image>
-        <canvas wx:if="{{showCropImg}}" class="canvas_img" canvas-id="imageCanvas"></canvas>
-        <image src="../../../images/common/icon_sel.png" class="select_icon"></image>
+        <image  src="{{topImg.pic}}" class="select_img"></image>
+        <!-- <canvas wx:if="{{showCropImg}}" class="canvas_img" canvas-id="imageCanvas"></canvas> -->
+        <image  src="../../../images/common/icon_sel.png" class="select_icon"></image>
     </view>
     <view class="grid-container">
         <block wx:for="{{imageList}}" wx:key="index" wx:for-item="item" wx:for-index="index">
@@ -15,14 +15,5 @@
         <image src="../../../images/common/icon_add.png" mode="aspectFill" />
         <view>上传图片</view>
     </view>
-    <!-- <image-cropper wx:if="{{scr}}" imageSrc="{{src}}"></image-cropper> -->
-    <!-- <view wx:if="{{src}}" class='bottom'>
-        <button catchtap='updateImage'>更换照片</button>
-        <button type="primary" bindtap='submit'>确定裁剪</button>
-    </view> -->
-    <!-- <image-cropper bind:close="hideCut" cutRatio="1" wx:if="{{showCrop}}" imageSrc="{{imageSrc}}" /> -->
-    <view wx:if="{{showProgress}}" class="progress-container">
-        <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

@@ -2,26 +2,24 @@
 
 .img_section {
     margin-top: 32rpx;
-    margin-left: 108rpx;
-    width: 533rpx;
+    margin-left: 170rpx;
+    width: 400rpx;
     position: relative;
     align-items: center;
     justify-content: center;
 }
 
 .select_img {
-    width: 533rpx;
-    height: 533rpx;
+    width: 400rpx;
+    height: 400rpx;
     border-radius: 16rpx;
     background-color: #F2F5F7;
     overflow: hidden;
 }
 
 .canvas_img {
-    margin-top: 32rpx;
-    margin-left: 108rpx;
-    width: 533rpx;
-    height: 533rpx;
+    width: 400rpx;
+    height: 400rpx;
     border-radius: 16rpx;
     background-color: #F2F5F7;
     overflow: hidden;
@@ -82,24 +80,3 @@
     margin-top: -16rpx;
 
 }
-
-.progress-container {
-    position: relative;
-    margin-inline: 56rpx;
-    margin-top: 615rpx;
-}
-
-.progress {
-    width: 100%;
-}
-
-.progress-text {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    color: white;
-    font-size: 24rpx;
-    z-index: 1;
-    font-weight: 500;
-}