@ledvance/base 1.0.35 → 1.1.0

package/package.json

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

package/src/composeLayout.tsx

@@ -5,14 +5,31 @@ import {DevInfo, DpValue, Theme, TYSdk} from 'tuya-panel-kit'
 import {actions, store} from './models'
 import {addListener} from 'api/nativeEventEmitter'
 import {NativeApi} from 'api/native'
-import {setNativeProps} from './models/modules/NativePropsSlice'
+import {
+    DeviceInfo,
+    NativeProps,
+    setGroupNativeProps,
+    setNativeProps,
+    UAGroupInfo,
+} from './models/modules/NativePropsSlice'
 import {DpSchema, GlobalParams} from './models/GlobalParams'
 import Connect from './components/connect'
 
 interface Props {
-    devInfo: DevInfo;
-    preload?: boolean;
-    ldvDevInfo: any;
+    devInfo: DevInfo
+    preload?: boolean
+    ldvDevInfo: LdvDevInfo
+    uaGroupInfo: UAGroupInfoProps
+}
+
+interface LdvDevInfo extends DeviceInfo {
+    schema: any
+    familyName: string
+}
+
+interface UAGroupInfoProps extends UAGroupInfo {
+    schema: any
+    familyName: string
 }
 
 const TYEvent = TYSdk.event
@@ -91,16 +108,66 @@ const composeLayout = (component: React.ComponentType) => {
                 TYDevice.getDeviceInfo().then(data => dispatch(actions.common.devInfoChange(data)))
             }
 
-            this.initReduxNativeProps(props.ldvDevInfo)
+            if (!!props.ldvDevInfo) {
+                this.initReduxDeviceNativeProps(props.ldvDevInfo)
+            } else {
+                this.initReduxGroupNativeProps(props.uaGroupInfo)
+            }
         }
 
