mini_program_gizwits_sdk 3.4.9-configEvent.8 → 3.4.9-configEvent.9

package/dist/src/handler/ble.d.ts

@@ -112,7 +112,7 @@ export declare class BleHandle extends EventListener<TBleHandleEvent> {
     private updateCtime;
     private checkDeviceIsChange;
     private handleBluetoothDeviceFound;
-    startScan: (onScanDevice: OnScanDevice, delay?: number, services?: string[]) => Promise<IStartScanResult>;
+    startScan: (delay?: number, services?: string[]) => Promise<IStartScanResult>;
     stopScan: () => Promise<any>;
     disableScan: () => Promise<WechatMiniprogram.BluetoothError>;
     enableScan: () => void;

package/dist/src/wifiConfig/ble.d.ts

@@ -1,6 +1,13 @@
 import { IRandomCodesResult, IResult } from "../sdk";
 import { BleHandle } from "../handler/ble";
 import ConfigBase, { ConfigEventData } from "./ConfigBase";
+type EnableAndGetBluetoothDevicesRes = Promise<{
+    success: false;
+    err: IError;
+} | {
+    success: true;
+    bleDevices?: IDevice[];
+}>;
 interface IArgs {
     bleDeviceId: string;
     arrayBuffer: ArrayBuffer;
@@ -26,20 +33,14 @@ declare class BLEConfig extends ConfigBase {
     constructor(ssid: string, bssid: string, password: string, specialProductKeys: string[], specialProductKeySecrets: string[], bleHandle: BleHandle);
     sendBLEConfigCmd: ({ bleDeviceId, arrayBuffer, serviceUUIDSuffix, characteristicUUIDSuffix, bleHandle, eventCallBack }: IArgs) => Promise<boolean | void>;
     destroy: () => void;
-    isValidBleDevice: (bleDevice: WechatMiniprogram.BlueToothDevice, softAPSSIDPrefix?: string) => boolean;
+    isValidBleDevice: (device: IDevice, softAPSSIDPrefix?: string) => boolean;
     enableBluetoothDevicesDescovery: () => Promise<{
         success: false;
         err: IError;
     } | {
         success: true;
     }>;
-    enableAndGetBluetoothDevices: (softAPSSIDPrefix?: string) => Promise<{
-        success: false;
-        err: IError;
-    } | {
-        success: true;
-        bleDevices?: WechatMiniprogram.BlueToothDevice[];
-    }>;
+    enableAndGetBluetoothDevices: (softAPSSIDPrefix?: string) => EnableAndGetBluetoothDevicesRes;
     setDeviceOnboardingDeploy: ({ timeout, isBind, softAPSSIDPrefix, eventCallBack, }: ISetDeviceOnboardingDeployProps) => Promise<IResult<IDevice[]>>;
     configBLEDevice: ({ ssid, password, softAPSSIDPrefix, }: configBLEDeviceParams) => Promise<IResult<IRandomCodesResult[]>>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mini_program_gizwits_sdk",
-  "version": "3.4.9-configEvent.8",
+  "version": "3.4.9-configEvent.9",
   "description": "增加配网回调",
   "main": "./dist/index.js",
   "scripts": {

package/src/handler/ble.ts

@@ -419,6 +419,10 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
     }
     const res = await this.getBluetoothAdapterState();
     this.isInitSuccess = true
+
+    wx.onBluetoothDeviceFound((resData) => {
+      this.handleBluetoothDeviceFound(resData);
+    });
     return res;
   }
 
@@ -501,7 +505,6 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
 
   private handleBluetoothDeviceFound = (
     resData: WechatMiniprogram.OnBluetoothDeviceFoundListenerResult,
-    onScanDevice: OnScanDevice
   ) => {
     /**
      * TODO
@@ -565,7 +568,7 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
           this.updateDevice(newDevice);
           // GizLog.debug("GIZ_SDK: same device", newDevice, isChange);
           if (isChange) {
-            onScanDevice(this.scanList);
+            this.notifyDevices();
           }
         }
       } else {
@@ -579,7 +582,7 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
           const newDevice = BTDevice2GDevice(device, this.pks);
           if (newDevice.productKey && newDevice.mac) {
             this.scanList.push(newDevice);
-            onScanDevice(this.scanList);
+            this.notifyDevices();
           }
         }
       }
@@ -587,7 +590,6 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
   };
 
   public startScan = async (
-    onScanDevice: OnScanDevice,
     delay: number = 5000,
     services?: string[]
   ) => {
@@ -597,10 +599,6 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
       }
     }
     return new Promise<IStartScanResult>(async (res) => {
-      wx.onBluetoothDeviceFound((resData) => {
-        this.handleBluetoothDeviceFound(resData, onScanDevice);
-      });
-
       GizLog.debug("GIZ_SDK: start scan", delay);
       await wx.startBluetoothDevicesDiscovery({
         // 如果有传的话，就按传入的方式来搜索

package/src/sdk.ts

@@ -680,13 +680,9 @@ class GizwitsMiniSDK {
       //     this.bleDevices = deviceList;
       //   }, -1);
       // }
-      this.bleHandle.startScan((deviceList) => {
-        this.bleDevices = deviceList;
-      }, -1, services);
+      this.bleHandle.startScan( -1, services);
     }, autoTime);
-    this.bleHandle.startScan((deviceList) => {
-      this.bleDevices = deviceList;
-    }, -1, services);
+    this.bleHandle.startScan(-1, services);
   };
 
   /**
@@ -788,9 +784,7 @@ class GizwitsMiniSDK {
     services?: string[]
   ): Promise<ISDKResult<IDevice[]>> => {
     this.bleHandle.scanList = [];
-    const data = await this.bleHandle.startScan((deviceList) => {
-      this.bleDevices = deviceList;
-    }, delay, services);
+    const data = await this.bleHandle.startScan(delay, services);
     return {
       success: true,
       data: data.scanList,

package/src/wifiConfig/ble.ts

@@ -12,6 +12,11 @@ import {
 } from '../wechatApi';
 import ConfigBase, { ConfigEventData } from "./ConfigBase";
 
+type EnableAndGetBluetoothDevicesRes = Promise<
+| { success: false; err: IError }
+| { success: true; bleDevices?: IDevice[] }
+>;
+
 interface IArgs {
   bleDeviceId: string;
   arrayBuffer: ArrayBuffer;
@@ -237,31 +242,41 @@ class BLEConfig extends ConfigBase {
   destroy = () => {
     this.cleanTimeout();
   }
-  isValidBleDevice = (
-    bleDevice: WechatMiniprogram.BlueToothDevice,
-    softAPSSIDPrefix?: string
-  ) => {
-    if (!bleDevice || !bleDevice.advertisData) {
-      // 无效蓝牙设备或者蓝牙设备广播数据为空，返回失败
+  isValidBleDevice = (device:IDevice, softAPSSIDPrefix?: string) => {
+    if (device.bleWorkStatus === 0) return false;
+    if (!this.specialProductKeys.includes(device.productKey)) {
       return false;
     }
 
-    const {productKey, mac, bleWorkStatus} = advertisData2PkAndMac(bleDevice.advertisData, this.specialProductKeys)
-
-
-    if (!this.specialProductKeys.includes(productKey)) {
-      // 不在PK列表
-      return false;
-    }
-    // 判断广播包是否可以配网
-    if (bleWorkStatus !== 1) return;
-    GizLog.debug(`GIZ_SDK: isValidBleDevice mac: ${mac} pk: ${productKey} name: ${bleDevice.name}`)
-    GizLog.debug(`GIZ_SDK: softAPSSIDPrefix: ${softAPSSIDPrefix} ismatch : ${bleDevice.name && bleDevice.name.startsWith(softAPSSIDPrefix)}`)
+    GizLog.debug(`GIZ_SDK: isValidBleDevice mac: ${device.mac} pk: ${device.productKey} name: ${device.name}`)
+    GizLog.debug(`GIZ_SDK: softAPSSIDPrefix: ${softAPSSIDPrefix} ismatch : ${device.name && device.name.startsWith(softAPSSIDPrefix)}`)
     return (
       !softAPSSIDPrefix ||
-      (bleDevice.name && bleDevice.name.startsWith(softAPSSIDPrefix))
-    );
-  };
+      (device.name && device.name.startsWith(softAPSSIDPrefix))
+    )
+  }
+  // isValidBleDevice = (
+  //   bleDevice: WechatMiniprogram.BlueToothDevice,
+  //   softAPSSIDPrefix?: string
+  // ) => {
+  //   if (!bleDevice || !bleDevice.advertisData) {
+  //     // 无效蓝牙设备或者蓝牙设备广播数据为空，返回失败
+  //     return false;
+  //   }
+  //   const {productKey, mac, bleWorkStatus} = advertisData2PkAndMac(bleDevice.advertisData, this.specialProductKeys)
+  //   if (!this.specialProductKeys.includes(productKey)) {
+  //     // 不在PK列表
+  //     return false;
+  //   }
+  //   // 判断广播包是否可以配网
+  //   if (bleWorkStatus !== 1) return;
+  //   GizLog.debug(`GIZ_SDK: isValidBleDevice mac: ${mac} pk: ${productKey} name: ${bleDevice.name}`)
+  //   GizLog.debug(`GIZ_SDK: softAPSSIDPrefix: ${softAPSSIDPrefix} ismatch : ${bleDevice.name && bleDevice.name.startsWith(softAPSSIDPrefix)}`)
+  //   return (
+  //     !softAPSSIDPrefix ||
+  //     (bleDevice.name && bleDevice.name.startsWith(softAPSSIDPrefix))
+  //   );
+  // };
 
 
   enableBluetoothDevicesDescovery = async (): Promise<
@@ -291,10 +306,7 @@ class BLEConfig extends ConfigBase {
 
   enableAndGetBluetoothDevices = async (
     softAPSSIDPrefix?: string
-  ): Promise<
-    | { success: false; err: IError }
-    | { success: true; bleDevices?: WechatMiniprogram.BlueToothDevice[] }
-  > => {
+  ): EnableAndGetBluetoothDevicesRes => {
     const discoveryRes = await this.enableBluetoothDevicesDescovery();
     if (!discoveryRes.success) {
       return discoveryRes;
@@ -304,7 +316,7 @@ class BLEConfig extends ConfigBase {
     // const bleDevices: WechatMiniprogram.BlueToothDevice[] = (
     //   await getBluetoothDevices()
     // ).filter((d) => this.isValidBleDevice(d, softAPSSIDPrefix));
-    const bleDevices: WechatMiniprogram.BlueToothDevice[] = []
+    const bleDevices: IDevice[] = this.bleHandle.scanList.filter(d => this.isValidBleDevice(d, softAPSSIDPrefix))
     GizLog.debug('GIZ_SDK: getBluetoothDevices success', bleDevices);
     return {
       success: true,
@@ -395,27 +407,27 @@ class BLEConfig extends ConfigBase {
         return rej(enableAndGetRes);
       }
 
-      let { bleDevices } = enableAndGetRes;
+      let bleDevices: IDevice[] = enableAndGetRes.bleDevices as IDevice[];
 
       GizLog.debug('GIZ_SDK: enableAndGetBluetoothDevices success, target devices: ', bleDevices);
 
-      const handleFoundDevices = async ({
-        devices,
-      }: {
-        devices: WechatMiniprogram.BlueToothDevice[];
-      }) => {
-        if(this.hasTimeoutHandler()) {
-          Array.prototype.push.apply(
-            bleDevices,
-            devices.filter((d) => this.isValidBleDevice(d, softAPSSIDPrefix))
-          )
-        } else {
-          wx.offBluetoothDeviceFound(()=>{});
-        }
-      };
-
-      wx.onBluetoothDeviceFound(handleFoundDevices);
-      await startBluetoothDevicesDiscovery();
+      // const handleFoundDevices = async ({
+      //   devices,
+      // }: {
+      //   devices: WechatMiniprogram.BlueToothDevice[];
+      // }) => {
+      //   if(this.hasTimeoutHandler()) {
+      //     Array.prototype.push.apply(
+      //       bleDevices,
+      //       devices.filter((d) => this.isValidBleDevice(d, softAPSSIDPrefix))
+      //     )
+      //   } else {
+      //     wx.offBluetoothDeviceFound(()=>{});
+      //   }
+      // };
+
+      // wx.onBluetoothDeviceFound(handleFoundDevices);
+      await startBluetoothDevicesDiscovery(true);
 
       const appendPassword = this.appendExtendData(password)
       const uint8Array = WifiConfig.pack(ssid,appendPassword);
@@ -424,11 +436,11 @@ class BLEConfig extends ConfigBase {
         if (!this.hasTimeoutHandler()) {
           return;
         }
-        const bleDevice = bleDevices.shift();
+        const bleDevice = bleDevices.shift() as IDevice;
         if (bleDevice) {
           this.eventCallBack?.({
             event: "GIZ_DISCOVER_SUCCESS",
-            deviceID: bleDevice.deviceId
+            deviceID: bleDevice.bleDeviceID
           })
           GizLog.debug('GIZ_SDK: startConfigDevice, target device: ', bleDevice);
         }
@@ -436,7 +448,7 @@ class BLEConfig extends ConfigBase {
         const success =
           bleDevice &&
           (await this.sendBLEConfigCmd({
-            bleDeviceId: bleDevice.deviceId,
+            bleDeviceId: bleDevice.bleDeviceID,
             arrayBuffer: uint8Array.buffer,
             bleHandle: this.bleHandle,
             eventCallBack: this.eventCallBack
@@ -445,15 +457,14 @@ class BLEConfig extends ConfigBase {
         if (!success) {
           // 如果校验设备或者发送不成功，重试下一个设备
           await sleep(500);
-          // bleDevices = (await getBluetoothDevices()).filter((d) => this.isValidBleDevice(d, softAPSSIDPrefix));;
-          // await startBluetoothDevicesDiscovery();
+          bleDevices = this.bleHandle.scanList.filter((d) => this.isValidBleDevice(d, softAPSSIDPrefix));;
           await startConfigDevice();
           return;
         }
 
         // 如果有一个设备发送成功，则不再发现新设备
         GizLog.debug("GIZ_SDK: offBluetoothDeviceFound ready search device")
-        wx.offBluetoothDeviceFound(() => {});
+        // wx.offBluetoothDeviceFound(() => {});
       };
 
       // 开始大循环搜索