Selaa lähdekoodia

feature:修改首页自动连接流程

zeng.chen 6 kuukautta sitten
vanhempi
commit
36b15344ce
2 muutettua tiedostoa jossa 11 lisäystä ja 6 poistoa
  1. 4 0
      devices/ble_manager.js
  2. 7 6
      pages/index/index.js

+ 4 - 0
devices/ble_manager.js

@@ -491,6 +491,10 @@ class bleManager {
   // 发送数据到指定设备
   async sendData(data, callback) {
     var that = this
+    if (that.publicDevice == null) {
+      console.log("没有连接设备");
+      return;
+    }
     return new Promise((resolve, reject) => {
       var buffer = null;
       // todo 判断是否是buffer

+ 7 - 6
pages/index/index.js

@@ -272,7 +272,7 @@ Page({
       return;
     }
     if (v) {
-      let device = that.data.deviceList[0];
+      var device = that.data.deviceList[0];
       console.log("开始连接设备0", device);
       if (device.state === 'online' || device.connectType != 1) {
         return;
@@ -280,11 +280,11 @@ Page({
       // });
       BtHelper.getInstance().connect(device, function (isConnected, d) {
         if (isConnected) {
-          d.connectType = 1;
-          d.state = 'online';
-          d.imageUrl = device.img;
-          that.addBlueDevice(d);
+          device.state = 'online';
+        } else {
+          device.state = 'offline';
         }
+        that.addBlueDevice(device);
       });
 
     } else {
@@ -578,7 +578,8 @@ Page({
       device.name = device.devName;
       BtHelper.getInstance().connect(device, function (isConnected, d) {
         if (isConnected) {
-          that.addBlueDevice(d);
+          device.state = "online";
+          that.addBlueDevice(device);
         }
       });
     } else {