@ledvance/base 1.2.24 → 1.2.25

package/package.json

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

package/src/composeLayout.tsx

@@ -4,13 +4,14 @@ import { Provider } from 'react-redux'
 import { DevInfo, DpValue, Theme, TYSdk } from 'tuya-panel-kit'
 import { actions, store } from './models'
 import { addListener, removeListener } from 'api/nativeEventEmitter'
-import { NativeApi } from 'api/native'
+import { getSystemTimeFormat, NativeApi } from 'api/native'
 import {
   DeviceInfo,
   NativeProps,
   setGroupDevices,
   setGroupNativeProps,
   setNativeProps,
+  setSystemTimeFormat,
   UAGroupInfo,
 } from './models/modules/NativePropsSlice'
 import { DpSchema, GlobalParams } from './models/GlobalParams'
@@ -117,6 +118,9 @@ const composeLayout = (component: React.ComponentType) => {
         this.initReduxGroupNativeProps(props.uaGroupInfo)
         this.initGroupDevices(props.uaGroupInfo?.tyGroupId)
       }
+      getSystemTimeFormat().then(time => {
+        dispatch(setSystemTimeFormat(time === 24))
+      })
     }
 
     initReduxDeviceNativeProps(ldvDevInfo: LdvDevInfo) {
@@ -138,7 +142,8 @@ const composeLayout = (component: React.ComponentType) => {
         },
         familyName: ldvDevInfo.familyName,
         role: ldvDevInfo.role,
-        moods: []
+        moods: [],
+        is24HourClock: true
       }
       NativeApi.showObj(nativeProps)
       console.log('Redux 初始数据：', JSON.stringify(nativeProps))
@@ -167,7 +172,8 @@ const composeLayout = (component: React.ComponentType) => {
         },
         familyName: uaGroupInfo.familyName,
         role: uaGroupInfo.role,
-        moods: []
+        moods: [],
+        is24HourClock: true
       }
       NativeApi.showObj(nativeProps)
       console.log('Redux 初始数据：', JSON.stringify(nativeProps))

package/src/models/modules/NativePropsSlice.tsx

@@ -8,6 +8,7 @@ import { useDispatch } from 'react-redux'
 import { GlobalParams } from '../GlobalParams'
 import { isNumber, snakeCase } from 'lodash'
 import { PropertyValueTypes } from '../../utils/TypeUtils'
+import { DeviceInfo as GroupDeviceInfo } from '../../api/native'
 
 export interface NativeProps {
   familyName: string
@@ -17,6 +18,7 @@ export interface NativeProps {
   timeSchedule?: boolean
   energieverbrauch?: object
   moods: any[]
+  is24HourClock: boolean
 }
 
 export interface DeviceInfo {
@@ -30,7 +32,7 @@ export interface UAGroupInfo {
   pId: string
   dps: any
   config: any
-  groupDevices: DeviceInfo[]
+  groupDevices: GroupDeviceInfo[]
 }
 
 const initialState: NativeProps = {
@@ -51,6 +53,7 @@ const initialState: NativeProps = {
   timeSchedule: false,
   energieverbrauch: {},
   moods: [],
+  is24HourClock: true
 }
 
 // energy generation
@@ -114,6 +117,9 @@ const nativePropsSlice = createSlice({
     setGroupDevices(state, action: PayloadAction<any>) {
       state.uaGroupInfo.groupDevices = action.payload
     },
+    setSystemTimeFormat(state, action: PayloadAction<any>) {
+      state.is24HourClock = action.payload
+    }
   },
 })
 
@@ -224,15 +230,19 @@ const useMoods = (): [any[], (v: any[]) => void] => {
   return [dps, setMoodsFn]
 }
 
-const useGroupDevices = (): [any[], (v: any[]) => void] => {
+const useGroupDevices = (): [GroupDeviceInfo[], (v: GroupDeviceInfo[]) => void] => {
   const dps = useSelector(store => store.ldvModules.uaGroupInfo.groupDevices)
   const dispatch = useDispatch()
-  const setGroupDevicesFn = (value: any[]) => {
+  const setGroupDevicesFn = (value: GroupDeviceInfo[]) => {
     dispatch(setGroupDevices(value))
   }
   return [dps, setGroupDevicesFn]
 }
 
+const useSystemTimeFormate = (): boolean => {
+  return useSelector(store => store.ldvModules.is24HourClock)
+}
+
 const useEnergieverbrauch = () => {
   const dps = useSelector(store => store.ldvModules.energieverbrauch)
   const dispatch = useDispatch()
@@ -314,7 +324,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 = () => {
@@ -336,6 +346,7 @@ export const {
   setTimeSchedule,
   setMoods,
   setGroupDevices,
+  setSystemTimeFormat,
   setEnergieverbrauch,
 } = nativePropsSlice.actions
 
@@ -353,5 +364,6 @@ export {
   useTimeSchedule,
   useMoods,
   useGroupDevices,
+  useSystemTimeFormate,
   useEnergieverbrauch,
 }