mini_program_gizwits_sdk 3.4.6-beta → 3.4.7-FeiSiMan

package/src/wifiConfig/ble.ts

@@ -1,5 +1,5 @@
 import errorCode from "../errorCode";
-import { IRandomCodesResult, IResult } from "../sdk";
+import { IConfigResult, IResult } from "../sdk";
 import { ab2hex, advertisData2PkAndMac, isWXDevicesResult } from '../utils';
 
 import GizLog from "../GizLog";
@@ -11,6 +11,14 @@ import {
   notifyBLECharacteristicValueChange, retryConnect, startBluetoothDevicesDiscovery, unpackWriteBLECharacteristicValue
 } from '../wechatApi';
 import ConfigBase from "./ConfigBase";
+import aepApiRequest from "../aepApi/aepApiRequest";
+
+interface IVerifyOnlineResult {
+  data: {
+    status: number; // 2表示离线 3表示在线
+  }
+}
+
 
 interface IArgs {
   bleDeviceId: string;
@@ -260,6 +268,52 @@ class BLEConfig extends ConfigBase {
     return { success: true };
   };
 
+  getDeviceLastestOnlineTime = async ({ productKey, mac }:
+    { productKey: string, mac: string }) => {
+    GizLog.debug('GIZ_SDK: getDeviceLastestOnlineTime', mac);
+    const res = await aepApiRequest<IVerifyOnlineResult>(`applet/device/getDeviceInfo/${(mac ?? '')}`, { method: 'get' });
+    GizLog.debug('GIZ_SDK: 请求结果', res);
+    return res;
+  }
+
+  // 配网后确认设备是否上线
+  verifyDeviceOnline = ({ productKey, mac }: { productKey: string, mac: string }) => {
+    return new Promise<IResult<IVerifyOnlineResult>>((res, rej) => {
+      GizLog.debug('GIZ_SDK: 开始确认设备上线')
+      const query = async () => {
+
+        if (!this.hasTimeoutHandler()) {
+          return;
+        }
+
+        try {
+          await sleep(2000);
+          const data = await this.getDeviceLastestOnlineTime({ productKey, mac })
+          GizLog.debug('GIZ_SDK: 确认到设备是否在线', data.data.data.status);
+          if (data.success && data.data && data.data.data && data.data.data.status == 3) {
+            // 确认设备最后一次上线时间有更新
+            GizLog.debug('GIZ_SDK: 确认到设备是在线的', data);
+            res({
+              success: true,
+              data: data.data,
+            });
+          } else {
+            // 重新请求
+            GizLog.debug('GIZ_SDK: 未确认到设备是在线');
+            await sleep(1500);
+            !this.disableSearchDevice && query();
+          }
+        } catch (error) {
+          // 重新请求
+          await sleep(3000);
+          !this.disableSearchDevice && query();
+          // GizLog.debug('GIZ_SDK: random codes error', error);
+        }
+      };
+      query();
+    });
+  };
+
 
   enableAndGetBluetoothDevices = async (
     softAPSSIDPrefix?: string
@@ -304,19 +358,20 @@ class BLEConfig extends ConfigBase {
           softAPSSIDPrefix,
         });
 
-        const newData: IDevice[] = (result.data || []).map(item => {
-          return {
-            mac: item.mac,
-            productKey: item.product_key,
-            did: item.did,
-            name: '',
-            isBind: false,
-            connectType: 'NONE',
-            isBleOnline: false,
-            isLanOnline: false,
-            isOnline: false,
-          }
-        })
+        const newData: IDevice[] = [result.data as IDevice];
+        // const newData: IDevice[] = (result.data || []).map(item => {
+        //   return {
+        //     mac: item.mac,
+        //     productKey: item.product_key,
+        //     did: item.did,
+        //     name: '',
+        //     isBind: false,
+        //     connectType: 'NONE',
+        //     isBleOnline: false,
+        //     isLanOnline: false,
+        //     isOnline: false,
+        //   }
+        // })
         if (isBind) {
           res(await this.bindDevices(newData));
         } else {
@@ -344,7 +399,7 @@ class BLEConfig extends ConfigBase {
     password,
     softAPSSIDPrefix,
   }: configBLEDeviceParams) => {
-    return new Promise<IResult<IRandomCodesResult[]>>(async (res, rej) => {
+     return new Promise<IResult<IConfigResult>>(async (res, rej) => {
       GizLog.debug('GIZ_SDK: start config ble device');
       const enableAndGetRes = await this.enableAndGetBluetoothDevices(
         softAPSSIDPrefix
@@ -383,12 +438,13 @@ class BLEConfig extends ConfigBase {
       wx.onBluetoothDeviceFound(handleFoundDevices);
 
       const uint8Array = WifiConfig.pack(ssid,password);
+       const bleDevice = bleDevices.shift();
+       const { productKey, mac } = advertisData2PkAndMac(bleDevice.advertisData, this.specialProductKeys)
       const startConfigDevice = async () => {
         GizLog.debug('GIZ_SDK: startConfigDevice');
         if (!this.hasTimeoutHandler()) {
           return;
         }
-        const bleDevice = bleDevices.shift();
         if (bleDevice) {
           GizLog.debug('GIZ_SDK: startConfigDevice, target device: ', bleDevice);
         }
@@ -413,19 +469,23 @@ class BLEConfig extends ConfigBase {
         GizLog.debug("GIZ_SDK: offBluetoothDeviceFound ready search device")
         wx.offBluetoothDeviceFound(() => {});
       };
+       await startConfigDevice();
 
-      // 开始大循环搜索
+      // 开始确认设备是否上线
       try {
         // const devicesReturn = await this.searchDevice({ ssid, password });
-        this.searchDevice({ ssid, password }).then(devicesReturn => {
-          res(devicesReturn);
-        })
+        // this.searchDevice({ ssid, password }).then(devicesReturn => {
+        //   res(devicesReturn);
+        // })
+        await sleep(5000);
+        // const devicesReturn = await this.searchDevice({ ssid, password });
+        this.verifyDeviceOnline({ productKey, mac }).then(devicesReturn => {
+          res({ ...devicesReturn, data: { ...devicesReturn.data.data, mac, productKey } });
+        });
       } catch (error) {
         rej(error);
         GizLog.error("GIZ_SDK: searchDevice error", new Error(JSON.stringify(error)))
       }
-
-      await startConfigDevice();
     });
   };
 }