@ledvance/ui-biz-bundle 1.1.109 → 1.1.111

package/package.json

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

package/src/hooks/DeviceDpStateHooks.ts

@@ -4,9 +4,10 @@ import {Result} from '@ledvance/base/src/models/modules/Result'
 import { useRandomTime } from '../newModules/randomTime/RandomTimeActions'
 import { useBiorhythm } from '../newModules/biorhythm/BiorhythmActions'
 import { useFixedTime } from '../newModules/fixedTime/FixedTimeActions'
+import { useSwitchInching } from '../newModules/swithInching/SwithInchingAction'
 import { getEndTime, getStartTime, useSleepMode, useWakeUp } from '../newModules/sleepWakeUp/SleepWakeUpActions'
 import { isConflictTask } from '@ledvance/base/src/utils/common'
-import { isEmpty } from 'lodash'
+import { cloneDeep, isEmpty } from 'lodash'
 import { useReactive } from 'ahooks'
 
 export const WHITE = 'white'
@@ -63,6 +64,7 @@ interface ConflictDps {
   biorhythmDpCode?: string
   sleepDpCode?: string
   wakeUpDpCode?: string
+  switchIngCode?: string 
 }
 
 interface ConflictItem {
@@ -72,17 +74,19 @@ interface ConflictItem {
   enable: boolean
 }
 
-export const useConflictTask = (conflictDps: ConflictDps): [(v: ConflictItem) => boolean, () => void] => {
+export const useConflictTask = (conflictDps: ConflictDps, isPlug?: boolean): [(v: ConflictItem) => boolean, () => void] => {
   const [biorhythm, setBiorhythm] = useBiorhythm(conflictDps.biorhythmDpCode!, true)
-  const [fixedTime, setFixedTime] = useFixedTime(conflictDps.fixedTimeDpCode!, false, true)
-  const [randomTime, setRandomTime] = useRandomTime(conflictDps.randomTimeDpCode!, false, true)
+  const [fixedTime, setFixedTime] = useFixedTime(conflictDps.fixedTimeDpCode!, !!isPlug, true)
+  const [randomTime, setRandomTime] = useRandomTime(conflictDps.randomTimeDpCode!, !!isPlug, true)
   const [sleepPlan, setSleepPlan] = useSleepMode(conflictDps.sleepDpCode!, true)
   const [wakeUpPlan, setWakeUpPlan] = useWakeUp(conflictDps.wakeUpDpCode!, true)
+  const [switchInching, setSwitchInching] = useSwitchInching(conflictDps.switchIngCode!) 
   const state = useReactive({
     conflictTask: {}
   })
+
   const checkConflict = (conflictItem: ConflictItem) => {
-    state.conflictTask = {}
+    let newState = {...state.conflictTask}
     if (conflictDps.biorhythmDpCode && biorhythm.enable){
       const biorhythmTask = {
         startTime: 0,
@@ -90,12 +94,9 @@ export const useConflictTask = (conflictDps: ConflictDps): [(v: ConflictItem) =>
         weeks: biorhythm.repeatPeriod.map(item => item.enabled ? 1 : 0)
       }
       if (isConflictTask(conflictItem, biorhythmTask)){
-        state.conflictTask = {
-          ...state.conflictTask,
-          [conflictDps.biorhythmDpCode]: {
-            ...biorhythm,
+        newState[conflictDps.biorhythmDpCode] = {
+          ...biorhythm,
             enable: false 
-          }
         }
       }
     }
@@ -112,10 +113,7 @@ export const useConflictTask = (conflictDps: ConflictDps): [(v: ConflictItem) =>
         return item 
       })
       if (conflict){
-        state.conflictTask = {
-          ...state.conflictTask,
-          [conflictDps.fixedTimeDpCode]: newFixedTime
-        }
+        newState[conflictDps.fixedTimeDpCode] = newFixedTime
       }
     }
     if (conflictDps.randomTimeDpCode && randomTime.length){
@@ -131,10 +129,7 @@ export const useConflictTask = (conflictDps: ConflictDps): [(v: ConflictItem) =>
         return item 
       })
       if (conflict){
-        state.conflictTask = {
-          ...state.conflictTask,
-          [conflictDps.randomTimeDpCode]: newRandomTime
-        }
+        newState[conflictDps.randomTimeDpCode] = newRandomTime
       }
     }
     if (conflictDps.sleepDpCode && sleepPlan.length){
@@ -154,10 +149,7 @@ export const useConflictTask = (conflictDps: ConflictDps): [(v: ConflictItem) =>
         return item 
       })
       if (conflict){
-        state.conflictTask = {
-          ...state.conflictTask,
-          [conflictDps.sleepDpCode]: newSleepPlan
-        }
+        newState[conflictDps.sleepDpCode] = newSleepPlan
       }
     }
     if (conflictDps.wakeUpDpCode && wakeUpPlan.length){
@@ -177,13 +169,17 @@ export const useConflictTask = (conflictDps: ConflictDps): [(v: ConflictItem) =>
         return item 
       })
       if (conflict){
-        state.conflictTask = {
-          ...state.conflictTask,
-          [conflictDps.wakeUpDpCode]: newWakeUpPlan
-        }
+        newState[conflictDps.wakeUpDpCode] = newWakeUpPlan
+      }
+    }
+    if (conflictDps.switchIngCode && switchInching.enable){
+      newState[conflictDps.switchIngCode] = {
+        ...switchInching,
+        enable: false 
       }
     }
-    return !isEmpty(state.conflictTask)
+    state.conflictTask = cloneDeep(newState)
+    return !isEmpty(newState)
   }
 
   const resolveConfict = () => {
@@ -202,6 +198,9 @@ export const useConflictTask = (conflictDps: ConflictDps): [(v: ConflictItem) =>
     if (conflictDps.wakeUpDpCode && state.conflictTask[conflictDps.wakeUpDpCode]){
       setWakeUpPlan(state.conflictTask[conflictDps.wakeUpDpCode], false).then()
     }
+    if (conflictDps.switchIngCode && state.conflictTask[conflictDps.switchIngCode]){
+      setSwitchInching(state.conflictTask[conflictDps.switchIngCode]).then()
+    }
   }
   return [checkConflict, resolveConfict]
 }

