@ledvance/ui-biz-bundle 1.1.106 → 1.1.108

package/package.json

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

package/src/hooks/DeviceDpStateHooks.ts

@@ -1,6 +1,13 @@
 import {NativeApi} from '@ledvance/base/src/api/native'
 import {useDp} from '@ledvance/base/src/models/modules/NativePropsSlice'
 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 { getEndTime, getStartTime, useSleepMode, useWakeUp } from '../newModules/sleepWakeUp/SleepWakeUpActions'
+import { isConflictTask } from '@ledvance/base/src/utils/common'
+import { isEmpty } from 'lodash'
+import { useReactive } from 'ahooks'
 
 export const WHITE = 'white'
 export const COLOUR = 'colour'
@@ -48,4 +55,153 @@ export const setMixSceneDp = (deviceId: string, value: string, dpCodes: Record<s
 
 export const useWorkMode = (workModeDpCode: string): [string, (mode: string) => Promise<Result<any>>] => {
   return useDp(workModeDpCode)
+}
+
+interface ConflictDps {
+  fixedTimeDpCode?: string
+  randomTimeDpCode?: string 
+  biorhythmDpCode?: string
+  sleepDpCode?: string
+  wakeUpDpCode?: string
+}
+
+interface ConflictItem {
+  startTime: number 
+  endTime: number 
+  weeks: number[]
+  enable: boolean
+}
+
+export const useConflictTask = (conflictDps: ConflictDps): [(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 [sleepPlan, setSleepPlan] = useSleepMode(conflictDps.sleepDpCode!, true)
+  const [wakeUpPlan, setWakeUpPlan] = useWakeUp(conflictDps.wakeUpDpCode!, true)
+  const state = useReactive({
+    conflictTask: {}
+  })
+  const checkConflict = (conflictItem: ConflictItem) => {
+    state.conflictTask = {}
+    if (conflictDps.biorhythmDpCode && biorhythm.enable){
+      const biorhythmTask = {
+        startTime: 0,
+        endTime: 1440,
+        weeks: biorhythm.repeatPeriod.map(item => item.enabled ? 1 : 0)
+      }
+      if (isConflictTask(conflictItem, biorhythmTask)){
+        state.conflictTask = {
+          ...state.conflictTask,
+          [conflictDps.biorhythmDpCode]: {
+            ...biorhythm,
+            enable: false 
+          }
+        }
+      }
+    }
+    if (conflictDps.fixedTimeDpCode && fixedTime.length){
+      let conflict = false 
+      const newFixedTime = fixedTime.map(item => {
+        if (item.enable && isConflictTask(item, conflictItem)) {
+          conflict = true 
+          return {
+            ...item,
+            enable: false
+          }
+        }
+        return item 
+      })
+      if (conflict){
+        state.conflictTask = {
+          ...state.conflictTask,
+          [conflictDps.fixedTimeDpCode]: newFixedTime
+        }
+      }
+    }
+    if (conflictDps.randomTimeDpCode && randomTime.length){
+      let conflict = false 
+      const newRandomTime = randomTime.map(item => {
+        if (item.enable && isConflictTask(item, conflictItem)) {
+          conflict = true 
+          return {
+            ...item,
+            enable: false
+          }
+        }
+        return item 
+      })
+      if (conflict){
+        state.conflictTask = {
+          ...state.conflictTask,
+          [conflictDps.randomTimeDpCode]: newRandomTime
+        }
+      }
+    }
+    if (conflictDps.sleepDpCode && sleepPlan.length){
+      let conflict = false 
+      const newSleepPlan = sleepPlan.map(item => {
+        if (item.enable && isConflictTask({
+          ...item,
+          startTime: getStartTime(item),
+          endTime: getEndTime(item)
+        }, conflictItem)) {
+          conflict = true 
+          return {
+            ...item,
+            enable: false
+          }
+        }
+        return item 
+      })
+      if (conflict){
+        state.conflictTask = {
+          ...state.conflictTask,
+          [conflictDps.sleepDpCode]: newSleepPlan
+        }
+      }
+    }
+    if (conflictDps.wakeUpDpCode && wakeUpPlan.length){
+      let conflict = false 
+      const newWakeUpPlan = wakeUpPlan.map(item => {
+        if (item.enable && isConflictTask({
+          ...item,
+          startTime: getStartTime(item),
+          endTime: getEndTime(item)
+        }, conflictItem)) {
+          conflict = true 
+          return {
+            ...item,
+            enable: false
+          }
+        }
+        return item 
+      })
+      if (conflict){
+        state.conflictTask = {
+          ...state.conflictTask,
+          [conflictDps.wakeUpDpCode]: newWakeUpPlan
+        }
+      }
+    }
+    return !isEmpty(state.conflictTask)
+  }
+
+  const resolveConfict = () => {
+    if (conflictDps.biorhythmDpCode && state.conflictTask[conflictDps.biorhythmDpCode]){
+      setBiorhythm(state.conflictTask[conflictDps.biorhythmDpCode], false).then()
+    }
+    if (conflictDps.fixedTimeDpCode && state.conflictTask[conflictDps.fixedTimeDpCode]){
+      setFixedTime(state.conflictTask[conflictDps.fixedTimeDpCode], false).then()
+    }
+    if (conflictDps.randomTimeDpCode && state.conflictTask[conflictDps.randomTimeDpCode]){
+      setRandomTime(state.conflictTask[conflictDps.randomTimeDpCode], false).then()
+    }
+    if (conflictDps.sleepDpCode && state.conflictTask[conflictDps.sleepDpCode]){
+      setSleepPlan(state.conflictTask[conflictDps.sleepDpCode], false).then()
+    }
+    if (conflictDps.wakeUpDpCode && state.conflictTask[conflictDps.wakeUpDpCode]){
+      setWakeUpPlan(state.conflictTask[conflictDps.wakeUpDpCode], false).then()
+    }
+  }
+  return [checkConflict, resolveConfict]
 }

package/src/modules/flags/FlagActions.ts

@@ -9,6 +9,7 @@ import { useMemo, useState } from "react";
 import { useUpdateEffect } from "ahooks";
 import { NativeApi } from "@ledvance/base/src/api/native";
 import { stripDp2Obj } from "@ledvance/ui-biz-bundle/src/modules/scene/SceneAction";
+import { cloneDeep } from "lodash";
 
 export interface ExtraParams extends FlagPageProps, FlagOption {
 }
@@ -71,7 +72,9 @@ export const useFlag: UseFlagType = (flagCode, extra) => {
       }
       return setDps(extraDps)
     } else {
-      const hex = obj2Dp(flagItem, extra)
+      const cloneFlagItem = cloneDeep(flagItem)
+      cloneFlagItem.colors = cloneFlagItem.colors.reverse()
+      const hex = obj2Dp(cloneFlagItem, extra)
       const newHex = extra.isSolarLight ? ('01'+hex.substring(2)) : hex
       return setDps({ [flagCode]: newHex, [extra.workModeCode]: WORK_MODE.SCENE, [extra.switchLedCode]: true })
     }

package/src/modules/flags/FlagPage.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useMemo } from "react";
 import Page from "@ledvance/base/src/components/Page";
-import { useDeviceId, useDeviceInfo, useFlagMode, useFlags, useMoods } from "@ledvance/base/src/models/modules/NativePropsSlice";
+import { useDeviceId, useDeviceInfo, useFlagMode, useFlags } from "@ledvance/base/src/models/modules/NativePropsSlice";
 import { FlatList, Image, TouchableOpacity, View } from "react-native";
 import Spacer from "@ledvance/base/src/components/Spacer";
 import { Utils } from "tuya-panel-kit";
