@ledvance/base 1.2.61 → 1.2.62

package/localazy.keys.json

@@ -1,4 +1,4 @@
 {
-    "writeKey": "",
-    "readKey": "a7349213573288779040-d092b120e7d6d90c7e9528ddf2aa600659f60631bd4a5c2d55de0aa2b081af1b"
-}
+  "writeKey": "",
+  "readKey": "a7349213573288779040-d092b120e7d6d90c7e9528ddf2aa600659f60631bd4a5c2d55de0aa2b081af1b"
+}

package/package.json

@@ -4,10 +4,7 @@
   "name": "@ledvance/base",
   "pid": [],
   "uiid": "",
-  "version": "1.2.61",
-  "scripts": {
-    "prepublishOnly": "python update-localazy.py"
-  },
+  "version": "1.2.62",
   "dependencies": {
     "@reduxjs/toolkit": "^1.8.6",
     "@tuya/tuya-panel-api": "^1.12.0",

package/src/api/nativeEventEmitter.ts

@@ -3,12 +3,14 @@ import {
   DeviceInfo,
   NativeProps,
   setGroupDevices,
+  setGroupDps,
   setGroupNativeProps,
   setNativeProps,
   UAGroupInfo,
 } from '../models/modules/NativePropsSlice'
 import {actions} from '@models'
 import { cloneDeep } from 'lodash'
+import {DpValue} from "tuya-panel-kit";
 
 const nativeModule = NativeModules.LDVDeviceEventEmitter
 
@@ -17,12 +19,18 @@ export const nativeEventEmitter = new NativeEventEmitter(nativeModule)
 let deviceDPListener: EmitterSubscription | null
 let groupFeatureListener: EmitterSubscription | null
 let groupDeviceListener: EmitterSubscription | null
+let groupDpListener: EmitterSubscription | null
 
 interface GroupFeatureEvent {
   tyGroupId: number
   config: string
 }
 
+interface GroupDpEvent {
+  tyGroupId?: number
+  dps?: any
+}
+
 interface DeviceEvent {
   devId: string
   dps: any
@@ -40,6 +48,7 @@ export const addListener = (store) => {
     // device info
     if (event.dps && event.devId && event.devId === store.getState().ldvModules.deviceInfo.devId) {
       console.log('长链接刷新DP数据', event.devId, event.dps)
+      // @ts-ignore
       const nativeProps: NativeProps = {
         familyName: '',
         deviceInfo: {
@@ -61,6 +70,7 @@ export const addListener = (store) => {
     const tyGroupId = Number(event.tyGroupId)
     if (tyGroupId == store.getState().ldvModules.uaGroupInfo.tyGroupId) {
       console.log('长链接刷新Group数据', event)
+      // @ts-ignore
       const nativeProps: NativeProps = {
         familyName: '',
         deviceInfo: {} as DeviceInfo,
@@ -69,14 +79,25 @@ export const addListener = (store) => {
           pId: '',
           config: JSON.parse(event.config),
           dps: {},
-        },
+        } as UAGroupInfo,
       }
       store.dispatch(setGroupNativeProps(nativeProps))
     }
   })
 
+  groupDpListener = nativeEventEmitter.addListener('UAGroupDpUpdate', (event: GroupDpEvent) => {
+    const tyGroupId = Number(event.tyGroupId);
+    const groupId = Number(store.getState().ldvModules.uaGroupInfo.tyGroupId)
+    if (tyGroupId === groupId) {
+      let data = event.dps
+      if (typeof event.dps === 'string') {
+        data = JSON.parse(event.dps)
+      }
+      store.dispatch(setGroupDps(data as Record<string, DpValue>))
+    }
+  })
+
   groupDeviceListener = nativeEventEmitter.addListener('TYInfoUpdate', (event: TYInfoUpdateType) =>{
-    console.log(event, 'event')
     const groupDevices = store.getState().ldvModules.uaGroupInfo.groupDevices
     const newGroupDevices = cloneDeep(groupDevices).map(device => {
       if(device.deviceId.indexOf(event.devId) !== -1){
@@ -100,4 +121,7 @@ export const removeListener = () => {
 
   groupDeviceListener && groupDeviceListener.remove()
   groupDeviceListener = null
+
+  groupDpListener && groupDpListener.remove()
+  groupDpListener = null
 }

package/src/models/modules/NativePropsSlice.tsx

@@ -1,5 +1,5 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
-import { useSelector } from '../index'
+import {useSelector} from '../index'
 import { Dispatch, useCallback } from 'react'
 import { DpsResult, Result } from './Result'
 import { DevInfo, DpValue } from 'tuya-panel-kit'
@@ -119,6 +119,12 @@ const nativePropsSlice = createSlice({
         state.deviceInfo.dps[dp] = action.payload[dp]
       })
     },
+    setGroupDps(state, action: PayloadAction<any>) {
+      const dpKeys = Object.keys(action.payload)
+      dpKeys.forEach(dp => {
+        state.uaGroupInfo.dps[dp] = action.payload[dp]
+      })
+    },
     setTimeSchedule(state, action: PayloadAction<any>) {
       state.timeSchedule = action.payload
     },
@@ -189,6 +195,10 @@ const useDeviceId = () => {
   return useSelector(store => store.ldvModules.deviceInfo.devId)
 }
 
+const useGroupId = () => {
+  return useSelector(store => store.ldvModules.uaGroupInfo.tyGroupId)
+}
+
 const useFamilyName: () => string = () => {
   return useSelector(store => store.ldvModules.familyName)
 }
@@ -207,6 +217,11 @@ function useDp<T, R extends any>(dp: string): [T, (value: T) => Promise<Result<R
   return [dpValue, setDp]
 }
 
+function useGroupDp<T>(dp: string): [T] {
+  const dpValue = useSelector(store => store.ldvModules.uaGroupInfo.dps[dp])
+  return [dpValue]
+}
+
 function useScaledDp<R extends any>(dp: string, scaled: number = 10): [number, (value: number) => Promise<Result<R>>] {
   const [sd, setSd] = useDp<number, R>(dp)
   const setScaledDpValue = useCallback(async (value: number) => {
@@ -391,6 +406,7 @@ export const {
   setNativeProps,
   setGroupNativeProps,
   setDps,
+  setGroupDps,
   setTimeSchedule,
   setMoods,
   setFlags,
@@ -408,6 +424,8 @@ export {
   useDeviceId,
   useDeviceInfo,
   useDp,
+  useGroupId,
+  useGroupDp,
   useScaledDp,
   useDps,
   useFamilyName,