feature: 君正数据配对方案处理

pages/deviceConnect2/deviceConnect2.js

@@ -127,6 +127,7 @@ Page({
         ///主动去连接连接
       case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED:
         wx.hideLoading();
+        console.log("gadsfasdfadfaf===坎坎坷坷==" + JSON.stringify(options));
         if (options.result) {
           if (that.data.isOnBluetooth) {
             return;
@@ -137,26 +138,19 @@ Page({
           });
 
           setTimeout(() => {
-            var name = that.data.devicesList[0].name;
+            that.data.isSubmit = false;
             that.setData({
-              isSubmit: false,
               islanya: false,
               devicesList: [],
               isOnBluetooth: false,
             });
             var param = JSON.stringify(that.data.connectDevice);
-            var isLexin = name.indexOf(lexin_devices.leXin) !== -1;
-            if (isLexin) {
-              wx.navigateTo({
-                url: '../deviceConnect3/deviceConnect3?deviceId=' + options.data.deviceId + '&name=' + options.data.name + "&param=" + param,
-              });
-            } else {
-              var url = "../deviceConnect4/deviceConnect4";
-              var param = "?deviceId=" + options.data.deviceId + '&name=' + options.data.name + "&param=" + param;
-              route_util.jumpParams(url, param);
-            }
+            wx.navigateTo({
+              url: '../deviceConnect3/deviceConnect3?deviceId=' + options.data.deviceId + '&name=' + options.data.name + "&param=" + param,
+            });
           }, 200);
         } else {
+          that.data.isSubmit = false;
           wx.showModal({
             title: '提示',
             content: '连接失败',
@@ -194,13 +188,22 @@ Page({
       return;
     };
 
+    var name = devicesList[0].name;
+    var deviceId = devicesList[0].deviceId;
+    var isJungzheng1 = junzheng_util.isJungzheng1(name);
+    var isJungzheng2 = junzheng_util.isJungzheng2(name);
+
+    if (isJungzheng1 || isJungzheng2) {
+      var url = "../deviceConnect4/deviceConnect4";
+      var param = "?deviceId=" + deviceId + '&name=' + name;
+      route_util.jumpParams(url, param);
+      return;
+    }
+
     if (that.data.isSubmit) {
       return;
     };
-
-    that.setData({
-      isSubmit: true
-    });
+    that.data.isSubmit = true;
 
     // 停止搜索
     xBlufi.notifyStartDiscoverBle({
@@ -208,13 +211,14 @@ Page({
     });
 
     //开始连接
-    let name = devicesList[0].name;
+    var name = devicesList[0].name;
     // console.log('点击了，蓝牙准备连接的deviceId:' + devicesList[0].deviceId)
     xBlufi.notifyConnectBle({
       isStart: true,
-      deviceId: devicesList[0].deviceId,
-      name
+      name: name,
+      deviceId: deviceId,
     });
+
     wx.showLoading({
       title: '请稍后',
     });

pages/deviceConnect4/deviceConnect4.js

@@ -4,10 +4,6 @@ const {
   BleUtil
 } = require('../../utils/blue_ble/util');
 
-const {
-  BtHelper
-} = require('../../devices/bt_helper');
-
 Page({
   data: {
     nvabarData: {
@@ -48,9 +44,11 @@ Page({
     });
 
     var device = {
+      "mac": name,
       "deviceId": deviceId
     };
     console.log("gadsfasdfadfaf===000==" + JSON.stringify(device));
+
     BleUtil.getInstance().startConnect(device, function (changed) {
       console.log("gadsfasdfadfaf===111==" + changed);
       BleUtil.getInstance().sendData(device, "哈哈哈哈哈哈");

utils/blue_ble/manager.js

@@ -307,15 +307,25 @@ class Manager {
 
   ///开始连接设备
   startConnect(device) {
+    var deviceId = device.deviceId;
+    console.log("gadsfasdfadfaf===mmm==" + deviceId);
     return new Promise((resolve, reject) => {
-      var deviceId = device.deviceId;
+      console.log("gadsfasdfadfaf===oooo==" + deviceId);
       wx.createBLEConnection({
         deviceId: deviceId,
         success: function (res) {
+          console.log("gadsfasdfadfaf===qqqq==" + JSON.stringify(res));
           resolve(true);
         },
         fail: function (res) {
-          resolve(false);
+          console.log("gadsfasdfadfaf===ppp==" + JSON.stringify(res));
+          var errCode = res.errCode;
+          var errMsg = res.errMsg;
+          if (errCode == -1 && errMsg == "createBLEConnection:fail:already connect") {
+            resolve(true);
+          } else {
+            resolve(false);
+          }
         }
       });
     });
@@ -323,8 +333,10 @@ class Manager {
 
   ///初始化 接收数据 获取特征值
   getNotifyServices(device) {
+    var deviceId = device.deviceId;
+    console.log("gadsfasdfadfaf===nnn==" + deviceId);
     return new Promise((resolve, reject) => {
-      var deviceId = device.deviceId;
+      console.log("gadsfasdfadfaf===ppp==" + deviceId);
       wx.getBLEDeviceServices({
         deviceId: deviceId,
         success: function (res) {

utils/blue_ble/util.js

@@ -60,11 +60,11 @@ class BleUtil {
   async startConnect(device, onChanged) {
     var that = this;
     await that.stopScan();
-    await that.disconnect(device);
+    // await that.disconnect(device);
 
     var res = await that.manager.startConnect(device);
+    console.log("gadsfasdfadfaf===aaaa==" + JSON.stringify(res));
     if (!res) {
-      console.log("gadsfasdfadfaf===aaaa==");
       onChanged(false, device);
       return;
     }