mini_program_gizwits_sdk 3.1.20-1 → 3.1.20-2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mini_program_gizwits_sdk",
-  "version": "3.1.20-1",
+  "version": "3.1.20-2",
   "description": "兼容协议解析拓展性，支持数组",
   "main": "./dist/index.js",
   "scripts": {

package/src/handler/socket.ts

@@ -70,6 +70,11 @@ export default class GizwitsWS {
     }
   }
 
+  updateToken = ({token, uid}) => {
+    this.token = token;
+    this.uid = uid;
+  }
+
   _getDevice = (did: string): IDevice | IError => {
     if (this._bindingDevices === null) {
       return errorCode.GIZ_SDK_SDK_NOT_INITIALIZED

package/src/productConfigFileManage.ts

@@ -36,6 +36,20 @@ class ProductConfigFileManage {
     }
     return this.data[pk];
   }
+
+  public getAttrItem = async (pk:string, key: string) => {
+    if (!this.data[pk]) {
+      await this.getConfigFile(pk)
+    }
+
+    for (let index in this.data[pk].entities[0].attrs) {
+      const item = this.data[pk].entities[0].attrs[index]
+      if (item.name === key) {
+        return item;
+      }
+    }
+    return null;
+  }
 }
 
 const productConfigFileManage = new ProductConfigFileManage();

package/src/sdk.ts

@@ -353,7 +353,7 @@ class GizwitsMiniSDK {
     }
   };
 
-  private handleSocketDeviceData: IOnDeviceStatusChanged = (data) => {
+  private handleSocketDeviceData: IOnDeviceStatusChanged = async (data) => {
     const target = this.allDevices.find((item) => item.did === data.did);
     if (!target) {
       return;
@@ -364,12 +364,26 @@ class GizwitsMiniSDK {
     }
     
     if (this.listenerMap['GizDeviceAttrsNotifications']) {
+
+      // 需要把枚举格式化回来
+        
+      if ((data as IDeviceStatusChangedProps).attrs) {
+        for(let key in (data as IDeviceStatusChangedProps).attrs) {
+          const itemData = await productConfigFileManage.getAttrItem(target.productKey, key);
+          if (itemData.data_type ==='enum') {
+            const enumIndex = itemData.enum.findIndex(item => item === (data as IDeviceStatusChangedProps).attrs[key]);
+            (data as IDeviceStatusChangedProps).attrs[key] = enumIndex || 0;
+          }
+        }
+      }
       this.listenerMap['GizDeviceAttrsNotifications'].map((item) => {
         item({
           device: target,
           ...('attrs' in data ? { data: data.attrs } : { raw: data.raw }),
         });
       });
+
+      
     }
   };
 
@@ -609,6 +623,7 @@ class GizwitsMiniSDK {
     if (data.success) {
       setGlobalData('token', data.data?.token);
       setGlobalData('uid', data.data?.uid);
+      this.socketHandle.updateToken({token: data.data.token, uid: data.data.uid})
     }
     return data;
   };