@ledvance/base 1.2.23 → 1.2.24

package/package.json

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

package/src/api/nativeEventEmitter.ts

@@ -9,6 +9,7 @@ import {
 import {actions} from '@models'
 
 const nativeModule = NativeModules.LDVDeviceEventEmitter
+
 export const nativeEventEmitter = new NativeEventEmitter(nativeModule)
 
 let deviceDPListener: EmitterSubscription | null

package/src/components/ldvPresetView.tsx

@@ -42,7 +42,7 @@ const colors = [
     color: '#fff100',
   },
   {
-    color: '#00FF40',
+    color: '#00FF00',
   },
   {
     color: '#0025ff',

package/src/composeLayout.tsx

@@ -8,6 +8,7 @@ import { NativeApi } from 'api/native'
 import {
   DeviceInfo,
   NativeProps,
+  setGroupDevices,
   setGroupNativeProps,
   setNativeProps,
   UAGroupInfo,
@@ -114,6 +115,7 @@ const composeLayout = (component: React.ComponentType) => {
         this.initReduxDeviceNativeProps(props.ldvDevInfo)
       } else {
         this.initReduxGroupNativeProps(props.uaGroupInfo)
+        this.initGroupDevices(props.uaGroupInfo?.tyGroupId)
       }
     }
 
@@ -132,9 +134,11 @@ const composeLayout = (component: React.ComponentType) => {
           dps: {},
           pId: '',
           config: {},
+          groupDevices: []
         },
         familyName: ldvDevInfo.familyName,
         role: ldvDevInfo.role,
+        moods: []
       }
       NativeApi.showObj(nativeProps)
       console.log('Redux 初始数据：', JSON.stringify(nativeProps))
@@ -159,9 +163,11 @@ const composeLayout = (component: React.ComponentType) => {
           config: {
             ...JSON.parse(uaGroupInfo.config || '{}'),
           },
+          groupDevices: []
         },
         familyName: uaGroupInfo.familyName,
         role: uaGroupInfo.role,
+        moods: []
       }
       NativeApi.showObj(nativeProps)
       console.log('Redux 初始数据：', JSON.stringify(nativeProps))
@@ -169,6 +175,14 @@ const composeLayout = (component: React.ComponentType) => {
       dispatch(setGroupNativeProps(nativeProps))
     }
 
+    async initGroupDevices(tyGroupId: number){
+      if(!tyGroupId) return 
+      const res = await NativeApi.getGroupDevices(tyGroupId)
+      if(res.success && Array.isArray(res.data)){
+        dispatch(setGroupDevices(res.data))
+      }
+    }
+
     setDpSchemaMap(schema: string): any {
       // 处理物模型协议和dps
       const dpSchemaMap: Record<string, DpSchema> = {}

package/src/models/modules/NativePropsSlice.tsx

@@ -17,7 +17,6 @@ export interface NativeProps {
   timeSchedule?: boolean
   energieverbrauch?: object
   moods: any[]
-  groupDevices: any[]
 }
 
 export interface DeviceInfo {
@@ -31,6 +30,7 @@ export interface UAGroupInfo {
   pId: string
   dps: any
   config: any
+  groupDevices: DeviceInfo[]
 }
 
 const initialState: NativeProps = {
@@ -46,11 +46,11 @@ const initialState: NativeProps = {
     pId: '',
     dps: {},
     config: {},
+    groupDevices: []
   },
   timeSchedule: false,
   energieverbrauch: {},
   moods: [],
-  groupDevices: [],
 }
 
 // energy generation
@@ -84,6 +84,9 @@ const nativePropsSlice = createSlice({
       if (!!action.payload.familyName) {
         state.familyName = action.payload.familyName
       }
+      if (isNumber(action.payload.role)) {
+        state.role = action.payload.role
+      }
       if (!!action.payload.uaGroupInfo.pId) {
         state.uaGroupInfo.pId = action.payload.uaGroupInfo.pId
       }
@@ -109,7 +112,7 @@ const nativePropsSlice = createSlice({
       state.moods = action.payload
     },
     setGroupDevices(state, action: PayloadAction<any>) {
-      state.groupDevices = action.payload
+      state.uaGroupInfo.groupDevices = action.payload
     },
   },
 })
@@ -222,7 +225,7 @@ const useMoods = (): [any[], (v: any[]) => void] => {
 }
 
 const useGroupDevices = (): [any[], (v: any[]) => void] => {
-  const dps = useSelector(store => store.ldvModules.groupDevices)
+  const dps = useSelector(store => store.ldvModules.uaGroupInfo.groupDevices)
   const dispatch = useDispatch()
   const setGroupDevicesFn = (value: any[]) => {
     dispatch(setGroupDevices(value))
@@ -311,7 +314,7 @@ export function useFeatureHook<GC, T extends PropertyValueTypes<GC>>(
     const extraConfig = getExtraConfig ? getExtraConfig(value) : undefined
     return await setFH(value, dpValue, extraDps, extraConfig)
   }, [setFH])
-  return [featureHook || defValue, setFeatureHook]
+  return [featureHook ?? defValue, setFeatureHook]
 }
 
 export const useFanMaxSpeed = () => {

package/.temp/uaDevInfo.txt

@@ -1,51 +0,0 @@
-    @ColumnInfo(name = "device_id")
-    val deviceId: String,
-    @ColumnInfo(name = "device_name")
-    val deviceName: String,
-    @ColumnInfo(name = "cat_id")
-    val catId: String,
-    @ColumnInfo(name = "channel_no")
-    val channelNo: Int,
-    @ColumnInfo(name = "device_category")
-    val deviceCategory: String,
-    @ColumnInfo(name = "device_image")
-    val deviceImage: String,
-    @ColumnInfo(name = "tuya_device_id")
-    val tuyaDeviceId: String,
-    // deviceType 对应 ProductInfo 的 productId
-    @ColumnInfo(name = "device_type")
-    val deviceType: String,
-    @ColumnInfo(name = "offline_time")
-    val offlineTime: String,
-    @ColumnInfo(name = "rn_package")
-    val rnPackage: String?,
-    @ColumnInfo(name = "status")
-    val status: Int,
-    @ColumnInfo(name = "create_time")
-    val createTime: String,
-    @ColumnInfo(name = "version")
-    val version: String,
-    @ColumnInfo(name = "user_id")
-    val userId: String,
-    @ColumnInfo(name = "family_id")
-    val familyId: Long,
-    @ColumnInfo(name = "room_id")
-    val roomId: Long,
-    @ColumnInfo(name = "room_name")
-    val roomName: String,
-    @ColumnInfo(name = "is_shared")
-    val isShared: Int,
-    @ColumnInfo(name = "local_index")
-    val localIndex: String,
-    @ColumnInfo(name = "resource_category")
-    val resourceCategory: String,
-    @ColumnInfo(name = "resource_id")
-    val resourceId: String,
-    @ColumnInfo(name = "resource_identifier")
-    val resourceIdentifier: String,
-    @ColumnInfo(name = "resource_type")
-    val resourceType: Int,
-    @ColumnInfo(name = "index")
-    val index: Int = 0,
-    @ColumnInfo(name = "switch_state")
-    val switchState: Boolean = true