@ledvance/base 1.1.5 → 1.1.7

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/base",
   "pid": [],
   "uiid": "",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "scripts": {},
   "dependencies": {
     "@reduxjs/toolkit": "^1.8.6",

package/src/api/nativeEventEmitter.ts

@@ -1,29 +1,75 @@
-import { NativeEventEmitter, NativeModules } from 'react-native'
-import { setNativeProps } from '../models/modules/NativePropsSlice'
+import {EmitterSubscription, NativeEventEmitter, NativeModules} from 'react-native'
+import {
+    DeviceInfo,
+    NativeProps,
+    setGroupNativeProps,
+    setNativeProps,
+    UAGroupInfo,
+} from '../models/modules/NativePropsSlice'
 import { actions } from '@models'
 
 const nativeModule = NativeModules.LDVDeviceEventEmitter
 const nativeEventEmitter = new NativeEventEmitter(nativeModule)
 
-let listener
+let deviceDPListener: EmitterSubscription|null
+let groupFeatureListener: EmitterSubscription|null
+
+interface GroupFeatureEvent {
+    tyGroupId: number
+    config: any
+}
+
+interface DeviceEvent {
+    devId: string
+    dps: any
+    name: string
+    pId: string
+}
 
 export const addListener = (store) => {
-    listener = nativeEventEmitter.addListener('TYDataUpdate', (body: any) => {
+    deviceDPListener = nativeEventEmitter.addListener('TYDataUpdate', (event: DeviceEvent) => {
         // device info
-        if (body.dps && body.devId && body.devId === store.getState().ldvModules.devId) {
-            console.log('长链接刷新DP数据', body.devId, body.dps)
-            const data = body
-            data.dps = JSON.parse(body.dps)
-            store.dispatch(setNativeProps(data))
+        if (event.dps && event.devId && event.devId === store.getState().ldvModules.deviceInfo.devId) {
+            console.log('长链接刷新DP数据', event.devId, event.dps)
+            const nativeProps: NativeProps = {
+                familyName: '',
+                deviceInfo: {
+                    devId: event.devId,
+                    pId: event.pId,
+                    dps: JSON.parse(event.dps)
+                },
+                uaGroupInfo: {} as UAGroupInfo,
+            }
+            store.dispatch(setNativeProps(nativeProps))
         }
         // 兼容ios修改设备名称
-        if (!!body.name && body.devId && body.devId === store.getState().ldvModules.devId) {
-            store.dispatch(actions.common.devInfoChange({ ...store.getState().devInfo, name: body.name }))
+        if (!!event.name && event.devId && event.devId === store.getState().ldvModules.deviceInfo.devId) {
+            store.dispatch(actions.common.devInfoChange({ ...store.getState().devInfo, name: event.name }))
+        }
+    })
+
+    groupFeatureListener = nativeEventEmitter.addListener('UAGroupFeatureUpdate', (event: GroupFeatureEvent) => {
+        if (event.tyGroupId === store.getState().ldvModules.uaGroupInfo.tyGroupId) {
+            console.log('长链接刷新Group数据', event)
+            const nativeProps: NativeProps = {
+                familyName: '',
+                deviceInfo: {} as DeviceInfo,
+                uaGroupInfo: {
+                    tyGroupId: event.tyGroupId,
+                    pId: '',
+                    config: event.config,
+                    dps: {}
+                },
+            }
+            store.dispatch(setGroupNativeProps(nativeProps))
         }
     })
 }
 
 export const removeListener = () => {
-    listener && listener.remove()
-    listener = null
+    deviceDPListener && deviceDPListener.remove()
+    deviceDPListener = null
+
+    groupFeatureListener && groupFeatureListener.remove()
+    groupFeatureListener = null
 }

package/src/composeLayout.tsx

@@ -3,7 +3,7 @@ import React, {Component} from 'react'
 import {Provider} from 'react-redux'
 import {DevInfo, DpValue, Theme, TYSdk} from 'tuya-panel-kit'
 import {actions, store} from './models'
-import {addListener} from 'api/nativeEventEmitter'
+import {addListener, removeListener} from 'api/nativeEventEmitter'
 import {NativeApi} from 'api/native'
 import {
     DeviceInfo,
@@ -129,6 +129,7 @@ const composeLayout = (component: React.ComponentType) => {
                     tyGroupId: -1,
                     dps: {},
                     pId: '',
+                    config: {},
                 },
                 familyName: ldvDevInfo.familyName,
             }
@@ -152,6 +153,7 @@ const composeLayout = (component: React.ComponentType) => {
                     tyGroupId: uaGroupInfo.tyGroupId,
                     dps: {...dps, ...JSON.parse(uaGroupInfo.dps)},
                     pId: uaGroupInfo.pId,
+                    config: uaGroupInfo.config || {},
                 },
                 familyName: uaGroupInfo.familyName,
             }
@@ -186,15 +188,17 @@ const composeLayout = (component: React.ComponentType) => {
                     <Theme theme={theme}>
                         <Connect mapStateToProps={_.identity}>
                             {({mapStateToProps, ...props}: { mapStateToProps: any; [_: string]: any }) => {
-                                const hasInit = Object.keys(props.dpState).length > 0
-                                // @ts-ignore
-                                return hasInit ? <NavigatorLayout {...props} /> : null
+                                return <NavigatorLayout {...props} />
                             }}
                         </Connect>
                     </Theme>
                 </Provider>
             )
         }
+
+        componentWillUnmount() {
+            removeListener()
+        }
     }
 
     return PanelComponent

package/src/models/modules/NativePropsSlice.d.ts

@@ -17,6 +17,7 @@ export interface UAGroupInfo {
     tyGroupId: number;
     pId: string;
     dps: any;
+    config: any;
 }
 declare function simpleSetDps<T>(dispatch: Dispatch<any>): (deviceId: string, dps: any) => Promise<Result<T>>;
 declare function simpleSetDp<T>(dispatch: Dispatch<any>): (deviceId: string, dp: string, value: any) => Promise<Result<T>>;
@@ -32,6 +33,8 @@ declare const useDeviceInfo: () => DevInfo<DpState>;
 declare const useTimeSchedule: () => [v: symbol | undefined, f: any];
 declare const useEnergieverbrauch: () => (object | undefined)[];
 export declare const useEngergyGeneration: () => boolean;
+export declare function useUAGroupInfo(): UAGroupInfo;
+export declare function useGroupConfig<T>(): T;
 export declare const ldvModules: import("@reduxjs/toolkit").Reducer<NativeProps, import("@reduxjs/toolkit").AnyAction>;
 export declare const setNativeProps: import("@reduxjs/toolkit").ActionCreatorWithPayload<NativeProps, string>, setGroupNativeProps: import("@reduxjs/toolkit").ActionCreatorWithPayload<NativeProps, string>, setDps: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>, setTimeSchedule: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>, setEnergieverbrauch: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>;
 export { simpleSetDps, simpleSetDp, useDeviceId, useDeviceInfo, useDp, useDps, useFamilyName, useTimeSchedule, useEnergieverbrauch, };

package/src/models/modules/NativePropsSlice.tsx

@@ -24,6 +24,7 @@ export interface UAGroupInfo {
     tyGroupId: number
     pId: string
     dps: any
+    config: any
 }
 
 const initialState: NativeProps = {
@@ -37,6 +38,7 @@ const initialState: NativeProps = {
         tyGroupId: -1,
         pId: '',
         dps: {},
+        config: {},
     },
     timeSchedule: Symbol(),
     energieverbrauch: {},
@@ -56,7 +58,7 @@ const nativePropsSlice = createSlice({
             if (!!action.payload.familyName) {
                 state.familyName = action.payload.familyName
             }
-            if (!!action.payload.deviceInfo.devId) {
+            if (!!action.payload.deviceInfo.pId) {
                 state.deviceInfo.pId = action.payload.deviceInfo.pId
             }
             state.deviceInfo.dps = {...state.deviceInfo.dps, ...action.payload.deviceInfo.dps}
@@ -66,10 +68,11 @@ const nativePropsSlice = createSlice({
             if (!!action.payload.familyName) {
                 state.familyName = action.payload.familyName
             }
-            if (!!action.payload.uaGroupInfo.tyGroupId) {
+            if (!!action.payload.uaGroupInfo.pId) {
                 state.uaGroupInfo.pId = action.payload.uaGroupInfo.pId
             }
             state.uaGroupInfo.dps = {...state.uaGroupInfo.dps, ...action.payload.uaGroupInfo.dps}
+            state.uaGroupInfo.config = action.payload.uaGroupInfo.config
         },
         setDps(state, action: PayloadAction<any>) {
             const dpKeys = Object.keys(action.payload)
@@ -186,6 +189,14 @@ export const useEngergyGeneration = () => {
     return productList.some(val => val === productId)
 }
 
+export function useUAGroupInfo(): UAGroupInfo {
+    return useSelector(state => state.ldvModules.uaGroupInfo)
+}
+
+export function useGroupConfig<T>(): T {
+    return useUAGroupInfo().config as T
+}
+
 export const ldvModules = nativePropsSlice.reducer
 
 export const {