feature: 数据处理

devices/ble_manager.js

@@ -333,10 +333,10 @@ class bleManager {
     const indexRoot = route_constant.indexRoot;
     const connectBleRoot = route_constant.connectBleRoot;
     var lastPageRoute = route_util.getLastPageRoute();
-    if (lastPageRoute != indexRoot && lastPageRoute != connectBleRoot) {
-      console.log("搜索蓝牙设备失败，请返回首页0");
-      return;
-    }
+    // if (lastPageRoute != indexRoot && lastPageRoute != connectBleRoot) {
+    //   console.log("搜索蓝牙设备失败，请返回首页0");
+    //   return;
+    // }
 
     ///蓝牙连接 做限制
     if (lastPageRoute == indexRoot) {

pages/deviceConnect4/deviceConnect4.js

@@ -67,11 +67,8 @@ Page({
 
     BtHelper.getInstance().startScan(device,
       async function (b) {
-          console.log("gadsfasdfadfaf===xxx==" + b);
           if (b) {
             setTimeout(function () {
-              console.log("gadsfasdfadfaf===yyy==");
-
               BleUtil.getInstance().startConnect(device, function (changed) {
                 if (changed) {
                   BleUtil.getInstance().sendData(device, app.globalData.ssid, app.globalData.pwdData);
@@ -82,7 +79,6 @@ Page({
 
         },
         async function (res) {
-          console.log("gadsfasdfadfaf===yyy==");
           await BtHelper.getInstance().stopSearch();
           BleUtil.getInstance().startConnect(device, function (changed) {
             if (changed) {

utils/blue_ble/manager.js

@@ -312,11 +312,9 @@ class Manager {
       wx.createBLEConnection({
         deviceId: deviceId,
         success: function (res) {
-          console.log("gadsfasdfadfaf===mmm==" + JSON.stringify(res));
           resolve(true);
         },
         fail: function (res) {
-          console.log("gadsfasdfadfaf===nnn==" + JSON.stringify(res));
           var errCode = res.errCode;
           var errMsg = res.errMsg;
           if (errCode == -1 && errMsg == "createBLEConnection:fail:already connect") {
@@ -365,12 +363,10 @@ class Manager {
       wx.getBLEDeviceServices({
         deviceId: deviceId,
         success: function (res) {
-          console.log("gadsfasdfadfaf===2222==" + JSON.stringify(res));
           resolve(res.services);
         },
         fail: function (res) {
-          console.log("gadsfasdfadfaf===333==" + JSON.stringify(res));
-          resolve(null);
+          resolve("");
         }
       });
     });
@@ -439,7 +435,6 @@ class Manager {
       ///可以开始读取数据
       if (charc.properties.notify) {
         getMessageCall(charc.uuid);
-        await time_util.delayMills(300);
       }
 
       ///可以开始写入数据
@@ -515,7 +510,7 @@ class Manager {
       // 下面是赋值，不能删
       const dataView = new DataView(buffer);
       for (var i = 0; i < length; i++) {
-        console.log("gadsfasdfadfaf===iii==" + i + "===" + data[i]);
+        // console.log("gadsfasdfadfaf===iii==" + i + "===" + data[i]);
         dataView.setUint8(i, data[i]);
       }
       // data.forEach((value, index) => {

utils/blue_ble/util.js

@@ -65,7 +65,6 @@ class BleUtil {
     // await that.disconnect(device);
 
     var res = await that.manager.startConnect(device);
-    console.log("gadsfasdfadfaf===222==" + JSON.stringify(res));
     if (!res) {
       that.disconnect(device);
       onChanged(false);
@@ -91,28 +90,42 @@ class BleUtil {
       }
     }
 
+    var isRead = false;
+    var isWrited = false;
     that.manager.setWriteServiceId(serviceId);
     that.manager.getCharacteristics(device, function () {
         that.disconnect(device);
         onChanged(false);
       }, function (notifyCharaterId) {
         ///监听特征值变化
-        console.log("啊是的发生的发生等份===aaa==");
+        console.log("gadsfasdfadfaf===444444==");
         var isTrue = that.manager.monitorCharacteristicValueChange(device, serviceId, notifyCharaterId);
         if (!isTrue) {
           onChanged(false);
           return;
         }
 
-        console.log("啊是的发生的发生等份===eeee==");
         ///数据接收
         that.manager.onBLECharacteristicValueChange(function (value) {
           BtParse.parseTLV(value);
         });
+        isRead = true;
+        if (isWrited) {
+          console.log("gadsfasdfadfaf===7777==");
+          setTimeout(() => {
+            onChanged(true);
+          }, 300);
+        }
       },
       async function () {
-          console.log("啊是的发生的发生等份===bbb==");
-          onChanged(true);
+          isWrited = true;
+          console.log("gadsfasdfadfaf===555==");
+          if (isRead) {
+            console.log("gadsfasdfadfaf===8888==");
+            setTimeout(() => {
+              onChanged(true);
+            }, 300);
+          }
         },
         function () {
           onChanged(false);