mini_program_gizwits_sdk 3.1.17-13 → 3.1.17-14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mini_program_gizwits_sdk",
-  "version": "3.1.17-13",
+  "version": "3.1.17-14",
   "description": "云端推送解除绑定的时候，移除m2m的订阅",
   "main": "./dist/index.js",
   "scripts": {

package/src/handler/ble.ts

@@ -180,6 +180,7 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
     if (!curDevice.value) {
       return;
     }
+    console.log('handleOnBLECharacteristicValueChange', curDevice)
     const hexString = ab2hex(curDevice.value);
     try {
       const data = new ProtocolBase(hexStrint2byte(hexString));

package/src/sdk.ts

@@ -849,7 +849,8 @@ class GizwitsMiniSDK {
             ssid,
             password,
             this.specialProductKeys,
-            this.specialProductKeySecrets
+            this.specialProductKeySecrets,
+            this.bleHandle
           );
           const data =
             await this.currentWifiConfigHandle.setDeviceOnboardingDeploy({

package/src/wifiConfig/ble.ts

@@ -19,12 +19,15 @@ import sleep from "../sleep";
 import ConfigBase from "./ConfigBase";
 import WifiConfig from "../protocol/WifiConfig";
 import GizLog from "../GizLog";
+import gizwitsSdk from "mini_program_gizwits_sdk";
+import { BleHandle } from "../handler/ble";
 
 interface IArgs {
   bleDeviceId: string;
   arrayBuffer: ArrayBuffer;
   serviceUUIDSuffix?: string;
   characteristicUUIDSuffix?: string;
+  bleHandle: BleHandle;
 }
 
 const configAck = '0000000303000002';
@@ -34,6 +37,7 @@ export function sendBLEConfigCmd({
   arrayBuffer,
   serviceUUIDSuffix = 'abf0',
   characteristicUUIDSuffix = 'abf7',
+  bleHandle
 }: IArgs) {
   let sendInterval = null;
   let closeTimeout = null;
@@ -134,13 +138,15 @@ export function sendBLEConfigCmd({
         GizLog.debug('GIZ_SDK: 收到设备返回ack', hexString)
         if (hexString === configAck) {
           // 发送成功
-          wx.offBLECharacteristicValueChange(handleBLECharacteristicValueChange);
+          bleHandle.removeEventListener("GizBleDeviceData", handleBLECharacteristicValueChange)
           resolve(true);
         }
       };
 
+      bleHandle.addEventListener("GizBleDeviceData", handleBLECharacteristicValueChange)
+
       // 订阅特征值变化
-      wx.onBLECharacteristicValueChange(handleBLECharacteristicValueChange);
+      // wx.onBLECharacteristicValueChange(handleBLECharacteristicValueChange);
 
       GizLog.debug(
         'GIZ_SDK: on notifyBLECharacteristicValueChange success',
@@ -202,6 +208,12 @@ interface ISetDeviceOnboardingDeployProps {
 
 
 class BLEConfig extends ConfigBase {
+  bleHandle: BleHandle;
+
+  constructor(ssid: string, password: string, specialProductKeys: string[], specialProductKeySecrets: string[],bleHandle: BleHandle) {
+    super(ssid,password,specialProductKeys,specialProductKeySecrets)
+    this.bleHandle = bleHandle;
+  }
   destroy = () => {
     this.cleanTimeout();
   }
@@ -389,6 +401,7 @@ class BLEConfig extends ConfigBase {
           (await sendBLEConfigCmd({
             bleDeviceId: bleDevice.deviceId,
             arrayBuffer: uint8Array.buffer,
+            bleHandle: this.bleHandle
           }));
 
         if (!success) {