@@ -22,8 +22,6 @@ import TextField from "@ledvance/base/src/components/TextField";
 import { showDialog } from "@ledvance/base/src/utils/common";
 import { defFlagHash, fnv1aHash } from "./FlagHash";
 import { NativeApi } from "@ledvance/base/src/api/native";
-import { useSceneStatusId } from "@ledvance/ui-biz-bundle/src/newModules/mood/MoodActions";
-import { SceneStatusType } from "@ledvance/base/src/utils/interface";
 import ThemeType from '@ledvance/base/src/config/themeType'
 
 const cx = Utils.RatioUtils.convertX
@@ -61,7 +59,6 @@ const FlagPage = (props: { theme?: ThemeType }) => {
   const devId = useDeviceId()
   const navigation = useNavigation()
   const [dps, setDps] = useDps()
-  const [moods, setMoods] = useMoods()
   const [flags, setFlags] = useFlags()
   const [flagMode, setFlagMode] = useFlagMode()
   const [flagState, setFlag] = useFlag(((params.isStripLight || params.isCeilingLight) ? params?.drawToolLight?.drawToolCode : params.sceneDataCode)!!, {
@@ -70,14 +67,10 @@ const FlagPage = (props: { theme?: ThemeType }) => {
     isCeilingLight: params.isCeilingLight,
     ...params
   })
-  const [sceneStatusId, setSceneStatusId] = useSceneStatusId({
-    isSupportSceneStatus: params.isSupportSceneStatus,
-    sceneStatusType: SceneStatusType.Flag
-  });
   const state = useReactive({
     loading: false,
     flags: cloneDeep(flags) as FlagUiInfo[],
-    moods: params.isStripLight ? [] : cloneDeep(moods),
+    filterFlags: cloneDeep(flags) as FlagUiInfo[],
     searchText: ''
   })
   const flagId = useMemo(() => {
@@ -97,30 +90,12 @@ const FlagPage = (props: { theme?: ThemeType }) => {
 
   useEffect(() => {
     if (!devInfo.devId) return
-    if (!flags?.length) {
-      getRemoteFlagInfo().then()
-    }
-    if (params.getRemoteMoodList && !moods?.length) {
-      params.getRemoteMoodList(devInfo.devId).then(res => {
-        if (res.success && Array.isArray(res.data)) {
-          state.moods = res.data
-          setMoods(cloneDeep(res.data))
-        }
-      })
-    }
+    getRemoteFlagInfo().then()
   }, [devInfo.devId])
 
   useUpdateEffect(() => {
-    state.moods = params.isStripLight ? [] : cloneDeep(moods)
-  }, [JSON.stringify(moods)])
-
-  useUpdateEffect(() => {
-    state.flags = cloneDeep(flags)
-  }, [JSON.stringify(flags)])
-
-  useUpdateEffect(() => {
-    state.flags = state.searchText !== '' ? cloneDeep(flags).filter(flag => (flag.name ?? '').toLowerCase().includes(state.searchText.toLowerCase())) : cloneDeep(flags)
-  }, [state.searchText, flags])
+    state.filterFlags = state.searchText !== '' ? cloneDeep(state.flags).filter(flag => (flag.name ?? '').toLowerCase().includes(state.searchText.toLowerCase())) : cloneDeep(state.flags)
+  }, [state.searchText, state.flags])
 
   const getRemoteFlagInfo = async (isRefresh?: boolean) => {
     const res = await getRemoteFlag(devInfo.devId, isRefresh)
@@ -169,13 +144,12 @@ const FlagPage = (props: { theme?: ThemeType }) => {
       setFlags(cloneDeep(newScene))
       state.flags = cloneDeep(newScene)
       if (mood) {
-        if (mode === 'del' && (!flagMode?.flagMode || currentMood.id !== flagId || !dps[params.switchLedCode])) {
+        if (mode === 'del' && (!flagMode?.flagMode || (params.isSolarLight ? (flagMode?.flagId !== currentMood.id) : currentMood.id !== flagId) || !dps[params.switchLedCode])) {
           return {
             success: true
           }
         }
         updateFlagMode(true, mood)
-        setSceneStatusId(mood.id).then()
         return setFlag(mood)
       } else {
         updateFlagMode(false)
@@ -199,12 +173,10 @@ const FlagPage = (props: { theme?: ThemeType }) => {
   }
 
   const getItemEnable = useCallback((flagItem: FlagUiInfo) =>{
-    if (params.isSupportSceneStatus && sceneStatusId !== -1){
-      return flagMode?.flagMode && sceneStatusId === flagItem.id && dps[params.workModeCode] === WORK_MODE.SCENE && dps[params.switchLedCode]
-    }else{
-      return flagMode?.flagMode && dps[params.workModeCode] === (params.isCeilingLight ? WORK_MODE.WHITE : params.isStripLight ? WORK_MODE.COLOUR : WORK_MODE.SCENE) && flagId === flagItem.id && dps[params.switchLedCode]
-    }
-  }, [params.isSupportSceneStatus, sceneStatusId, dps[params.workModeCode], dps[params.switchLedCode], flagId, flagMode?.flagMode])
+    const workMode = params.isCeilingLight ? WORK_MODE.WHITE : params.isStripLight ? WORK_MODE.COLOUR : WORK_MODE.SCENE
+    const idEnable = params.isSolarLight ? (flagMode?.flagId === flagItem.id) : (flagId === flagItem.id)
+    return flagMode?.flagMode && dps[params.workModeCode] === workMode && idEnable && dps[params.switchLedCode]
+  }, [dps[params.workModeCode], dps[params.switchLedCode], flagId, JSON.stringify(flagMode)])
 
   return (
     <Page
@@ -214,8 +186,7 @@ const FlagPage = (props: { theme?: ThemeType }) => {
       loading={state.loading}
       onHeadlineIconClick={() => {
         const useIds = map([
-          ...state.flags,
-          ...state.moods
+          ...state.flags
         ], 'id')
         const idRange = range(0, 256)
         const unuseId = last(difference(idRange, useIds))
@@ -252,7 +223,7 @@ const FlagPage = (props: { theme?: ThemeType }) => {
         </TouchableOpacity>
       </View>
       <FlatList
-        data={state.flags}
+        data={state.filterFlags}
         renderItem={({ item }) => <FlagItem
           enable={getItemEnable(item)}
           title={item.name}
@@ -262,7 +233,6 @@ const FlagPage = (props: { theme?: ThemeType }) => {
             if (enable) {
               state.loading = true
               await setFlag(item)
-              await setSceneStatusId(item.id)
               const flagHash = fnv1aHash(JSON.stringify(item.colors))
               if (defFlagHash[flagHash]) {
                 NativeApi.putFlagFirebase({

package/src/modules/music/MusicPage.tsx

@@ -2,7 +2,7 @@ import React, { useCallback, useEffect } from 'react'
 import { StyleSheet, View, Text, Image } from 'react-native'
 import { useRoute, useNavigation } from '@react-navigation/core'
 import Page from '@ledvance/base/src/components/Page'
-import { useDeviceId, useDeviceInfo } from '@ledvance/base/src/models/modules/NativePropsSlice'
+import { useDeviceId, useDeviceInfo, useDps } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import Strings from '@ledvance/base/src/i18n'
 import Img from './res'
 import { useEnable, useWorkMode, useMixRgbcw, useMixScene, useMusicData, useDreamMusic, DreamLightMicMusicData, getRemoteDreamMusic, DreamLightMicMusicUIState, saveRemoteDreamMusic } from './MusicPageActions'
@@ -17,7 +17,7 @@ import LdvSlider from '@ledvance/base/src/components/ldvSlider'
 import TextFieldStyleButton from '@ledvance/base/src/components/TextFieldStyleButton'
 import { SelectPageParams } from '../select/SelectPage'
 import { ui_biz_routerKey } from '../../navigation/Routers'
-import { cloneDeep } from 'lodash'
+import { cloneDeep, isEmpty } from 'lodash'
 import ThemeType from '@ledvance/base/src/config/themeType'
 import { WorkMode } from '@ledvance/base/src/utils/interface'
 
@@ -45,6 +45,7 @@ const MusicPage = (props: { theme?: ThemeType }) => {
   const [, setMusicData] = useMusicData(params.music_data)
   const [dreamMusic, setDreamMusic] = params.dreamMusicDp ? useDreamMusic(params.dreamMusicDp) : []
   const [switchLed, setSwitchLed] = useEnable(params.switch_led)
+  const [, setDps] = useDps()
 
   const state = useReactive({
     musicEnable: false,
@@ -112,8 +113,12 @@ const MusicPage = (props: { theme?: ThemeType }) => {
         power: true
       }, extraDp).then()
     } else {
-      if (workMode !== 'music') await setWorkMode(WorkMode.Music)
-      if (!switchLed) setSwitchLed(true)
+      const dps = {}
+      if (workMode !== 'music') dps[params.work_mode] = WorkMode.Music
+      if (!switchLed) dps[params.switch_led] = true 
+      if (!isEmpty(dps)){
+        await setDps(dps)
+      }
       await MusicManager.open(
         musicDefalutDatasource[state.phoneGenreMode],
         () => { },
@@ -184,11 +189,12 @@ const MusicPage = (props: { theme?: ThemeType }) => {
   }
 
   const getSelect = async () => {
+    state.musicEnable = workMode === 'music' && !!switchLed
+    if (!state.musicEnable) return 
     const res: any = await NativeApi.getJson(deviceId, 'musicSelect')
     const type = res?.data ? (JSON.parse(res?.data)?.type || 0) : 0
     state.musicType = res?.data ? JSON.parse(res?.data)?.musicType : params.dreamMusicDp ? 0 : 1
     state.phoneGenreMode = musicDefalutDatasource[type]?.id
-    state.musicEnable = workMode === 'music' && !!switchLed
     if (type !== '' && state.musicType === 1 && state.musicEnable) {
       openMusic()
     }
@@ -216,7 +222,7 @@ const MusicPage = (props: { theme?: ThemeType }) => {
 
   useEffect(() => {
     getSelect().then()
-  }, [workMode])
+  }, [workMode, switchLed])
 
   const getSelectModeData = useCallback((): [string | undefined, any[]] => {
     const genreModeData = params.dreamMusicDp && state.musicType === 0 ? state.musicModeData : musicDefalutDatasource
@@ -270,8 +276,8 @@ const MusicPage = (props: { theme?: ThemeType }) => {
                 confirmText: Strings.getLang('cancel_dialog_delete_item_sleepschedule_answer_yes_text'),
                 onConfirm: async (_, { close }) => {
                   close()
-                  state.musicEnable = v
                   await openMusic()
+                  state.musicEnable = v
                 },
               })
             } else {

package/src/modules/timer/TimerPage.tsx

@@ -65,7 +65,10 @@ const TimerPage = (props: {theme?: ThemeType}) => {
 
   useEffect(() => {
     if (progress.length > 1) {
-      state.skillList = progress.filter(p => p.progressHook.countdown === 0)
+      const runSkill = progress.filter(p => p.progressHook.countdown > 0)
+      const skill = progress.filter(p => p.progressHook.countdown === 0)
+      state.selectedSkill = state.selectedSkill.filter(item => runSkill.find(r => r.dpId !== item.dpId))
+      state.skillList = skill.filter(item => !state.selectedSkill.find(s => s.dpId === item.dpId))
     } else {
       state.skillList = []
       state.selectedSkill = cloneDeep(dps)

package/src/newModules/biorhythm/BiorhythmBean.ts

@@ -91,7 +91,7 @@ export function getDefBiorhythmUIState(): BiorhythmBean {
       {
         index: 1,
         icon: icon12,
-        time: 420,
+        time: 390,
         name: I18n.getLang('bio_ryhthm_default_field_text2'),
         colorTemperature: 25,
         brightness: 20,

package/src/newModules/biorhythm/BiorhythmPage.tsx

@@ -9,7 +9,7 @@ import {
   getDefBiorhythmUIState,
   Plan,
 } from './BiorhythmBean'
-import { Modal, Utils } from 'tuya-panel-kit'
+import { Dialog, Modal, Utils } from 'tuya-panel-kit'
 import { cloneDeep, sortBy } from 'lodash'
 import iconList from './iconListData'
 import pIdList from './pIdList'
@@ -33,6 +33,7 @@ import Spacer from '@ledvance/base/src/components/Spacer'
 import DeleteButton from '@ledvance/base/src/components/DeleteButton'
 import { useParams } from '@ledvance/base/src/hooks/Hooks'
 import ThemeType from '@ledvance/base/src/config/themeType'
+import { useConflictTask } from 'hooks/DeviceDpStateHooks'
 
 const cx = Utils.RatioUtils.convertX
 const { withTheme } = Utils.ThemeUtils
@@ -67,9 +68,8 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
   const { productId } = deviceInfo
   const is24Hour = useSystemTimeFormate()
   const devicesJudge = pIdList.some(val => val === productId)
-  // const [sleepList, setSleepList] = useSleepPlan({ sleep_mode: params.sleepPlanDp })
-  // const [wakeUpList, setWakeUpList] = useWakeUpPlan({ wakeup_mode: params.wakeUpPlanDp })
-  // const sleepWakeUpStatus = [...sleepList, ...wakeUpList].some(ele => ele.enable)
+  const [checkConflict, resolveConflict] = useConflictTask(params.conflictDps)
+
   const state = useReactive<UIState>({
     ...biorhythm,
     showGradientTypeSelectModal: false,
@@ -269,6 +269,29 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
           thumbColor={props.theme?.icon.primary}
           trackColor={{ false: '#00000026', true: '#ff660036' }}
           onValueChange={async enable => {
+            const biorhythmTask = {
+              startTime: 0,
+              endTime: 1440,
+              weeks: biorhythm.repeatPeriod.map(item => item.enabled ? 1 : 0),
+              enable: biorhythm.enable
+            }
+            if (enable && checkConflict(biorhythmTask)) {
+              return showCommonDialog({
+                method: 'confirm',
+                title: I18n.getLang('conflict_dialog_active_item_bio_rhythm_titel'),
+                subTitle: I18n.getLang('conflict_dialog_active_item_bio_rhythm_description'),
+                onConfirm: (_, { close }) => {
+                  resolveConflict()
+                  close()
+                  state.loading = true
+                  state.enable = enable
+                  requestSetBiorhythm(false)
+                },
+                onCancel: () => {
+                  Dialog.close()
+                }
+              })
+            }
             state.loading = true
             state.enable = enable
             requestSetBiorhythm(false)

package/src/newModules/energyConsumption/component/DateTypeItem.tsx

@@ -91,6 +91,7 @@ export default withTheme(function DateTypeItem(props: DateTypeItemProps) {
                 state.showDateTypeModal = false;
             }}
             title={I18n.getLang('date_type')}
+            titleTextStyle={{fontWeight: 'bold', fontSize: cx(16)}}
             cancelText={I18n.getLang('auto_scan_system_cancel')}
             confirmText={I18n.getLang('auto_scan_system_wifi_confirm')}
             onConfirm={(item: DateType) => {

package/src/newModules/fixedTime/FixedTimeActions.ts

@@ -53,7 +53,7 @@ export interface PlugFixedTimer {
   closeTime: number;
 }
 let fixedTimer
-type UseFixedTimeType = (dpKey: string, isPlug?: boolean, disableFeature?: boolean) => [FixedTimerUiItem[], (fixedTimeList: FixedTimerUiItem[], manualEdit?: boolean) => Promise<{ success: boolean }>]
+type UseFixedTimeType = (dpKey: string, isPlug?: boolean, disableFeature?: boolean) => [FixedTimerUiItem[], (fixedTimeList: FixedTimerUiItem[], pushFeature?: boolean) => Promise<{ success: boolean }>]
 
 export const useFixedTime: UseFixedTimeType = (dpKey, isPlug, disableFeature) => {
   const deviceId = useDeviceId()
@@ -107,7 +107,7 @@ export const useFixedTime: UseFixedTimeType = (dpKey, isPlug, disableFeature) =>
   }, [fixedTimeDp])
 
 
-  const setFixedTimeFn = async (fixedTimeList: FixedTimerUiItem[]) => {
+  const setFixedTimeFn = async (fixedTimeList: FixedTimerUiItem[], pushFeature = true) => {
     const fixedData = fixedTimeList.map(item => {
       const fixedHex = fixedTimeToHex(item, isPlug)
       return {
@@ -115,7 +115,7 @@ export const useFixedTime: UseFixedTimeType = (dpKey, isPlug, disableFeature) =>
         v: isPlug ? JSON.stringify({dp: fixedHex}) : fixedHex
       }
     })
-    const cloudStatus = await putFeatureFn(deviceId, isPlug ? plug_fixedFeatureId : fixedFeatureId, JSON.stringify(fixedData))
+    const cloudStatus = pushFeature ? await putFeatureFn(deviceId, isPlug ? plug_fixedFeatureId : fixedFeatureId, JSON.stringify(fixedData)) : !pushFeature
     if (cloudStatus) {
       const fixedTimerData = {
         version: 0,

package/src/newModules/fixedTime/FixedTimePage.tsx

@@ -9,10 +9,10 @@ import { ui_biz_routerKey } from "../../navigation/Routers";
 import { useReactive, useUpdateEffect } from "ahooks";
 import Spacer from "@ledvance/base/src/components/Spacer";
 import TextButton from '@ledvance/base/src/components/TextButton'
-import { SwitchButton, Utils } from "tuya-panel-kit";
+import { Dialog, SwitchButton, Utils } from "tuya-panel-kit";
 import { FixedTimerUiItem, useFixedTime } from "./FixedTimeActions";
 import Card from "@ledvance/base/src/components/Card";
-import { convertMinutesTo12HourFormat, loopText } from "@ledvance/base/src/utils/common";
+import { convertMinutesTo12HourFormat, loopText, isConflictTask, showDialog } from "@ledvance/base/src/utils/common";
 import { cloneDeep } from "lodash";
 import dayjs from "dayjs";
 import { ApplyForItem } from "@ledvance/base/src/utils/interface";
@@ -20,6 +20,7 @@ import { useParams } from "@ledvance/base/src/hooks/Hooks";
 import Tag from "@ledvance/base/src/components/Tag";
 import InfoText from "@ledvance/base/src/components/InfoText";
 import ThemeType from '@ledvance/base/src/config/themeType'
+import { useConflictTask } from "hooks/DeviceDpStateHooks";
 
 const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
@@ -47,6 +48,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 state = useReactive({
     loading: false,
     originList: cloneDeep(fixedTime),
@@ -79,7 +81,7 @@ const FixedTimePage = (props: { theme?: ThemeType }) => {
     return state.originList.length >= MAX_NUM
   }, [state.originList.length])
 
-  const onPost = useCallback(async (mode: 'add' | 'edit' | 'del', fixedTime: FixedTimerUiItem) => {
+  const onPost = async (mode: 'add' | 'edit' | 'del', fixedTime: FixedTimerUiItem) => {
     const cloneFixedTimeList = cloneDeep(state.originList)
     const idx = state.originList.findIndex(f => f.index === fixedTime.index)
     if (mode === 'edit') {
@@ -87,12 +89,48 @@ const FixedTimePage = (props: { theme?: ThemeType }) => {
     }
     if (mode === 'del') cloneFixedTimeList.splice(idx, 1)
     const newFixedTimeList = mode === 'add' ? [...state.originList, fixedTime] : cloneFixedTimeList
+    if ((mode === 'edit' && fixedTime.enable) || mode === 'add'){
+      const cloneList = cloneDeep(newFixedTimeList)
+      let itselfConflict = false 
+      cloneList.forEach((item, idx) => {
+        const itself = mode === 'add' ? (idx === cloneList.length - 1) : fixedTime.index === item.index
+        if (!itself && item.enable && isConflictTask(item, fixedTime)){
+          itselfConflict = true 
+          item.enable = false 
+        }
+      })
+      const isConflict = checkConflict(fixedTime) || itselfConflict
+      if (isConflict){
+        return new Promise((resolve) => {
+          showDialog({
+            method: 'confirm',
+            title: I18n.getLang('conflict_dialog_active_item_fixedtimecycle_titel'),
+            subTitle: I18n.getLang('conflict_dialog_active_item_fixedtimecycle_description'),
+            onConfirm: async (_, { close }) => {
+              close()
+              resolveConflict()
+              const res = await setFixedTime(cloneList)
+              if (res.success){
+                state.originList = cloneDeep(cloneList)
+              }
+              resolve(res)
+            },
+            onCancel: () => {
+              resolve({
+                success: false 
+              })
+              Dialog.close()
+            }
+          })
+        })
+      }
+    }
     const res = await setFixedTime(newFixedTimeList)
     if (res.success) {
       state.originList = cloneDeep(newFixedTimeList)
     }
     return res
-  }, [state.originList])
+  }
 
 
   const styles = StyleSheet.create({
@@ -207,6 +245,19 @@ const FixedTimePage = (props: { theme?: ThemeType }) => {
                 onPress={() => {
                   navigateToEdit('edit', item)
                 }}
+                onLongPress={() =>{
+                  showDialog({
+                    method: 'confirm',
+                    title: I18n.getLang('cancel_dialog_delete_item_fixedtimecycle_titel'),
+                    subTitle: I18n.getLang('cancel_dialog_delete_item_fixedtimecycle_description'),
+                    onConfirm: async (_, { close }) => {
+                      close()
+                      state.loading = true
+                      await onPost('del', item)
+                      state.loading = false
+                    }
+                  })
+                }}
               />
             )}
             keyExtractor={(item: any) => `${item?.index}`}
@@ -253,11 +304,12 @@ const FixedTimeCard = memo((props: {
   showTags?: boolean,
   onSwitch: (enable: boolean) => void,
   onPress: () => void
+  onLongPress?: () => void
   styles: StyleSheet.NamedStyles<any>
 }) => {
-  const { is24Hour, fixedTime, tags, showTags, onSwitch, onPress, styles } = props
+  const { is24Hour, fixedTime, tags, showTags, onSwitch, onPress, onLongPress, styles } = props
   return (
-    <Card style={styles.randomTimingCard} onPress={onPress}>
+    <Card style={styles.randomTimingCard} onPress={onPress} onLongPress={onLongPress}>
       <Spacer height={cx(16)} />
       <View style={styles.switchLine}>
         <Text style={styles.time}>

package/src/newModules/mood/MoodActions.ts

@@ -201,7 +201,10 @@ export const useMoodScene = (params: MoodPageParams): [MoodInfo, (moodInfo: Mood
       }
       mainLamp[params.switchLedDp] = true
     }
-    return setDps(mainDps)
+    return setDps({
+      ...mainDps,
+      version: params.isStripLight ? 1 : 0
+    })
   };
   return [moodState, setMoodFn];
 };

package/src/newModules/mood/MoodItem.tsx

@@ -119,8 +119,9 @@ export default withTheme(MoodItem)
 export function MixMoodColorsLine(props: { mixSubLight: MoodLampInfo; isMix: boolean, type: 'gradient' | 'separate' }) {
   const { mixSubLight, isMix } = props;
   const lightColors = !!(mixSubLight.enable && mixSubLight.nodes.length) ? mixSubLight.nodes?.map(n => {
+    const s = Math.round(mapFloatToRange(n.s / 100, 30, 100));
     return n.isColorNode
-      ? hsv2Hex(n.h, Math.round(n.s), Math.round(mapFloatToRange(n.v / 100, 50, 100)))
+      ? hsv2Hex(n.h, s, Math.round(mapFloatToRange(n.v / 100, 50, 100)))
       : cctToColor(n.colorTemp.toFixed());
   }) : ['#eee'];
 

package/src/newModules/mood/MoodPage.tsx

@@ -43,8 +43,9 @@ const MoodPage = (props: { theme?: ThemeType }) => {
   const [moodInfo, setMoodInfo] = useMoodScene(params);
   const [moods, setMoods] = useMoods();
   const [mainWork, setMainWork] = useWorkMode(params.mainWorkMode);
-  const [secondaryWork, setSecondaryWork] = useWorkMode(params.secondaryWorkMode!);
+  const [secondaryWork] = useWorkMode(params.secondaryWorkMode!);
   const [switchLed] = useSwitchLed(params.switchLedDp)
+  const [, setSecondarySwitch] = useSwitchLed(params.secondarySwitch!)
   const [flagMode, setFlagMode] = useFlagMode();
   const [sceneStatusId, setSceneStatusId] = useSceneStatusId({
     isSupportSceneStatus: params.isSupportSceneStatus,
@@ -87,6 +88,7 @@ const MoodPage = (props: { theme?: ThemeType }) => {
     state.loading = false
     if (res.success && Array.isArray(res.data)) {
       state.originMoods = cloneDeep(res.data);
+      setMoods(cloneDeep(res.data));
     }
   }
 
@@ -230,8 +232,8 @@ const MoodPage = (props: { theme?: ThemeType }) => {
             setMainWork(work).then();
           }
         }
-        if (params.isCeilingLight && params.secondaryWorkMode && secondaryWork === WorkMode.Scene) {
-          setSecondaryWork(WorkMode.Colour).then();
+        if (params.isCeilingLight && params.secondaryWorkMode) {
+          setSecondarySwitch(false)
         }
       }
       return {

package/src/newModules/randomTime/RandomTimeActions.ts

@@ -52,7 +52,7 @@ export interface PlugRandomTimerItem extends PlugRandomTimer {
 }
 
 let randomTimer
-type UseFixedTimeType = (dpKey: string, isPlug?: boolean, disableFeature?: boolean) => [RandomTimerUiItem[], (randomTimeList: RandomTimerUiItem[], manualEdit?: boolean) => Promise<{ success: boolean }>]
+type UseFixedTimeType = (dpKey: string, isPlug?: boolean, disableFeature?: boolean) => [RandomTimerUiItem[], (randomTimeList: RandomTimerUiItem[], pushFeature?: boolean) => Promise<{ success: boolean }>]
 
 export const useRandomTime: UseFixedTimeType = (dpKey: string, isPlug?: boolean, disableFeature?: boolean) => {
   const deviceId = useDeviceId()
@@ -107,7 +107,7 @@ export const useRandomTime: UseFixedTimeType = (dpKey: string, isPlug?: boolean,
     return () => clearTimeout(randomTimer)
   }, [randomTimeDp])
 
-  const setRandomTimeFn = async (randomTimeList: RandomTimerUiItem[]) => {
+  const setRandomTimeFn = async (randomTimeList: RandomTimerUiItem[], pushFeature = true) => {
     const randomData = randomTimeList.map(item => {
       const randomHex = randomTimeToHex(item, isPlug)
       return {
@@ -115,7 +115,7 @@ export const useRandomTime: UseFixedTimeType = (dpKey: string, isPlug?: boolean,
         v: isPlug ? JSON.stringify({dp: randomHex}) : randomHex
       }
     })
-    const cloudStatus = await putFeatureFn(deviceId, isPlug ? plug_randomFeatureId : randomFeatureId, JSON.stringify(randomData))
+    const cloudStatus = pushFeature ? await putFeatureFn(deviceId, isPlug ? plug_randomFeatureId : randomFeatureId, JSON.stringify(randomData)) : !pushFeature
     if (cloudStatus) {
       const randomTimerData = {
         version: 0,

package/src/newModules/randomTime/RandomTimePage.tsx

@@ -9,10 +9,10 @@ import { ui_biz_routerKey } from '../../navigation/Routers'
 import { useReactive, useUpdateEffect } from 'ahooks'
 import Spacer from '@ledvance/base/src/components/Spacer'
 import TextButton from '@ledvance/base/src/components/TextButton'
-import { SwitchButton, Utils } from 'tuya-panel-kit'
+import { Dialog, SwitchButton, Utils } from 'tuya-panel-kit'
 import { RandomTimerUiItem, useRandomTime } from './RandomTimeActions'
 import Card from '@ledvance/base/src/components/Card'
-import { convertMinutesTo12HourFormat, loopText } from '@ledvance/base/src/utils/common'
+import { convertMinutesTo12HourFormat, loopText, isConflictTask, showDialog } from '@ledvance/base/src/utils/common'
 import { cloneDeep } from 'lodash'
 import dayjs from 'dayjs'
 import { ApplyForItem } from '@ledvance/base/src/utils/interface'
@@ -20,6 +20,7 @@ import { useParams } from '@ledvance/base/src/hooks/Hooks'
 import Tag from '@ledvance/base/src/components/Tag'
 import InfoText from '@ledvance/base/src/components/InfoText'
 import ThemeType from '@ledvance/base/src/config/themeType'
+import { useConflictTask } from 'hooks/DeviceDpStateHooks'
 
 const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
@@ -48,6 +49,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 state = useReactive({
     loading: false,
     originList: cloneDeep(randomTime),
@@ -80,7 +82,7 @@ const RandomTimePage = (props: { theme?: ThemeType }) => {
     return state.originList.length >= MAX_NUM
   }, [state.originList.length])
 
-  const onPost = useCallback(async (mode: 'add' | 'edit' | 'del', randomTime: RandomTimerUiItem) => {
+  const onPost = async (mode: 'add' | 'edit' | 'del', randomTime: RandomTimerUiItem) => {
     const cloneRandomTime = cloneDeep(state.originList)
     const idx = state.originList.findIndex(f => f.index === randomTime.index)
     if (mode === 'edit') {
@@ -88,12 +90,49 @@ const RandomTimePage = (props: { theme?: ThemeType }) => {
     }
     if (mode === 'del') cloneRandomTime.splice(idx, 1)
     const newRandomTimeList = mode === 'add' ? [...state.originList, randomTime] : cloneRandomTime
+    if ((mode === 'edit' && randomTime.enable) || mode === 'add') {
+      const cloneList = cloneDeep(newRandomTimeList)
+      let itselfConflict = false 
+      cloneList.forEach((item, idx) => {
+        const itself = mode === 'add' ? (idx === cloneList.length - 1) : randomTime.index === item.index
+        if (!itself && item.enable && isConflictTask(item, randomTime)){
+          itselfConflict = true 
+          item.enable = false 
+        }
+      })
+      const isConflict = checkConflict(randomTime) || itselfConflict
+      if (isConflict) {
+        return new Promise((resolve) => {
+          showDialog({
+            method: 'confirm',
+            title: I18n.getLang('conflict_dialog_active_item_randomtimecycle_titel'),
+            subTitle: I18n.getLang('conflict_dialog_active_item_randomtimecycle_description'),
+            onConfirm: async (_, { close }) => {
+              close()
+              resolveConflict()
+              const res = await setRandomTime(cloneList)
+              if (res.success) {
+                state.originList = cloneDeep(cloneList)
+              }
+              resolve(res)
+            },
+            onCancel: () => {
+              resolve({
+                success: false
+              })
+              Dialog.close()
+            }
+          })
+        })
+      }
+    }
+
     const res = await setRandomTime(newRandomTimeList)
-    if(res.success){
+    if (res.success) {
       state.originList = cloneDeep(newRandomTimeList)
     }
     return res
-  }, [state.originList])
+  }
 
 
   const styles = StyleSheet.create({
@@ -208,6 +247,19 @@ const RandomTimePage = (props: { theme?: ThemeType }) => {
                 onPress={() => {
                   navigateToEdit('edit', item)
                 }}
+                onLongPress={() =>{
+                  showDialog({
+                    method: 'confirm',
+                    title: I18n.getLang('cancel_dialog_delete_item_randomtimecycle_titel'),
+                    subTitle: I18n.getLang('cancel_dialog_delete_item_fixedtimecycle_description'),
+                    onConfirm: async (_, { close }) => {
+                      close()
+                      state.loading = true
+                      await onPost('del', item)
+                      state.loading = false
+                    }
+                  })
+                }}
               />
             )}
             keyExtractor={(item: any) => `${item?.index}`}
@@ -254,10 +306,11 @@ const RandomTimeCard = (props: {
   showTags?: boolean,
   onSwitch: (enable: boolean) => void,
   onPress: () => void
+  onLongPress?: () => void
 }) => {
-  const { is24Hour, randomTime, tags, showTags, onSwitch, onPress, styles } = props
+  const { is24Hour, randomTime, tags, showTags, onSwitch, onPress, onLongPress, styles } = props
   return (
-    <Card style={styles.randomTimingCard} onPress={onPress}>
+    <Card style={styles.randomTimingCard} onPress={onPress} onLongPress={onLongPress}>
       <Spacer height={cx(16)} />
       <View style={styles.switchLine}>
         <Text style={styles.time}>

package/src/newModules/sleepWakeUp/SleepWakeUpActions.ts

@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react'
 import { useDp, useDeviceId } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import { getFeature, putFeature } from '@ledvance/base/src/api/native'
 import { hex2Int, spliceByStep } from '@ledvance/base/src/utils/common'
-import { SleepData, SleepItem, SleepUIData, SleepUIItem, WakeUpData, WakeUpItem, WakeUpUIData, WakeUpUIItem } from './Interface'
+import { SleepData, SleepItem, SleepUIItem, WakeUpData, WakeUpItem, WakeUpUIItem } from './Interface'
 import { cloneDeep, padStart } from 'lodash'
 import { parseJSON, to16 } from '@tuya/tuya-panel-lamp-sdk/lib/utils'
 import { Result } from '@ledvance/base/src/models/modules/Result'
@@ -38,7 +38,7 @@ const putFeatureFn = async (devId, featureId, data) => {
   return status
 }
 let wakeUpTimerId: number | undefined = undefined
-type WakeUpType = (wakeUpDp: string, disableFeature?: boolean) => [WakeUpUIItem[], (wakeUpData: WakeUpUIData) => Promise<Result<any>>, boolean]
+type WakeUpType = (wakeUpDp: string, disableFeature?: boolean) => [WakeUpUIItem[], (wakeUpData: WakeUpUIItem[], pushFeature?: boolean) => Promise<Result<any>>, boolean]
 // @ts-ignore
 export const useWakeUp: WakeUpType = (wakeUpDp, disableFeature) => {
   const devId = useDeviceId()
@@ -77,8 +77,8 @@ export const useWakeUp: WakeUpType = (wakeUpDp, disableFeature) => {
     }
   }, [wakeUp])
 
-  const setWakeUpFn = async (wakeUp: WakeUpUIData) => {
-    const featureData = wakeUp?.nodes.map(item => {
+  const setWakeUpFn = async (wakeUp: WakeUpUIItem[], pushFeature = true) => {
+    const featureData = wakeUp.map(item => {
       return {
         name: item.name,
         startTime: JSON.stringify({
@@ -86,9 +86,14 @@ export const useWakeUp: WakeUpType = (wakeUpDp, disableFeature) => {
         })
       }
     })
-    const res = await putFeature(devId, wakeUpPlanFeatureId, featureData || [])
+    const res = pushFeature ? await putFeature(devId, wakeUpPlanFeatureId, featureData || []) : {result: true}
+    const wakeUpData = {
+      version: 0,
+      num: wakeUp.length,
+      nodes: cloneDeep(wakeUp)
+    }
     if (res.result) {
-      setWakeUp(wakeUpObj2Dp(wakeUp)).then()
+      setWakeUp(wakeUpObj2Dp(wakeUpData)).then()
       return {
         success: true
       }
@@ -192,7 +197,7 @@ export const wakeUpNode2Dp = (node: WakeUpItem) =>{
 }
 
 let sleepTimerId: number | undefined = undefined
-type SleepModeType = (sleepDp: string, disableFeature?: boolean) => [SleepUIItem[], (sleepData: SleepUIData) => Promise<Result<any>>, boolean]
+type SleepModeType = (sleepDp: string, disableFeature?: boolean) => [SleepUIItem[], (sleepData: SleepUIItem[], pushFeature?: boolean) => Promise<Result<any>>, boolean]
 // @ts-ignore
 export const useSleepMode: SleepModeType = (sleepDp, disableFeature) => {
   const devId = useDeviceId()
@@ -231,8 +236,8 @@ export const useSleepMode: SleepModeType = (sleepDp, disableFeature) => {
     }
   }, [sleepMode])
 
-  const setSleepPlanFn = async (sleep: SleepUIData) => {
-    const featureData = sleep?.nodes.map(item => {
+  const setSleepPlanFn = async (sleep: SleepUIItem[], pushFeature = true) => {
+    const featureData = sleep.map(item => {
       return {
         name: item.name,
         startTime: JSON.stringify({
@@ -240,9 +245,14 @@ export const useSleepMode: SleepModeType = (sleepDp, disableFeature) => {
         })
       }
     })
-    const res = await putFeature(devId, sleepPlanFeatureId, featureData || [])
+    const res = pushFeature ? await putFeature(devId, sleepPlanFeatureId, featureData || []) : {result: true}
+    const sleepData = {
+      version: 0,
+      num: sleep.length,
+      nodes: cloneDeep(sleep)
+    }
     if (res.result) {
-      setSleepMode(sleepObj2Dp(sleep)).then()
+      setSleepMode(sleepObj2Dp(sleepData)).then()
       return {
         success: true
       }

package/src/newModules/sleepWakeUp/SleepWakeUpPage.tsx

@@ -9,8 +9,8 @@ import res from '@ledvance/base/src/res'
 import { useDeviceInfo, useSystemTimeFormate } from "@ledvance/base/src/models/modules/NativePropsSlice";
 import { useReactive, useUpdateEffect } from "ahooks";
 import CustomListDialog from "@ledvance/base/src/components/CustomListDialog";
-import { SwitchButton, Utils } from "tuya-panel-kit";
-import { convertMinutesTo12HourFormat, loopText } from "@ledvance/base/src/utils/common";
+import { Dialog, SwitchButton, Utils } from "tuya-panel-kit";
+import { convertMinutesTo12HourFormat, loopText, isConflictTask, showDialog } from "@ledvance/base/src/utils/common";
 import TextButton from "@ledvance/base/src/components/TextButton";
 import { ui_biz_routerKey } from '../../navigation/Routers'
 import { cloneDeep } from "lodash";
@@ -21,6 +21,8 @@ import { useParams } from "@ledvance/base/src/hooks/Hooks";
 import { ApplyForItem } from "../timeSchedule/Interface";
 import InfoText from "@ledvance/base/src/components/InfoText";
 import ThemeType from '@ledvance/base/src/config/themeType'
+import { useConflictTask } from "hooks/DeviceDpStateHooks";
+
 
 const cx = Utils.RatioUtils.convertX
 const { parseTimer } = Utils.TimeUtils
@@ -31,7 +33,7 @@ export interface SleepWakeUpPageRouteParams {
   isSupportTemperature?: boolean
   isSupportBrightness?: boolean
   isMixLight?: boolean
-  sleepModeDpCode: string
+  sleepDpCode: string
   wakeUpDpCode: string
   conflictDps: {
     randomTimeDpCode?: string
@@ -48,7 +50,8 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
   const is24HourClock = useSystemTimeFormate()
   const params = useParams<SleepWakeUpPageRouteParams>()
   const [wakeUpList, setWakeUpList, wakeupComplete] = useWakeUp(params.wakeUpDpCode)
-  const [sleepList, setSleepList, sleepComplete] = useSleepMode(params.sleepModeDpCode)
+  const [sleepList, setSleepList, sleepComplete] = useSleepMode(params.sleepDpCode)
+  const [checkConflict, resolveConflict] = useConflictTask(params.conflictDps)
   const state = useReactive({
     showAddSchedulePopover: false,
     sleepTagChecked: false,
@@ -65,12 +68,10 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
   }, [state.sleepScheduleList, state.wakeUpScheduleList])
 
   useUpdateEffect(() => {
-    console.log(sleepList, '< --- sleepList')
     state.sleepScheduleList = cloneDeep(sleepList)
   }, [JSON.stringify(sleepList)])
 
   useUpdateEffect(() => {
-    console.log(wakeUpList, '< --- wakeUpList')
     state.wakeUpScheduleList = cloneDeep(wakeUpList)
   }, [JSON.stringify(wakeUpList)])
 
@@ -114,12 +115,79 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
         return item
       })
     }
-    const def = {
-      version: 0,
-      num: cloneSleepWakeUp.length,
-      nodes: cloneDeep(cloneSleepWakeUp)
+    if ((mode === 'edit' && sleepWakeUp.enable) || mode === 'add') {
+      let sleepConflict = false
+      let wakeUpConflict = false  
+      const cloneSleepPlan = isSleep ? cloneSleepWakeUp : cloneDeep(sleepList)
+      const cloneWakeUpPlan = isSleep ? cloneDeep(wakeUpList) : cloneSleepWakeUp
+      const currentSleepWakeUp = {
+        ...sleepWakeUp, 
+        startTime: getStartTime(sleepWakeUp), 
+        endTime: getEndTime(sleepWakeUp)
+      }
+      const newSleepList = cloneSleepPlan.map((item, idx) => {
+        const itself = isSleep ? (mode === 'add' ? (idx === cloneSleepPlan.length - 1) : sleepWakeUp.id === item.id) : isSleep
+        if (!itself && item.enable && isConflictTask({
+          ...item,
+          startTime: getStartTime(item),
+          endTime: getEndTime(item)
+        }, currentSleepWakeUp)){
+          sleepConflict = true 
+          item.enable = false 
+          return item 
+        }
+        return item 
+      })
+      const newWakeUpList = cloneWakeUpPlan.map((item, idx) => {
+        const itself = !isSleep ? (mode === 'add' ? (idx === cloneWakeUpPlan.length - 1) : sleepWakeUp.id === item.id) : !isSleep
+        if (!itself && item.enable && isConflictTask({
+          ...item,
+          startTime: getStartTime(item),
+          endTime: getEndTime(item)
+        }, currentSleepWakeUp)){
+          wakeUpConflict = true 
+          item.enable = false 
+          return item 
+        }
+        return item 
+      })
+      const isConflict = checkConflict(currentSleepWakeUp) || sleepConflict || wakeUpConflict
+      if (isConflict) {
+        return new Promise((resolve) => {
+          showDialog({
+            method: 'confirm',
+            title: I18n.getLang(isSleep ? 'conflict_dialog_active_item_sleepschedule_titel' : 'conflict_dialog_active_item_wakeupschedule_titel'),
+            subTitle: I18n.getLang(isSleep ? 'conflict_dialog_active_item_sleepschedule_description' : 'conflict_dialog_active_item_wakeupschedule_description'),
+            onConfirm: async (_, { close }) => {
+              close()
+              resolveConflict()
+              const res = isSleep ? await setSleepList(newSleepList) : await setWakeUpList(newWakeUpList) 
+              if (isSleep) {
+                if (wakeUpConflict){
+                  setWakeUpList(newWakeUpList).then()
+                  state.wakeUpScheduleList = cloneDeep(newWakeUpList)
+                }
+                state.sleepScheduleList = cloneDeep(newSleepList)
+              } else {
+                if (sleepConflict){
+                  setSleepList(newSleepList).then()
+                  state.sleepScheduleList = cloneDeep(newSleepList)
+                }
+                state.wakeUpScheduleList = cloneDeep(newWakeUpList)
+              }
+              resolve(res)
+            },
+            onCancel: () => {
+              resolve({
+                success: false 
+              })
+              Dialog.close()
+            }
+          })
+        })
+      }
     }
-    const res = isSleep ? await setSleepList(def) : await setWakeUpList(def)
+    const res = isSleep ? await setSleepList(cloneSleepWakeUp) : await setWakeUpList(cloneSleepWakeUp)
     if (res.success) {
       if (isSleep) {
         state.sleepScheduleList = cloneDeep(cloneSleepWakeUp)
@@ -332,6 +400,32 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
                     enable: v ? 1 : 0
                   })
                 }}
+                onLongPress={() =>{
+                  showDialog({
+                    method: 'confirm',
+                    title: I18n.getLang(
+                      item.isSleep
+                        ? 'cancel_dialog_delete_item_sleepschedule_titel'
+                        : 'cancel_dialog_delete_item_wakeupschedule_titel'
+                    ),
+                    subTitle: I18n.getLang(
+                      item.isSleep
+                        ? 'cancel_dialog_delete_item_sleepschedule_description'
+                        : 'cancel_dialog_delete_item_wakeupschedule_description'
+                    ),
+                    onConfirm: async (_, { close }) => {
+                      close();
+                      if (state.loading) return;
+                      state.loading = true;
+                      await modDeleteTimeSchedule(
+                        'del',
+                        item.isSleep,
+                        item
+                      );
+                      state.loading = false;
+                    },
+                  });
+                }}
               />
             )}
             ListHeaderComponent={() => (<Spacer height={cx(10)} />)}
@@ -408,12 +502,13 @@ const SleepWakeUpCard = (props: {
   sleepWakeUp: SleepUIItem | WakeUpUIItem,
   onSwitch: (enable: boolean) => void,
   onPress: () => void
+  onLongPress: () => void
   is24HourClock: boolean
   styles: StyleSheet.NamedStyles<any>
 }) => {
-  const { sleepWakeUp, is24HourClock, onSwitch, onPress, styles } = props
+  const { sleepWakeUp, is24HourClock, onSwitch, onPress, onLongPress, styles } = props
   return (
-    <Card style={styles.randomTimingCard} onPress={onPress}>
+    <Card style={styles.randomTimingCard} onPress={onPress} onLongPress={onLongPress}>
       <Spacer height={cx(16)} />
       <View style={styles.switchLine}>
         <Text style={styles.time}>

package/src/newModules/switchGradient/SwitchGradientPage.tsx

@@ -79,8 +79,10 @@ const SwitchGradientPage = (props: { theme?: ThemeType }) => {
       <View>
         <Card style={styles.stepCard}>
           <Spacer height={cx(16)}/>
-          <Text style={styles.stepTitle}>{I18n.getLang('matter_gradient_light_on_description_text')}</Text>
-          <Spacer height={cx(10)}/>
+          <View style={{ minHeight: cx(70), flexDirection: 'row'}}>
+            <Text style={styles.stepTitle}>{I18n.getLang('matter_gradient_light_on_description_text')}</Text>
+          </View>
+          <Spacer height={cx(5)}/>
           <View style={styles.stepGroup}>
             <Text style={styles.stepText}>{I18n.getLang('matter_gradient_light_on_title')}</Text>
             <Stepper
@@ -99,8 +101,9 @@ const SwitchGradientPage = (props: { theme?: ThemeType }) => {
         <Spacer/>
         <Card style={styles.stepCard}>
           <Spacer height={cx(16)}/>
-          <Text style={styles.stepTitle}>{I18n.getLang('matter_gradient_light_off_description_text')}</Text>
-          <Spacer height={cx(10)}/>
+          <View style={{ minHeight: cx(70), flexDirection: 'row'}}>
+            <Text  style={styles.stepTitle}>{I18n.getLang('matter_gradient_light_off_description_text')}</Text>
+          </View>
           <View style={styles.stepGroup}>
             <Text style={styles.stepText}>{I18n.getLang('matter_gradient_light_off_title')}</Text>
             <Stepper

package/src/newModules/swithInching/SwithInching.tsx

@@ -225,6 +225,7 @@ const SwitchInching = (props: { theme?: ThemeType }) => {
           setMinute={s => {
             state.second = s;
           }}
+          maxHour={61}
         />
       </View>
     </Page>

package/src/newModules/timeSchedule/TimeSchedulePage.tsx

@@ -22,6 +22,7 @@ import { ui_biz_routerKey } from '../../navigation/Routers';
 import Tag from '@ledvance/base/src/components/Tag';
 import { cloneDeep } from 'lodash';
 import ThemeType from '@ledvance/base/src/config/themeType'
+import { showDialog } from '@ledvance/base/src/utils/common';
 
 const { convertX: cx } = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
@@ -76,6 +77,8 @@ const TimeSchedulePage = (props: { theme?: ThemeType }) => {
   useEffect(() => {
     getTimeSchedule(devId).then(res => {
       state.originList = cloneDeep(res)
+      const status = res?.some(item => item.enable);
+      setTimeScheduleStatus(status);
     });
   }, [state.flag]);
 
@@ -198,31 +201,44 @@ const TimeSchedulePage = (props: { theme?: ThemeType }) => {
         )}
         {params.applyForList.length > 1 && !!state.originList.length && !(params.isCeilingLight || params.isMixLight) && showTags}
         {state.timeScheduleList.length > 0 ? <FlatList
-            data={state.timeScheduleList}
-            renderItem={({ item }) => (
-              <ScheduleCard
-                item={item}
-                tags={params.applyForList}
-                showTag={params.applyForList.length > 1}
-                onEnableChange={async enable => {
-                  state.loading = true;
-                  await modDeleteTimeSchedule('update', {
-                    ...item,
-                    enable,
-                  });
-                  state.loading = false;
-                }}
-                onPress={() => {
-                  navigateToEdit('update', item);
-                }}
-              />
-            )}
-            keyExtractor={item => item.id.toString()}
-            ListEmptyComponent={<Spacer />}
-            ListHeaderComponent={() => <Spacer height={cx(10)} />}
-            ItemSeparatorComponent={() => <Spacer />}
-            ListFooterComponent={() => <Spacer height={cx(30)} />}
-          /> :
+          data={state.timeScheduleList}
+          renderItem={({ item }) => (
+            <ScheduleCard
+              item={item}
+              tags={params.applyForList}
+              showTag={params.applyForList.length > 1}
+              onEnableChange={async enable => {
+                state.loading = true;
+                await modDeleteTimeSchedule('update', {
+                  ...item,
+                  enable,
+                });
+                state.loading = false;
+              }}
+              onPress={() => {
+                navigateToEdit('update', item);
+              }}
+              onLongPress={() =>{
+                showDialog({
+                  method: 'confirm',
+                  title: I18n.getLang('cancel_dialog_delete_item_timeschedule_titel'),
+                  subTitle: I18n.getLang('cancel_dialog_delete_item_timeschedule_description'),
+                  onConfirm: async (_, { close }) => {
+                    state.loading = true;
+                    close();
+                    await modDeleteTimeSchedule('delete', item);
+                    state.loading = false;
+                  },
+                });
+              }}
+            />
+          )}
+          keyExtractor={item => item.id.toString()}
+          ListEmptyComponent={<Spacer />}
+          ListHeaderComponent={() => <Spacer height={cx(10)} />}
+          ItemSeparatorComponent={() => <Spacer />}
+          ListFooterComponent={() => <Spacer height={cx(30)} />}
+        /> :
           <View style={styles.emptyContainer}>
             <Spacer height={cx(60)} />
             <Image

package/src/newModules/timeSchedule/components/ManuaSettings.tsx

@@ -274,12 +274,22 @@ function ManualSettings(props: ManualSettingProps) {
 
   const stripLightCard = useMemo(() => {
     const deviceData = state.deviceData as StripLightData
+    const getBlockColor = () => {
+      if (deviceData.activeKey === 1) {
+        const s = Math.round(mapFloatToRange(state.deviceData.s / 100, 30, 100))
+        return hsv2Hex(state.deviceData.h, s, 100)
+      }
+      if (deviceData.activeKey === 0) {
+        return cctToColor(state.deviceData.temperature)
+      }
+      return props.theme?.card.background
+    }
     return (
       <View>
         <Card style={{ marginHorizontal: cx(24) }}>
           <LdvSwitch
             title={I18n.getLang('light_sources_tile_tw_lighting_headline')}
-            color={props.theme?.card.background}
+            color={getBlockColor()}
             colorAlpha={1}
             enable={state.applyForList[0]?.enable}
             setEnable={(enable: boolean) => {

package/src/newModules/timeSchedule/components/ScheduleCard.tsx

@@ -18,10 +18,11 @@ interface ScheduleCardProps {
   tags: ApplyForItem[]
   onEnableChange: (enable: boolean) => void
   onPress: (item: any) => void
+  onLongPress?: (item: any) => void
 }
 
 const ScheduleCard = (props: ScheduleCardProps) => {
-  const { item, style, showTag, tags, onEnableChange, onPress } = props;
+  const { item, style, showTag, tags, onEnableChange, onPress, onLongPress } = props;
   const is24HourClock = useSystemTimeFormate()
   const showTags = useMemo(() => {
     return tags.filter(tag => item.dps.hasOwnProperty(tag.dp))
@@ -93,6 +94,9 @@ const ScheduleCard = (props: ScheduleCardProps) => {
       onPress={() => {
         onPress(item);
       }}
+      onLongPress={() =>{
+        onLongPress && onLongPress(item)
+      }}
     >
       <View style={styles.infoContainer}>
         <Text style={styles.time}>{is24HourClock ? item.time : convertTo12HourFormat(item.time)}</Text>