-        initReduxNativeProps(ldvDevInfo) {
+        initReduxDeviceNativeProps(ldvDevInfo: LdvDevInfo) {
             console.log('原生数据：', JSON.stringify(ldvDevInfo))
             NativeApi.log('原生数据: ' + JSON.stringify(ldvDevInfo))
+            const dps = this.setDpSchemaMap(ldvDevInfo.schema)
+            const nativeProps: NativeProps = {
+                deviceInfo: {
+                    devId: ldvDevInfo.devId,
+                    dps: {...dps, ...JSON.parse(ldvDevInfo.dps)},
+                    pId: ldvDevInfo.pId,
+                },
+                uaGroupInfo: {
+                    tyGroupId: -1,
+                    dps: {},
+                    pId: '',
+                },
+                familyName: ldvDevInfo.familyName,
+                timeSchedule: Symbol(),
+            }
+            NativeApi.showObj(nativeProps)
+            console.log('Redux 初始数据：', JSON.stringify(nativeProps))
+            NativeApi.log('Redux 初始数据：' + JSON.stringify(nativeProps))
+            dispatch(setNativeProps(nativeProps))
+        }
+
+        initReduxGroupNativeProps(uaGroupInfo: UAGroupInfoProps) {
+            console.log('原生数据：', JSON.stringify(uaGroupInfo))
+            NativeApi.log('原生数据: ' + JSON.stringify(uaGroupInfo))
+            const dps = this.setDpSchemaMap(uaGroupInfo.schema)
+            const nativeProps: NativeProps = {
+                deviceInfo: {
+                    devId: '',
+                    dps: {},
+                    pId: '',
+                },
+                uaGroupInfo: {
+                    tyGroupId: uaGroupInfo.tyGroupId,
+                    dps: {...dps, ...JSON.parse(uaGroupInfo.dps)},
+                    pId: uaGroupInfo.pId,
+                },
+                familyName: uaGroupInfo.familyName,
+                timeSchedule: Symbol(),
+            }
+            NativeApi.showObj(nativeProps)
+            console.log('Redux 初始数据：', JSON.stringify(nativeProps))
+            NativeApi.log('Redux 初始数据：' + JSON.stringify(nativeProps))
+            dispatch(setGroupNativeProps(nativeProps))
+        }
+
+        setDpSchemaMap(schema: string): any {
             // 处理物模型协议和dps
             const dpSchemaMap: Record<string, DpSchema> = {}
             const dps = {}
-            JSON.parse(this.props.ldvDevInfo.schema || [])
+            JSON.parse(schema || '[]')
                 .forEach(schemaItem => {
                     dpSchemaMap[schemaItem.code] = {
                         name: schemaItem.name,
@@ -111,17 +178,8 @@ const composeLayout = (component: React.ComponentType) => {
                     }
                     dps[schemaItem.id] = null
                 })
-            const nativeProps = {
-                devId: ldvDevInfo.devId,
-                pId: ldvDevInfo.pId,
-                familyName: ldvDevInfo.familyName,
-                dps: {...dps, ...JSON.parse(ldvDevInfo.dps)},
-            }
             GlobalParams.dpSchemaMap = dpSchemaMap
-            NativeApi.showObj(nativeProps)
-            console.log('Redux 初始数据：', JSON.stringify(nativeProps))
-            NativeApi.log('Redux 初始数据：' + JSON.stringify(nativeProps))
-            dispatch(setNativeProps(nativeProps))
+            return dps
         }
 
         render() {

package/src/models/modules/NativePropsSlice.tsx

@@ -7,26 +7,44 @@ import {NativeApi} from '../../api/native'
 import {useDispatch} from 'react-redux'
 
 export interface NativeProps {
-    devId: string,
-    pId: string,
-    dps: any,
-    familyName: string,
-    timeSchedule: symbol;
+    familyName: string
+    deviceInfo: DeviceInfo
+    uaGroupInfo: UAGroupInfo
+    timeSchedule: symbol
     energieverbrauch?: object
 }
 
+export interface DeviceInfo {
+    devId: string
+    pId: string
+    dps: any
+}
+
+export interface UAGroupInfo {
+    tyGroupId: number
+    pId: string
+    dps: any
+}
+
 const initialState: NativeProps = {
-    devId: '',
-    pId: '',
-    dps: {},
     familyName: '',
+    deviceInfo: {
+        devId: '',
+        pId: '',
+        dps: {},
+    },
+    uaGroupInfo: {
+        tyGroupId: -1,
+        pId: '',
+        dps: {},
+    },
     timeSchedule: Symbol(),
-    energieverbrauch: {}
+    energieverbrauch: {},
 }
 
 // energy generation
 const productList = [
-    'rcqe1i17x0vrvws7'
+    'rcqe1i17x0vrvws7',
 ]
 
 const nativePropsSlice = createSlice({
@@ -34,19 +52,29 @@ const nativePropsSlice = createSlice({
     initialState: initialState,
     reducers: {
         setNativeProps: (state, action: PayloadAction<NativeProps>) => {
-            state.devId = action.payload.devId
+            state.deviceInfo.devId = action.payload.deviceInfo.devId
+            if (!!action.payload.familyName) {
+                state.familyName = action.payload.familyName
+            }
+            if (!!action.payload.deviceInfo.devId) {
+                state.deviceInfo.pId = action.payload.deviceInfo.pId
+            }
+            state.deviceInfo.dps = {...state.deviceInfo.dps, ...action.payload.deviceInfo.dps}
+        },
+        setGroupNativeProps: (state, action: PayloadAction<NativeProps>) => {
+            state.uaGroupInfo.tyGroupId = action.payload.uaGroupInfo.tyGroupId
             if (!!action.payload.familyName) {
                 state.familyName = action.payload.familyName
             }
-            if (!!action.payload.pId) {
-                state.pId = action.payload.pId
+            if (!!action.payload.uaGroupInfo.tyGroupId) {
+                state.uaGroupInfo.pId = action.payload.uaGroupInfo.pId
             }
-            state.dps = {...state.dps, ...action.payload.dps}
+            state.uaGroupInfo.dps = {...state.uaGroupInfo.dps, ...action.payload.uaGroupInfo.dps}
         },
         setDps(state, action: PayloadAction<any>) {
             const dpKeys = Object.keys(action.payload)
             dpKeys.forEach(dp => {
-                state.dps[dp] = action.payload[dp]
+                state.deviceInfo.dps[dp] = action.payload[dp]
             })
         },
         setTimeSchedule(state, action: PayloadAction<any>) {
@@ -98,7 +126,7 @@ function simpleSetDp<T>(dispatch: Dispatch<any>): (deviceId: string, dp: string,
 }
 
 const useDeviceId = () => {
-    return useSelector(store => store.ldvModules.devId)
+    return useSelector(store => store.ldvModules.deviceInfo.devId)
 }
 
 const useFamilyName: () => string = () => {
@@ -108,7 +136,7 @@ const useFamilyName: () => string = () => {
 function useDp<T, R>(dp: string): [T, (value: T) => Promise<Result<R>>] {
     const deviceId = useDeviceId()
     const dispatch = useDispatch()
-    const dpValue = useSelector(store => store.ldvModules.dps[dp])
+    const dpValue = useSelector(store => store.ldvModules.deviceInfo.dps[dp])
     const setDp = useCallback((dpValue: T) => {
         return simpleSetDp<R>(dispatch)(deviceId, dp, dpValue)
     }, [])
@@ -118,7 +146,7 @@ function useDp<T, R>(dp: string): [T, (value: T) => Promise<Result<R>>] {
 function useDps<R>(): [any, (dps: any) => Promise<Result<R>>] {
     const deviceId = useDeviceId()
     const dispatch = useDispatch()
-    const dps = useSelector(store => store.ldvModules.dps)
+    const dps = useSelector(store => store.ldvModules.deviceInfo.dps)
     const setDps = useCallback((dps: any) => {
         return simpleSetDps<R>(dispatch)(deviceId, dps)
     }, [])
@@ -135,10 +163,10 @@ const useDeviceInfo: () => DevInfo<DpState> = () => {
     return useSelector(state => state.devInfo)
 }
 
-const useTimeSchedule = (): [v:Symbol, f:any] => {
+const useTimeSchedule = (): [v: Symbol, f: any] => {
     const dps = useSelector(store => store.ldvModules.timeSchedule)
     const dispatch = useDispatch()
-    const setTimeScheduleFn = (value: Symbol) =>{
+    const setTimeScheduleFn = (value: Symbol) => {
         dispatch(setTimeSchedule(value))
     }
     return [dps, setTimeScheduleFn]
@@ -147,20 +175,26 @@ const useTimeSchedule = (): [v:Symbol, f:any] => {
 const useEnergieverbrauch = () => {
     const dps = useSelector(store => store.ldvModules.energieverbrauch)
     const dispatch = useDispatch()
-    const setEnergieverbrauchFn = (value) =>{
+    const setEnergieverbrauchFn = (value) => {
         dispatch(setEnergieverbrauch(value))
     }
     return [dps, setEnergieverbrauchFn]
 }
 
-export const useEngergyGeneration = () =>{
-    const { productId } = useDeviceInfo()
+export const useEngergyGeneration = () => {
+    const {productId} = useDeviceInfo()
     return productList.some(val => val === productId)
 }
 
 export const ldvModules = nativePropsSlice.reducer
 
-export const {setNativeProps, setDps, setTimeSchedule, setEnergieverbrauch} = nativePropsSlice.actions
+export const {
+    setNativeProps,
+    setGroupNativeProps,
+    setDps,
+    setTimeSchedule,
+    setEnergieverbrauch,
+} = nativePropsSlice.actions
 
 export {
     simpleSetDps,
@@ -171,5 +205,5 @@ export {
     useDps,
     useFamilyName,
     useTimeSchedule,
-    useEnergieverbrauch
+    useEnergieverbrauch,
 }