@ledvance/ui-biz-bundle 1.0.86 → 1.0.88

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/ui-biz-bundle",
   "pid": [],
   "uiid": "",
-  "version": "1.0.86",
+  "version": "1.0.88",
   "scripts": {},
   "dependencies": {
     "@ledvance/base": "^1.x",

package/src/modules/biorhythm/BiorhythmPage.tsx

@@ -553,6 +553,9 @@ const BiorhythmPage = () => {
                       onPlanEdited,
                       onPlanDelete,
                       minimumEnable,
+                      iconIdList: state.planList?.map(item => {
+                        return item.iconId
+                      }),
                       isMixRGBWLamp: params.isMixRGBWLamp,
                       isSupportTemperature: params.isSupportTemperature,
                       isSupportBrightness: params.isSupportBrightness,

package/src/modules/fixedTime/FixedTimeActions.ts

@@ -34,6 +34,15 @@ export interface CycleTimerItem extends CycleTimer {
   name: string
 }
 
+export interface PlugFixedTimer {
+  power: boolean;
+  channel: number;
+  weeks: number[];
+  startTime: number;
+  endTime: number;
+  openTime: number;
+  closeTime: number;
+}
 
 type UseFixedTimeType = (dpKey: string, disableFeature?: boolean) => [CycleTimerItem[], (fixedTimeList: CycleTimerItem[], manualEdit?: boolean) => Promise<{ success: boolean }>]
 

package/src/modules/mood/FantasyMood.tsx

@@ -41,7 +41,7 @@ const FantasyMoodPage = () => {
   const params: FantasyMoodPageProps = {
     ...routeParams,
   }
-  const [sceneId, setScene] = useFantasyScene(params.sceneDpCode, params.workModeDpCode, params.isStringLight)
+  const [sceneId, setScene] = useFantasyScene(params.sceneDpCode, params.workModeDpCode, params.switchLedDpCode, params.isStringLight)
   const [workMode] = useWorkMode(params.workModeDpCode)
   const deviceInfo = useDeviceInfo()
   const navigation = useNavigation()
@@ -80,7 +80,7 @@ const FantasyMoodPage = () => {
         state.flag = Symbol()
       },
     })
-  }, [])
+  }, [state.scenes])
 
   const getSwitchEnable = useCallback((id: number) => {
     return state.currentScene?.id === id &&  workMode === SCENE

package/src/modules/mood/FantasyMoodEditPage.tsx

@@ -50,7 +50,7 @@ const FantasyMoodEditPage = () => {
   const moduleParams = params.moduleParams
   const deviceId = useDeviceId()
   const [, setWorkMode] = useWorkMode(moduleParams.workModeDpCode)
-  const [, setFantasyScene] = useFantasyScene(params.moduleParams.sceneDpCode, params.moduleParams.workModeDpCode, moduleParams.isStringLight)
+  const [, setFantasyScene] = useFantasyScene(params.moduleParams.sceneDpCode, params.moduleParams.workModeDpCode, params.moduleParams.switchLedDpCode, moduleParams.isStringLight)
   const role = useRole()
   const state = useReactive<FantasyMoodEditPageState>({
     headline: '',
@@ -83,7 +83,7 @@ const FantasyMoodEditPage = () => {
   }, [])
 
   const onPost = useCallback(async (isDelete: boolean) => {
-    const maxModeObject = maxBy(params.moods, 'mode');
+    const maxModeObject = maxBy(params.moods, 'id');
     const currentMood = {
       ...state.mood,
       nodes: state.mood.nodes.map(node => {
@@ -97,8 +97,9 @@ const FantasyMoodEditPage = () => {
         }
         return node
       }),
-      id: params.mode === 'add' ? maxModeObject && maxModeObject.mode > 200 ? maxModeObject.mode + 1 : 201 : state.mood.id
+      id: params.mode === 'add' ? maxModeObject && maxModeObject.id > 200 ? maxModeObject.id + 1 : 201 : state.mood.id
     }
+
     const list = params.mode === 'add' ? [currentMood,...params.moods] :
       isDelete ? params.moods.filter(mood => mood.id !== currentMood.id) :
         params.moods.map(mood => {
@@ -118,7 +119,7 @@ const FantasyMoodEditPage = () => {
     }
     navigation.navigate(ui_biz_routerKey.ui_biz_fantasy_mood)
     routeParams.onSave()
-  }, [])
+  }, [params.moods])
 
   const createSelectModeData = useCallback(() => {
     return Object.values(state.sceneMode).map(scene => {

package/src/modules/powerOnBehavior/PowerOnBehaviorPage.tsx

@@ -1,9 +1,10 @@
 import React, { PropsWithChildren } from 'react'
 import { Image, ScrollView, StyleSheet, Text, TouchableOpacity, View, ViewProps } from 'react-native'
+import { useRoute } from '@react-navigation/core'
 import Page from '@ledvance/base/src/components/Page'
 import { useDeviceInfo } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import I18n from '@ledvance/base/src/i18n'
-import { PowerBehaviorPageParams, usePowerBehavior } from './powerOnBehaviorActions'
+import { PowerBehaviorPageParams, usePowerBehavior } from './PowerOnBehaviorActions'
 import { Utils } from 'tuya-panel-kit'
 import Spacer from '@ledvance/base/src/components/Spacer'
 import Card from '@ledvance/base/src/components/Card'
@@ -16,10 +17,11 @@ const RELAY_STATUS_OFF = 'off'
 const RELAY_STATUS_ON = 'on'
 const RELAY_STATUS_MEMORY = 'memory'
 
-const PowerOnBehaviorPage = (props: PowerBehaviorPageParams) => {
+const PowerOnBehaviorPage = () => {
+  const params = useRoute().params as PowerBehaviorPageParams
   const deviceInfo = useDeviceInfo()
-  const [powerMemory, setPowerMemory] = usePowerBehavior(props.powerBehaviorCode)
-
+  const [powerMemory, setPowerMemory] = usePowerBehavior(params.powerBehaviorCode)
+  
   const state = useReactive({
     powerMemory,
     loading: false,

package/src/modules/randomTime/RandomTimeActions.ts

@@ -29,6 +29,18 @@ export interface RandomTimerItem extends RandomTimer{
   name: string
 }
 
+export interface PlugRandomTimer {
+  power: boolean;
+  weeks: number[];
+  startTime: number;
+  endTime: number;
+}
+
+export interface PlugRandomTimerItem extends PlugRandomTimer {
+  index: number | string
+  name: string
+}
+
 
 type UseFixedTimeType = (dpKey: string, disableFeature?: boolean) => [RandomTimerItem[], (randomTimeList: RandomTimerItem[], manualEdit?: boolean) => Promise<{ success: boolean}>]
 
@@ -38,7 +50,6 @@ export const useRandomTime : UseFixedTimeType = (dpKey: string, disableFeature?:
   const [uiData, setUiData] = useState<RandomTimerItem[]>([])
   const [randomTime, setRandomTime]: [string, (v: string) => Promise<Result<any>>] = useDp(dpKey)
   const randomTimeList: RandomTimer[] = useMemo(() => RandomTimer.parse(randomTime).nodes, [randomTime])
-  console.log(RandomTimer.parse(randomTime), '< --- randomTimer')
   const formatterFn = useCallback(() =>{
     return randomTimeList.map((item, idx)=>({
       ...item,

package/src/modules/scene/SceneAction.ts

@@ -401,7 +401,7 @@ export function stripObj2Dp(scene: StripSceneInfo, isStringLight: boolean = fals
   return versionHex + idHex + modeHex + intervalTimeHex + changeTimeHex + optionAHex + optionBHex + optionCHex + nodeHex
 }
 
-export function useFantasyScene(sceneDp: string, workModeDp: string, isStringLight?: boolean): [number, (scene: StripSceneInfo) => Promise<Result<any>>] {
+export function useFantasyScene(sceneDp: string, workModeDp: string, switchDp: string, isStringLight?: boolean): [number, (scene: StripSceneInfo) => Promise<Result<any>>] {
   const [dps, setDps]: [any, (v: any) => Promise<Result<any>>] = useDps()
   const dp = dps[sceneDp]
   const [sceneState, setSceneState] = useState<StripSceneInfo>(stripDp2Obj(dp, isStringLight))
@@ -414,7 +414,8 @@ export function useFantasyScene(sceneDp: string, workModeDp: string, isStringLig
     const sceneHex = stripObj2Dp(scene, isStringLight)
     return setDps({
       [sceneDp]: sceneHex,
-      [workModeDp]: SCENE
+      [workModeDp]: SCENE,
+      [switchDp]: true
     })
   }
   return [sceneState.id, setFantasyScene]
@@ -426,14 +427,14 @@ type LampType = {
 }
 export async function getRemoteFantasyScene(featureId: string, devId: string, lampType: LampType) {
   const res = await NativeApi.getJson(devId, featureId)
-  const cloudData = Array.isArray(parseJSON(res?.data)) && parseJSON(res?.data) || []
-  if (res.success && cloudData?.length) {
+  const isNormalData = Array.isArray(parseJSON(res?.data))
+  if (res.success && isNormalData) {
     return {
       success: true,
       data: JSON.parse(res.data)?.map(item => remoteFantasySceneInfo2SceneUIState(item, lampType.isStringLight)),
     }
   } else {
-    if (res.msg?.includes('资源未找到') || cloudData?.length === 0) {
+    if (res.msg?.includes('资源未找到') || !isNormalData) {
       const defaultScene = getDefFantasyScene(lampType)
       const res = await NativeApi.putJson(devId, featureId, JSON.stringify(defaultScene))
       if (res.success) {

package/src/modules/sleepWakeup/SleepWakeUpDetailPage.tsx

@@ -126,19 +126,19 @@ const SleepWakeUpDetailPage = () => {
   }, [])
 
   useUpdateEffect(() => {
-    const min = state.fadeOutHour === '02' ? '00' : (state.fadeOutHour === '00' && state.fadeOutMinute === '00' && '05') || state.fadeOutMinute
+    const min = state.fadeOutHour === '02' ? '00' : (state.fadeOutHour === '00' && state.fadeOutMinute === '00') ? '05' : state.fadeOutMinute
     state.fadeOutMinute = min
     state.fadeOut = (Number(state.fadeOutHour) * 60) + Number(min)
   }, [state.fadeOutHour, state.fadeOutMinute])
 
   useUpdateEffect(() => {
-    const min = state.fadeInHour === '02' ? '00' : (state.fadeInHour === '00' && state.fadeInMinute === '00' && '05') || state.fadeInMinute
+    const min = state.fadeInHour === '02' ? '00' : (state.fadeInHour === '00' && state.fadeInMinute === '00') ? '05' : state.fadeInMinute
     state.fadeInMinute = min
     state.fadeIn = (Number(state.fadeInHour) * 60) + Number(min)
   }, [state.fadeInHour, state.fadeInMinute])
 
   useUpdateEffect(() => {
-    const min = state.durationHour === '02' ? '00' : (state.durationHour === '00' && state.durationMinute === '00' && '05') || state.durationMinute
+    const min = state.durationHour === '02' ? '00' : (state.durationHour === '00' && state.durationMinute === '00') ? '05' : state.durationMinute
     state.durationMinute = min
     state.duration = (Number(state.durationHour) * 60) + Number(min)
   }, [state.durationHour, state.durationMinute])
@@ -386,7 +386,7 @@ const SleepWakeUpDetailPage = () => {
           <LdvPickerView
             style={styles.picker}
             hour={props.isSleep ? state.fadeOutHour : state.fadeInHour}
-            minute={props.isSleep ? state.fadeOutMinute : state.fadeOutMinute}
+            minute={props.isSleep ? state.fadeOutMinute : state.fadeInMinute}
             minutesStep={5}
             setHour={v => {
               if (props.isSleep) {
@@ -403,6 +403,7 @@ const SleepWakeUpDetailPage = () => {
               }
             }}
             unit={['h', 'min']}
+            maxHour={3}
           />
           <Text>{I18n.formatValue(props.isSleep ? 'add_sleepschedule_one_source_settings_text2' : 'add_wakeupschedule_settings_text2', `${formateTime(props.isSleep ? state.fadeOut : state.fadeIn, props.isSleep)}`)}</Text>
           <Spacer />
@@ -435,6 +436,7 @@ const SleepWakeUpDetailPage = () => {
               setHour={v => (state.durationHour = v)}
               setMinute={v => (state.durationMinute = v)}
               unit={['h', 'min']}
+              maxHour={3}
             />
             <Text>{I18n.formatValue('add_wakeupschedule_settings_text5', `${formateTime(state.duration, !props.isSleep)}`)}</Text>
             <Spacer />

package/src/modules/timeSchedule/TimeSchedulePage.tsx

@@ -99,13 +99,21 @@ const TimeSchedulePage = () => {
   }, [state.timeScheduleList])
 
   const getTimerScheduleList = async () => {
-    const res: any = await NativeApi.timerList(deviceInfo.devId)
-    if (res.result && res.value) {
+    // const res: any = await NativeApi.timerList(deviceInfo.devId)
+    const res: any = await NativeApi.getAllTaskTimer(deviceInfo.devId)
+    if (res.success && res.data) {
       // 原生传过来的dps是json字符串。
-      const originList = res.value.map((item: any) => {
+      const originList = res.data.map((item: any) => {
         return {
-          ...item,
-          dps: JSON.parse(item.dps),
+          aliasName: item.remark,
+          status: !!item.mStatus,
+          id: item.mTimerId,
+          groupId: item.mTimerId,
+          loops: item.mLoops,
+          date: item.mDate,
+          time: item.mTime,
+          isAppPush: item.isAppPush ? 1 : 0,
+          dps: JSON.parse(item.mValue),
         }
       })
       state.timeScheduleList = originList