feature: 本地图片地址加载失败处理

pages/pageA/index/index.js

@@ -494,7 +494,7 @@ Page({
 
   ///点击item
   // [{"deviceId":"BLUFI_7cdfa1fcbb24","name":"BLUFI_7cdfa1fcbb24","state":"online","ProdModel":"MW-2AX(WIFI-N)","devName":"猫王小王子OTR-X"}]
-  onTapItem(e) {
+  async onTapItem(e) {
     var that = this;
     var isLogin = that.getIsLogin();
     if (!isLogin) {
@@ -519,9 +519,9 @@ Page({
     ///去蓝牙连接处理
     // {"connectType":1,"deviceId":"E4:9F:80:09:40:EC","name":"E4:9F:80:09:40:EC","state":"online","ProdModel":"MW-SR1(4G_WIFI)","devName":"猫王音响x阿基米德 SR1 妙播收音机"}
     if (index === deviceListSelect && device.state === "online") {
-      route_util.jumpParam('/pages/deviceDetail/detail', JSON.stringify(device))
+      var param = '?param=' + JSON.stringify(device);
+      route_util.jumpParam(route_constant.deviceDetail, param);
     } else if (device.state === "offline") {
-
       var deviceList = that.getDeviceList();
       var deviceListSelect = that.getDeviceListSelect();
       if (deviceListSelect != null && deviceList.length > deviceListSelect) {
@@ -571,9 +571,8 @@ Page({
       return
     };
     var device = deviceList[deviceListSelect];
-    wx.navigateTo({
-      url: './../deviceWake/deviceWake?deviceId=' + device.deviceId + "&clientType=" + device.ProdModel,
-    });
+    var param = '?deviceId=' + device.deviceId + "&clientType=" + device.ProdModel;
+    route_util.jumpParam(route_constant.deviceWake, param);
   },
 
   ///删除当前设备

pages/pageA/login/login.wxml

@@ -3,13 +3,13 @@
   <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="mair">
-    <image mode="widthFix" src="./../../img/k.png"></image>
+    <image mode="widthFix" src="../../../img/k.png"></image>
     <view class="loginbut">
       <view class="mode" wx:if="{{!isAgree}}" catchtap="notlogin"></view>
       <button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">手机号快速登录</button>
     </view>
     <view class="ys">
-      <!-- <image bindtap="egree" mode="aspectFill" src="./../../img/{{isAgree ? 'h' : 'j'}}.png"></image> -->
+      <!-- <image bindtap="egree" mode="aspectFill" src="../../../img/{{isAgree ? 'h' : 'j'}}.png"></image> -->
       <image style="margin-top: 5rpx;" bindtap="egree" mode="aspectFill" src="../../../img/login_agree_{{isAgree ? 'sel' : 'nor'}}.png"></image>
       <view>我已阅读并同意<text data-index="0" bindtap="goabout">《猫王妙播用户服务协议》</text>
         <text data-index="1" bindtap="goabout">《猫王妙播用户隐私协议》</text>

pages/pageC/deviceDetail/deviceDetail.js

@@ -23,8 +23,68 @@ Page({
     updateData: {},
     powerOpen: false,
     isShowWallpaper: false,
+  },
+
+  onLoad: function (options) {
+    // let device = JSON.parse(options.param);
+    console.log(getApp().globalData.mDeviceList.length)
+    let device = JSON.parse(options.param);
+    // let device = getApp().globalData.mDeviceList[0] ?? JSON.parse(options.param);
+    if (device.connectType != '1') {
+      return
+    }
+    device.clientType = device.clientType ?? device.ProdModel
+
+    console.log("设备详情", device)
+    let isConnect = device.state === 'online'
+    if (!isConnect) {
+      // btHelper
+      wx.showToast({
+        title: '设备已经失去连接',
+      })
+      return;
+    }
+    this.setData({
+      device: device,
+      powerOpen: (device.pauseSleep ?? -1) > 0,
+      isShowWallpaper: device.clientType === 'MW-S2'
+    })
 
+    const btHelper = BtHelper.getInstance();
+    let isShowOta = device.clientType === 'MW-S2'
+    if (isShowOta) {
+      btHelper.getVersion()
+      // this.checkOtaVersion(device);
+    }
+    // btHelper.getPauseSleep()
+
+    let _this = this;
+    EventManager.addNotification(CmdEvent.eventName, function (event) {
+      let name = event.cmdEvent;
+      // console.log("详情页：", name, event)
+      switch (name) {
+        case EnumCmdEvent.version:
+          _this.data.device.version = event.version;
+          console.log("详情页1：", event.version)
+
+          _this.checkOtaVersion(_this.data.device);
+          break;
+        case EnumCmdEvent.authSleepStatus:
+          let value = event.pauseSleep;
+          console.log("详情页2：", value)
+          _this.setData({
+            powerOpen: (value ?? -1) > 0
+          })
+          break;
+        case EnumCmdEvent.onoffline:
+          console.log("详情页3：")
+          //目前只有下线
+          _this.data.device.state = "offline"
+          break;
+      }
+    }, this);
   },
+
   checkOtaVersion(device) {
     let _this = this;
     device.clientType = "MW-S2"
@@ -40,7 +100,6 @@ Page({
     })
   },
 
-
   goToWallpaper: function () {
     var param = '?param=' + JSON.stringify(this.data.device);
     route_util.jumpParam('/pages/piano/wallpaper/wallpaper', param);
@@ -87,68 +146,6 @@ Page({
       }
     })
   },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    // let device = JSON.parse(options.param);
-    console.log(getApp().globalData.mDeviceList.length)
-    let device = JSON.parse(options.param);
-    // let device = getApp().globalData.mDeviceList[0] ?? JSON.parse(options.param);
-    if (device.connectType != '1') {
-      return
-    }
-    device.clientType = device.clientType ?? device.ProdModel
-
-    console.log("设备详情", device)
-    let isConnect = device.state === 'online'
-    if (!isConnect) {
-      // btHelper
-      wx.showToast({
-        title: '设备已经失去连接',
-      })
-      return;
-    }
-    this.setData({
-      device: device,
-      powerOpen: (device.pauseSleep ?? -1) > 0,
-      isShowWallpaper: device.clientType === 'MW-S2'
-    })
-
-    const btHelper = BtHelper.getInstance();
-    let isShowOta = device.clientType === 'MW-S2'
-    if (isShowOta) {
-      btHelper.getVersion()
-      // this.checkOtaVersion(device);
-    }
-    // btHelper.getPauseSleep()
-
-    let _this = this;
-    EventManager.addNotification(CmdEvent.eventName, function (event) {
-      let name = event.cmdEvent;
-      // console.log("详情页：", name, event)
-      switch (name) {
-        case EnumCmdEvent.version:
-          _this.data.device.version = event.version;
-          console.log("详情页1：", event.version)
-
-          _this.checkOtaVersion(_this.data.device);
-          break;
-        case EnumCmdEvent.authSleepStatus:
-          let value = event.pauseSleep;
-          console.log("详情页2：", value)
-          _this.setData({
-            powerOpen: (value ?? -1) > 0
-          })
-          break;
-        case EnumCmdEvent.onoffline:
-          console.log("详情页3：")
-          //目前只有下线
-          _this.data.device.state = "offline"
-          break;
-      }
-    }, this)
-  },
 
   onUnload() {
     EventManager.removeNotification(CmdEvent.eventName, this)

pages/pageC/deviceWake/deviceWake.js

@@ -6,7 +6,6 @@ const {
   deviceWakedetail
 } = require('../../../utils/api.js');
 
-import lexin_devices from '../../../utils/lexin/devices.js';
 import lexin_util from '../../../utils/lexin/util.js';
 
 Page({

pages/pageC/deviceWake/deviceWake.wxml

@@ -1,15 +1,14 @@
-<!--pages/deviceWake/deviceWake.wxml-->
 <view class="deviceWake">
   <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="content">
     <view class="tip">
-      <image src="./../../img/gt.png" mode="heightFix"></image>
+      <image src="../../../img/gt.png" mode="heightFix"></image>
       <text>唤醒功能仅在设备进入休眠后生效，请保持设备网络通畅并且电量充足</text>
     </view>
     <view class="waskList">
       <view class="swicth">
-        <image src="./../../img/wk1.png" mode="heightFix"></image>
+        <image src="../../../img/wk1.png" mode="heightFix"></image>
         <text>倒计时休眠</text>
         <view class="swicth-view">
           <switch color="#6D00FF" checked="{{switch1Checked}}" bindchange="switch1Change" />
@@ -24,7 +23,7 @@
               <text>{{alarm_id_0_time}}</text>
             </view>
           </picker>
-          <image src="./../../img/b.png" mode="heightFix"></image>
+          <image src="../../../img/b.png" mode="heightFix"></image>
         </view>
       </view>
       <view class="page__bd" style="opacity: {{switch1Checked ? 1 : 0.4}};">
@@ -32,14 +31,14 @@
         <view class="choice">
           <view class="mode" wx:if="{{!switch1Checked}}"></view>
           <text data-index="0" bindtap="gorepeat">{{repeat0}}</text>
-          <image src="./../../img/b.png" mode="heightFix"></image>
+          <image src="../../../img/b.png" mode="heightFix"></image>
         </view>
       </view>
     </view>
     <view class="hr"></view>
     <view class="waskList">
       <view class="swicth">
-        <image src="./../../img/wk2.png" mode="heightFix"></image>
+        <image src="../../../img/wk2.png" mode="heightFix"></image>
         <text>定时唤醒</text>
         <view class="swicth-view">
           <switch color="#6D00FF" checked="{{switch2Checked}}" bindchange="switch2Change" />
@@ -54,7 +53,7 @@
               <text>{{time}}</text>
             </view>
           </picker>
-          <image src="./../../img/b.png" mode="heightFix"></image>
+          <image src="../../../img/b.png" mode="heightFix"></image>
         </view>
       </view>
       <view class="page__bd" style="opacity: {{switch2Checked ? 1 : 0.4}};">
@@ -62,7 +61,7 @@
         <view class="choice">
           <view class="mode" wx:if="{{!switch2Checked}}"></view>
           <text data-index="1" bindtap="gorepeat">{{repeat}}</text>
-          <image src="./../../img/b.png" mode="heightFix"></image>
+          <image src="../../../img/b.png" mode="heightFix"></image>
         </view>
       </view>
       <!-- <view class="page__bd" style="opacity: {{switch2Checked ? 1 : 0.4}};">
@@ -70,7 +69,7 @@
         <view class="choice">
           <view class="mode" wx:if="{{!switch2Checked}}"></view>
           <text bindtap="goWakeList">{{wakeName}}</text>
-          <image src="./../../img/b.png" mode="heightFix"></image>
+          <image src="../../../img/b.png" mode="heightFix"></image>
         </view>
       </view> -->
     </view>

pages/pageC/wakeList/wakeList.js

@@ -7,7 +7,7 @@ const {
   listByDevice,
   pageByDevice,
   radioList
-} = require('./../../utils/api.js');
+} = require('../../../utils/api.js');
 
 Page({
   data: {

pages/pageC/wakeList/wakeList.wxml

@@ -1,7 +1,7 @@
 <view class="wakeList">
   <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="ps">
-    <image mode="heightFix" src="./../../img/vaa.png"></image>
+    <image mode="heightFix" src="../../../img/vaa.png"></image>
     <text>设备网络异常时，将会使用默认闹铃声</text>
   </view>
   <view class="list" style="height: calc(100vh - {{navBarHeight}}px - 36rpx);">
@@ -15,7 +15,7 @@
           {{deviceWake.length > 0 ? deviceWake[0].audioName : ""}}
         </text>
       </view>
-      <image wx:if="{{actionIndex === index}}" class="action" style="height:28rpx; width:28rpx;" src="./../../img/gg.png" mode="aspectFit"></image>
+      <image wx:if="{{actionIndex === index}}" class="action" style="height:28rpx; width:28rpx;" src="../../../img/gg.png" mode="aspectFit"></image>
     </view>
   </view>
   <view wx:if="{{isShowWakeDetail}}" class="wakeDetail">
@@ -25,7 +25,7 @@
         <view class="li {{actionWakeIndex === index ? 'action' : ''}}" wx:for="{{detailList}}" data-index="{{index}}" bindtap="actionWakeDetail">
           <text>{{index + 1}}</text>
           <text>{{item.audioName}}</text>
-          <image wx:if="{{actionWakeIndex === index}}" src="./../../img/gg.png" style="height:28rpx; width:28rpx;" mode="aspectFit"></image>
+          <image wx:if="{{actionWakeIndex === index}}" src="../../../img/gg.png" style="height:28rpx; width:28rpx;" mode="aspectFit"></image>
         </view>
       </view>
       <view class="foot">

pages/pageD/download/download.wxml

@@ -2,7 +2,7 @@
 <view class="download">
   <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>
-  <image style="width: 100vw;" class="logo" mode="widthFix" src="./../../img/s.png"></image>
+  <image style="width: 100vw;" class="logo" mode="widthFix" src="../../../img/s.png"></image>
   <view class="li">
     <view class="h3">
       方式一

pages/pageD/ota/ota.wxml

@@ -1,32 +1,31 @@
-<!-- pages/OTA/ota.wxml -->
 <view class="section">
-    <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 style="height: 32rpx;"></view>
-    <view class="item">
-        <text class="label">制造商</text>
-        <text class="arrow">AirSmart</text>
-    </view>
-    <view class="item">
-        <text class="label">产品型号</text>
-        <text class="arrow">{{device.clientType}}</text>
-    </view>
-    <view class="item">
-        <text class="label">MAC地址</text>
-        <text class="arrow">{{device.mac}}</text>
-    </view>
-    <view wx:if="{{isShowOta}}" class="button main_color" bind:tap="startOtaTap">
-        {{buttonTips}}
-    </view>
+  <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 style="height: 32rpx;"></view>
+  <view class="item">
+    <text class="label">制造商</text>
+    <text class="arrow">AirSmart</text>
+  </view>
+  <view class="item">
+    <text class="label">产品型号</text>
+    <text class="arrow">{{device.clientType}}</text>
+  </view>
+  <view class="item">
+    <text class="label">MAC地址</text>
+    <text class="arrow">{{device.mac}}</text>
+  </view>
+  <view wx:if="{{isShowOta}}" class="button main_color" bind:tap="startOtaTap">
+    {{buttonTips}}
+  </view>
 </view>
 <view wx:if="{{otaStatus === 3}}" class="background">
-    <view class="content">
-        <view class="pro_title">正在升级</view>
-        <view class="progress-container">
-            <progress class="progress" border-radius="16rpx" stroke-width="32rpx" percent="{{progress}}" activeColor="rgba(101, 70, 163, 1)" backgroundColor="rgba(101,70,163,0.16)" stroke-width="26" border-radius="13" />
-            <view class="progress-text" style="left: {{progressTextLeft}};">
-                {{progressPercent}}%
-            </view>
-        </view>
-        <view class="pro_tips">升级过程中请勿离开当前页面</view>
+  <view class="content">
+    <view class="pro_title">正在升级</view>
+    <view class="progress-container">
+      <progress class="progress" border-radius="16rpx" stroke-width="32rpx" percent="{{progress}}" activeColor="rgba(101, 70, 163, 1)" backgroundColor="rgba(101,70,163,0.16)" stroke-width="26" border-radius="13" />
+      <view class="progress-text" style="left: {{progressTextLeft}};">
+        {{progressPercent}}%
+      </view>
     </view>
+    <view class="pro_tips">升级过程中请勿离开当前页面</view>
+  </view>
 </view>

pages/pageD/repeat/repeat.wxml

@@ -4,7 +4,7 @@
   <view class="page-section">
     <view data-index="{{index}}" bindtap="action" class="list" wx:for="{{week_actives}}">
       <text>{{items[index].name}}</text>
-      <image wx:if="{{week_actives[index] === 1}}" src="./../../img/gg.png" style="height:28rpx; width:28rpx;" mode="aspectFit"></image>
+      <image wx:if="{{week_actives[index] === 1}}" src="../../../img/gg.png" style="height:28rpx; width:28rpx;" mode="aspectFit"></image>
     </view>
   </view>
 </view>

pages/pageD/setWifi/setWifi.wxml

@@ -1,12 +1,11 @@
-<!-- pages/setWifi/setWifi.wxml -->
 <view class="container">
-    <view class="input-group">
-        <label class="label">Wi-Fi 名称</label>
-        <input class="input" type="text" placeholder="请输入Wi-Fi名称" value="{{wifiName}}" bindinput="onWifiNameInput" />
-    </view>
-    <view class="input-group">
-        <label class="label">密码</label>
-        <input class="input" type="password" placeholder="请输入密码" value="{{wifiPassword}}" bindinput="onWifiPasswordInput" />
-    </view>
-    <button class="confirm-button" bindtap="onConfirm">确认</button>
+  <view class="input-group">
+    <label class="label">Wi-Fi 名称</label>
+    <input class="input" type="text" placeholder="请输入Wi-Fi名称" value="{{wifiName}}" bindinput="onWifiNameInput" />
+  </view>
+  <view class="input-group">
+    <label class="label">密码</label>
+    <input class="input" type="password" placeholder="请输入密码" value="{{wifiPassword}}" bindinput="onWifiPasswordInput" />
+  </view>
+  <button class="confirm-button" bindtap="onConfirm">确认</button>
 </view>

pages/piano/cropper/cropper.wxml

@@ -1,13 +1,12 @@
-<!-- pages/piano/cropper/cropper.wxml -->
 <nav-bar class="navi_bar" bind:goBack="_goBack" nav-bgc-class="ex-nav-bgc-class" navbar-data='{{navbarData}}' callback="true" bind:callback="callback"></nav-bar>
 <view class="container">
-    <image-cropper id="image-cropper" bindload="cropperload" bindimageload="loadimage" bindtapcut="clickcut" limit_move="true" disable_rotate="true" width="{{width}}" height="{{height}}" imgSrc="{{src}}" disable_width="true" max_width="{{width}}" max_height="{{height}}" disable_height="true" disable_ratio="true" min_width="{{width}}" min_height="{{height}}" max_scale="{{max_scale}}" export_scale="1.5"></image-cropper>
-    <view wx:if="{{showProgress}}" class="progress-container">
-        <progress class="progress" border-radius="26rpx" percent="{{progress}}" activeColor="rgba(101, 70, 163, 1)" backgroundColor="rgba(0, 0, 0, 0.40)" 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>
+  <image-cropper id="image-cropper" bindload="cropperload" bindimageload="loadimage" bindtapcut="clickcut" limit_move="true" disable_rotate="true" width="{{width}}" height="{{height}}" imgSrc="{{src}}" disable_width="true" max_width="{{width}}" max_height="{{height}}" disable_height="true" disable_ratio="true" min_width="{{width}}" min_height="{{height}}" max_scale="{{max_scale}}" export_scale="1.5"></image-cropper>
+  <view wx:if="{{showProgress}}" class="progress-container">
+    <progress class="progress" border-radius="26rpx" percent="{{progress}}" activeColor="rgba(101, 70, 163, 1)" backgroundColor="rgba(0, 0, 0, 0.40)" 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/wallpaper/wallpaper.wxml

@@ -1,18 +1,17 @@
-<!-- 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='{{navbarData}}'></nav-bar>
-    <view wx:if="{{topImg.pic}}" class="img_section" bind:tap="imageTopTap">
-        <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">
-            <image class="device_img" src="{{item.pic}}" mode="aspectFill" bind:tap="imageTap" data-image="{{item}}" />
-        </block>
-    </view>
-    <view class="footer" bind:tap="footerTap">
-        <image src="../../../images/common/icon_add.png" mode="aspectFill" />
-        <view>上传图片</view>
-    </view>
+  <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 wx:if="{{topImg.pic}}" class="img_section" bind:tap="imageTopTap">
+    <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">
+      <image class="device_img" src="{{item.pic}}" mode="aspectFill" bind:tap="imageTap" data-image="{{item}}" />
+    </block>
+  </view>
+  <view class="footer" bind:tap="footerTap">
+    <image src="../../../images/common/icon_add.png" mode="aspectFill" />
+    <view>上传图片</view>
+  </view>
 </view>

utils/route_constant.js

@@ -20,10 +20,13 @@ const deviceConnect0 = "./../../pageB/deviceConnect0/deviceConnect0";
 const deviceConnect1 = "./../../pageB/deviceConnect1/deviceConnect1";
 const deviceConnect2 = "./../../pageB/deviceConnect2/deviceConnect2";
 
-///****************** pageB ********************/
+///****************** pageC ********************/
 const aboutInfo = "./../../pageC/aboutInfo/aboutInfo";
+const deviceDetail = "./../../pageC/deviceDetail/deviceDetail";
+const deviceWake = "./../../pageC/deviceWake/deviceWake";
 
-const setWifi = "../setWifi/setWifi";
+///****************** pageD ********************/
+const setWifi = "./../../pageD/setWifi/setWifi";
 
 module.exports = {
   ///路由
@@ -42,5 +45,7 @@ module.exports = {
   deviceConnect1: deviceConnect1,
   deviceConnect2: deviceConnect2,
   aboutInfo: aboutInfo,
+  deviceDetail: deviceDetail,
+  deviceWake: deviceWake,
   setWifi: setWifi,
 }