package/src/newModules/fixedTime/FixedTimeActions.ts

@@ -91,7 +91,7 @@ export const useFixedTime: UseFixedTimeType = (dpKey, isPlug, disableFeature) =>
               return {
                 ...item,
                 index: idx,
-                name: featureItem && featureItem?.n ? featureItem?.n : `${I18n.getLang('randomtimecycle_sockets_headline_text')} ${idx + 1}`
+                name: featureItem && featureItem?.n ? featureItem?.n : `${I18n.getLang('fixedTimeCycle_socket_headline')} ${idx + 1}`
               }
             })
             setFixedTimeUiList(uiPlan)

package/src/newModules/fixedTime/FixedTimePage.tsx

@@ -32,6 +32,7 @@ export interface FixedTimePageParams {
     biorhythmDpCode?: string
     sleepDpCode?: string
     wakeUpDpCode?: string
+    switchIngCode?: string 
   }
   isPlug?: boolean
   showTags?: boolean
@@ -48,7 +49,7 @@ const FixedTimePage = (props: { theme?: ThemeType }) => {
   const MAX_NUM = params.isPlug ? 10 : 4
   const is24Hour = useSystemTimeFormate()
   const [fixedTime, setFixedTime] = useFixedTime(params.fixedTimeDpCode, params.isPlug)
-  const [checkConflict, resolveConflict] = useConflictTask(params.conflictDps)
+  const [checkConflict, resolveConflict] = useConflictTask(params.conflictDps, params.isPlug)
   const state = useReactive({
     loading: false,
     originList: cloneDeep(fixedTime),
@@ -68,14 +69,14 @@ const FixedTimePage = (props: { theme?: ThemeType }) => {
     state.fixedTimeList = cloneDeep(checkedList)
   }, [JSON.stringify(state.checkTags), JSON.stringify(state.originList)])
 
-  const navigateToEdit = useCallback((mode: 'add' | 'edit', scheduleItem: FixedTimerUiItem) => {
+  const navigateToEdit = (mode: 'add' | 'edit', scheduleItem: FixedTimerUiItem) => {
     navigation.navigate(ui_biz_routerKey.ui_biz_fixed_time_edit_new, {
       ...params,
       mode,
       scheduleItem: cloneDeep(scheduleItem),
       onPost
     })
-  }, [])
+  }
 
   const showMaxNumTip = useCallback(() => {
     return state.originList.length >= MAX_NUM

package/src/newModules/randomTime/RandomTimePage.tsx

@@ -33,6 +33,7 @@ export interface RandomTimePageParams {
     biorhythmDpCode?: string
     sleepDpCode?: string
     wakeUpDpCode?: string
+    switchIngCode?: string 
   }
   isPlug?: boolean
   showTags?: boolean
@@ -49,7 +50,7 @@ const RandomTimePage = (props: { theme?: ThemeType }) => {
   const MAX_NUM = params.isPlug ? 16 : 4
   const is24Hour = useSystemTimeFormate()
   const [randomTime, setRandomTime] = useRandomTime(params.randomTimeDpCode, params.isPlug)
-  const [checkConflict, resolveConflict] = useConflictTask(params.conflictDps)
+  const [checkConflict, resolveConflict] = useConflictTask(params.conflictDps, params.isPlug)
   const state = useReactive({
     loading: false,
     originList: cloneDeep(randomTime),
@@ -69,14 +70,14 @@ const RandomTimePage = (props: { theme?: ThemeType }) => {
     state.randomTimeList = cloneDeep(checkedList)
   }, [JSON.stringify(state.checkTags), JSON.stringify(state.originList)])
 
-  const navigateToEdit = useCallback((mode: 'add' | 'edit', scheduleItem?: RandomTimerUiItem) => {
+  const navigateToEdit = (mode: 'add' | 'edit', scheduleItem?: RandomTimerUiItem) => {
     navigation.navigate(ui_biz_routerKey.ui_biz_random_time_edit_new, {
       ...params,
       mode,
       scheduleItem: cloneDeep(scheduleItem),
       onPost,
     })
-  }, [])
+  }
 
   const showMaxNumTip = useCallback(() => {
     return state.originList.length >= MAX_NUM

package/src/newModules/sleepWakeUp/SleepWakeUpPage.tsx

@@ -79,7 +79,7 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
     state.loading = !wakeupComplete && !sleepComplete
   }, [wakeupComplete, sleepComplete])
 
-  const onAddScheduleDialogItemClick = useCallback((isSleep: boolean, mode: 'add' | 'edit', scheduleItem?: any) => {
+  const onAddScheduleDialogItemClick = (isSleep: boolean, mode: 'add' | 'edit', scheduleItem?: any) => {
     if (mode === 'add' && isSleep && state.sleepScheduleList.length === MAX_SCHEDULE) return
     if (mode === 'add' && !isSleep && state.wakeUpScheduleList.length === MAX_SCHEDULE) return
     navigateToEdit({
@@ -90,7 +90,7 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
       modDeleteTimeSchedule
     })
     state.showAddSchedulePopover = false
-  }, [state.filteredScheduleList])
+  }
 
   const modDeleteTimeSchedule = async (mode: 'add' | 'edit' | 'del', isSleep: boolean, sleepWakeUp: SleepUIItem | WakeUpUIItem) => {
     let cloneSleepWakeUp: any[] = isSleep ? cloneDeep(state.sleepScheduleList) : cloneDeep(state.wakeUpScheduleList)

package/src/newModules/swithInching/SwithInching.tsx

@@ -7,38 +7,27 @@ import { SwitchButton, Utils, Dialog } from "tuya-panel-kit";
 import LdvPickerView from "@ledvance/base/src/components/ldvPickerView";
 import I18n from '@ledvance/base/src/i18n'
 import { useReactive, useUpdateEffect } from "ahooks";
-import {SwitchInchingPageParams, useCountdown1, useSwitchInching} from "./SwithInchingAction";
-import {useRandomTime} from "../randomTime/RandomTimeActions";
-import {useFixedTime} from "../fixedTime/FixedTimeActions";
-import {useParams} from "@ledvance/base/src/hooks/Hooks";
+import { SwitchInchingPageParams, useCountdown1, useSwitchInching } from "./SwithInchingAction";
+import { useParams } from "@ledvance/base/src/hooks/Hooks";
 import ThemeType from '@ledvance/base/src/config/themeType'
+import { useConflictTask } from "hooks/DeviceDpStateHooks";
+import { showDialog } from "@ledvance/base/src/utils/common";
 
 const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
 
-interface SwitchInchingState {
-  enable: boolean,
-  minute: string,
-  second: string,
-  flag: Symbol | number
-}
-
 const SwitchInching = (props: { theme?: ThemeType }) => {
   const params = useParams<SwitchInchingPageParams>()
   const deviceInfo = useDeviceInfo()
   const navigation = useNavigation()
-  const [switchInching, setSwitchInching] = useSwitchInching(params.switchInchingCode)
-  const [randomTimePlan, setRandomTimePlan] = useRandomTime(params.randomTimeCode, true)
-  const [fixedTimePlan, setFixedTimePlan] = useFixedTime(params.cycleTimeCode, true)
+  const [switchInching, setSwitchInching] = useSwitchInching(params.switchIngCode)
   const [countdown1, setCountDown1] = useCountdown1(params.countdownCode)
-  const randomEnable = randomTimePlan.some(item => item.enable)
-  const fixedEnable = fixedTimePlan.some(item => item.enable)
-  const timerEnable = !!countdown1
-  const state = useReactive<SwitchInchingState>({
+  const [checkConflict, resolveConflict] = useConflictTask(params.conflictDps, true)
+  const state = useReactive({
     enable: false,
     minute: '00',
     second: '00',
-    flag: 1
+    loading: false
   })
 
   useEffect(() => {
@@ -47,72 +36,15 @@ const SwitchInching = (props: { theme?: ThemeType }) => {
     state.second = formateValue('second')
   }, [JSON.stringify(switchInching)])
 
-  const showDialog = (run: () => void) => {
-    Dialog.confirm({
-      title: I18n.getLang('conflict_dialog_save_item_inching_titel'),
-      subTitle: I18n.getLang('conflict_dialog_save_item_inching_description'),
-      cancelText: I18n.getLang('conflict_dialog_save_item_inching_answer_no_text'),
-      confirmText: I18n.getLang('conflict_dialog_save_item_inching_answer_yes_text'),
-      onConfirm: (_, { close }) => {
-        close();
-        setSwitchInching({ ...switchInching, enable: false })
-        TurnOffFn()
-        run()
-      },
-    })
-  }
-
-  const TurnOffFn = () => {
-    if (randomEnable) {
-      const randomTimeList = randomTimePlan.map(item => {
-        if (item.enable) {
-          return {
-            ...item,
-            enable: false
-          }
-        } else {
-          return item
-        }
-      })
-      setRandomTimePlan(randomTimeList)
-    }
-    if (fixedEnable) {
-      const fixedTimeList = fixedTimePlan.map(item => {
-        if (item.enable) {
-          return {
-            ...item,
-            enable: false
-          }
-        } else {
-          return item
-        }
-      })
-      setFixedTimePlan(fixedTimeList)
-    }
-    if (timerEnable) {
+  const requestSwitchInching = async () => {
+    const enable = state.enable
+    const time = Number(state.minute) * 60 + Number(state.second)
+    if (enable && countdown1){
       setCountDown1(0)
     }
+    await setSwitchInching({ enable, time })
   }
 
-
-  const requestSwitchInching = () => {
-    const run = () => {
-      const enable = state.enable
-      const time = Number(state.minute) * 60 + Number(state.second)
-      setSwitchInching({ enable, time })
-    }
-    if (state.enable && (randomEnable || fixedEnable || timerEnable)) {
-      return showDialog(run)
-    }
-    run()
-  }
-
-  useEffect(() => {
-    if (state.flag !== 1) {
-      requestSwitchInching()
-    }
-  }, [state.flag])
-
   useUpdateEffect(() => {
     if (!!!Number(state.minute) && Number(state.second) < 2) {
       state.second = '02'
@@ -197,9 +129,34 @@ const SwitchInching = (props: { theme?: ThemeType }) => {
           </Text>
           <SwitchButton
             value={switchInching.enable}
-            onValueChange={v => {
+            onValueChange={async v => {
+              if (v) {
+                const switchingTask = {
+                  enable: v,
+                  startTime: 0,
+                  endTime: 1440,
+                  weeks: [1, 1, 1, 1, 1, 1, 1],
+                }
+                if (checkConflict(switchingTask)) {
+                  return showDialog({
+                    method: 'confirm',
+                    title: I18n.getLang('conflict_dialog_save_item_inching_titel'),
+                    subTitle: I18n.getLang('conflict_dialog_save_item_inching_description'),
+                    onConfirm: async (_, { close }) => {
+                      resolveConflict()
+                      close()
+                      state.loading = true
+                      state.enable = v;
+                      await requestSwitchInching()
+                    },
+                    onCancel: () => {
+                      Dialog.close()
+                    }
+                  })
+                }
+              }
               state.enable = v;
-              state.flag = Symbol();
+              await requestSwitchInching()
             }}
           />
         </View>

package/src/newModules/swithInching/SwithInchingAction.ts

@@ -3,10 +3,12 @@ import {Result} from "@ledvance/base/src/models/modules/Result"
 import {useDp} from "@ledvance/base/src/models/modules/NativePropsSlice";
 
 export interface SwitchInchingPageParams {
-  switchInchingCode: string
+  switchIngCode: string
   countdownCode: string
-  cycleTimeCode: string
-  randomTimeCode: string
+  conflictDps: {
+    randomTimeDpCode?: string
+    fixedTimeDpCode?: string
+  }
 }
 
 interface SwitchInchingModel {
@@ -36,9 +38,13 @@ export function useSwitchInchingHex(switchInchingCode: string): [string, (switch
 
 export const useSwitchInching: SwitchInchingResult = (switchInchingCode: string) => {
   const [hex, setHex] = useSwitchInchingHex(switchInchingCode)
-  const inching = Buffer.from(hex, 'base64')
-  const enable = !!inching[0]
-  const time = inching[1] * 256 + inching[2]
+  let enable = false 
+  let time = 0
+  if (switchInchingCode && hex){
+    const inching = Buffer.from(hex, 'base64')
+    enable = !!inching[0]
+    time = inching[1] * 256 + inching[2]
+  }
   const setSwitchInching = ({enable, time}) => {
     const enableHex = enable ? '01' : '00'
     const timeHex = format(time?.toString(16), 4)