Преглед на файлове

feature:修改设备掉线的问题,增加版本号

zeng.chen преди 6 месеца
родител
ревизия
1f8a894433
променени са 4 файла, в които са добавени 17 реда и са изтрити 9 реда
  1. 9 8
      devices/ble_manager.js
  2. 1 1
      pages/index/index.js
  3. 3 0
      pages/ota/ota.js
  4. 4 0
      pages/ota/ota.wxml

+ 9 - 8
devices/ble_manager.js

@@ -204,8 +204,8 @@ class bleManager {
       }
       // that.disconnect(result)
       //断开连接是失败的, 只能监听到下线。
-      console.log("监听到设备状态变化:", result);
-      that.errorDisconnect(result);
+      console.log("监听到设备状态变化0:", result);
+      that.errorDisconnect(result.connected);
 
 
       // ///是否已配对
@@ -484,7 +484,7 @@ class bleManager {
             that.disconnect({ "deviceId": device.deviceId })
           } else {
             that.isConnecting = false;
-            that.errorDisconnect()
+            that.errorDisconnect(false)
             that.publicDevice = null
           }
           console.error('连接失败:', err);
@@ -514,15 +514,15 @@ class bleManager {
         dataView.setUint8(index, value); // 将每个16进制数值写入到 buffer 中
       });
       // }
-      let logData = new Uint8Array(buffer);
-      console.log('开始发送数据:', logData);
+      // let logData = new Uint8Array(buffer);
+      console.log('开始发送数据:', buffer);
       wx.writeBLECharacteristicValue({
         deviceId: that.publicDevice.deviceId,
         serviceId: that.publicDevice.serviceId,
         characteristicId: that.publicDevice.characteristicId,
         value: buffer,
         success: (res) => {
-          console.log('发送数据成功:', res, callback);
+          // console.log('发送数据成功:', res, callback);
           if (callback) {
             callback(true)
           }
@@ -533,7 +533,7 @@ class bleManager {
             callback(false)
           }
           console.log('数据发送失败:', err);
-          that.errorDisconnect()
+          that.errorDisconnect(false)
           resolve(false);
         }
       });
@@ -735,8 +735,9 @@ class bleManager {
   setStateChangeCallback(callback) {
     this.stateChangeCallback = callback;
   }
-  errorDisconnect() {
+  errorDisconnect(result) {
     // this.disconnect();
+    console.log("监听到设备状态变化:", result, this.stateChangeCallback);
     if (this.stateChangeCallback) {
       let device = this.publicDevice ?? {};
       this.stateChangeCallback({ "deviceId": device.deviceId ?? "", "state": "offline" });

+ 1 - 1
pages/index/index.js

@@ -779,7 +779,7 @@ Page({
           that.updateDeviceList(that.data.deviceList, false, false);
         }
       }
-    });
+    }, that);
   },
 
   // 新添加Wifi设备

+ 3 - 0
pages/ota/ota.js

@@ -35,6 +35,9 @@ Page({
   checkOtaVersion(device) {
     let _this = this;
     device.clientType = "MW-S2"
+    _this.setData({
+      device: device,
+    })
     deviceVersion(device.clientType, device.connectType, device.version ?? "1.0.0").then(res => {
       console.log("OTA2:", res);
       let updateData = res ?? {};

+ 4 - 0
pages/ota/ota.wxml

@@ -14,6 +14,10 @@
         <text class="label">MAC地址</text>
         <text class="arrow">{{device.mac}}</text>
     </view>
+    <view class="item">
+        <text class="label">版本号</text>
+        <text class="arrow">{{device.version}}</text>
+    </view>
     <view wx:if="{{isShowOta}}" class="button main_color" bind:tap="startOtaTap">
         <view class="left-content">
             <text class="button_title">{{buttonTips}}</text>