@ledvance/group-ui-biz-bundle 1.0.95 → 1.0.97

package/src/modules/energyConsumption/EnergyConsumptionPage.tsx

@@ -16,7 +16,6 @@ import { useTimeZoneCity } from '@ledvance/base/src/models/modules/NativePropsSl
 import { flattenDeep, isNumber, sumBy } from 'lodash';
 import {
   exchangeNumber,
-  exportFile,
   localeNumber,
   monthFormat,
   monthFormatShort,
@@ -28,6 +27,7 @@ import { EnergyConsumptionDetailProps } from './EnergyConsumptionDetail';
 import { EnergyConsumptionChartProps } from './EnergyConsumptionChart';
 import SegmentControl from '@ledvance/base/src/components/segmentControl';
 import ThemeType from '@ledvance/base/src/config/themeType'
+import { exportEnergyCsv } from "./EnergyConsumptionActions";
 
 const { convertX: cx } = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils;
@@ -285,7 +285,8 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
       )}
       headlineIcon={(state.isSolarMode ? state.solarOverviewList : state.wifiOverviewList).length ? res.download_icon : undefined}
       onHeadlineIconClick={() => {
-        exportFile(state.isSolarMode ? state.solarOverviewList : state.wifiOverviewList, state.price, state.unit);
+        const values = (state.isSolarMode ? state.solarOverviewList : state.wifiOverviewList).map(item => [item.key, item.value, (Number(state.price) * Number(item.value)).toFixed(2)])
+        exportEnergyCsv(values, state.unit)
       }}
       showGreenery={state.isSolarMode}
       greeneryIcon={res.energy_consumption_greenery}
@@ -309,7 +310,7 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
           {/* tip */}
           <Spacer height={cx(15)} />
           <View style={styles.showTip}>
-            <Text style={{ fontSize: cx(14) }}>
+            <Text style={{ fontSize: cx(14), color: props.theme?.global.fontColor, }}>
               {I18n.getLang(
                 state.isSolarMode
                   ? 'generation_data_description_text'
@@ -378,7 +379,7 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
                       style={{
                         height: cx(20),
                         width: cx(20),
-                        tintColor: props.theme?.button.active,
+                        tintColor: props.theme?.button.primary,
                       }}
                     />
                   </View>
@@ -401,7 +402,7 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
                           style={{
                             height: cx(20),
                             width: cx(20),
-                            tintColor: props.theme?.button.active,
+                            tintColor: props.theme?.button.primary,
                           }}
                         />
                       </TouchableOpacity>
@@ -420,7 +421,7 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
                 <Image
                   source={res.energy_consumption_cash}
                   resizeMode="contain"
-                  style={{ height: cx(20), width: cx(20), tintColor: props.theme?.button.active }}
+                  style={{ height: cx(20), width: cx(20), tintColor: props.theme?.button.primary }}
                 />
               </View>
               <View>

package/src/modules/energyConsumption/component/EnergyModal.tsx

@@ -59,7 +59,7 @@ const EnergyModal = (props: EnergyModalProps) => {
       <Text style={{ color: props.theme?.global.fontColor }}>{text[length - 4] + text[length - 3] + ':'}</Text>
       <Spacer />
       <Text
-        style={{ textDecorationLine: 'underline', color: props.theme?.button.active }}
+        style={{ textDecorationLine: 'underline', color: props.theme?.button.primary }}
         onPress={() => openLink(`${text[length - 2]}:${text[length - 1]}${text[length]}`)}
       >
         {`${text[length - 2]}:${text[length - 1]}${text[length]}`}

package/src/modules/fixedTimeForPlug/FixedTimeForPlugDetailPage.tsx

@@ -33,6 +33,7 @@ interface FixedTimeDetailParam extends FixedTimeParam {
 const newFixedTimeItem = (): FixedTimeItem => {
   const startTime = dayjs().hour() * 60 + dayjs().minute()
   return {
+    name: I18n.getLang('fixedTimeCycle_socket_headline'),
     enable: true,
     channel: 0,
     weeks: [0, 0, 0, 0, 0, 0, 0, 0],
@@ -89,14 +90,14 @@ const FixedTimeForPlugDetailPage = (props: { theme?: ThemeType }) => {
     return timeInterval >= workTime
   }, [state.item.startTime, state.item.endTime, state.onHour, state.onMinute, state.offHour, state.offMinute])
 
-  const canSave = useMemo(() => {
-    return state.item.name && state.item.name.length < 33 && state.item.channel !== undefined && isTimeEffective
-  }, [state.item.name, state.item.channel, isTimeEffective])
-
   const showConfirm = useMemo(() => {
     return !isEqual(state.item, params.mode === 'edit' ? params.item : initItem)
   }, [JSON.stringify(state.item), JSON.stringify(params.item)])
 
+  const canSave = useMemo(() => {
+    return state.item.name && state.item.name.length < 33 && state.item.channel !== undefined && isTimeEffective && (showConfirm || params.mode === 'add')
+  }, [state.item.name, state.item.channel, isTimeEffective, showConfirm])
+
   const onSave = async () => {
     if (!canSave) {
       return
@@ -203,6 +204,7 @@ const FixedTimeForPlugDetailPage = (props: { theme?: ThemeType }) => {
         />
         {/* pick */}
         <TimerPicker
+          key={props.theme?.type}
           itemTextColor='#aeadb5'
           style={{ paddingVertical: cx(0), marginVertical: cx(0), backgroundColor: props.theme?.global.background }}
           pickerFontColor={props.theme?.global.fontColor}

package/src/modules/fixedTimeForPlug/FixedTimeForPlugPage.tsx

@@ -10,7 +10,7 @@ import {useReactive} from "ahooks";
 import {ui_biz_routerKey} from "../../navigation/Routers";
 import {cloneDeep} from "lodash";
 import Spacer from "@ledvance/base/src/components/Spacer";
-import {Utils} from "tuya-panel-kit";
+import {Utils, Dialog} from "tuya-panel-kit";
 import ItemCard from "./ItemCard";
 import InfoText from "@ledvance/base/src/components/InfoText";
 import ThemeType from '@ledvance/base/src/config/themeType'
@@ -43,18 +43,46 @@ const FixedTimeForPlugPage = (props: { theme?: ThemeType}) => {
     })
   }
 
-  const onPost = useCallback(async (mode: 'add' | 'edit' | 'del', fixedTime: FixedTimeItem, goBack?: boolean) => {
+  const onPost = useCallback(async (mode: 'add' | 'edit' | 'del' | 'set', fixedTime: FixedTimeItem, goBack?: boolean) => {
     state.loading = true
     const cloneFixedTimeList = cloneDeep(fixedTimeList)
     const idx = fixedTimeList.findIndex(it => it.index === fixedTime.index)
-    if (mode === 'edit') {
+    if (mode === 'edit' || mode === 'set') {
       cloneFixedTimeList.splice(idx, 1, fixedTime)
     }
     if (mode === 'del') cloneFixedTimeList.splice(idx, 1)
-    const newFixedTimeList = mode === 'add' ? [...fixedTimeList, {
+      let newFixedTimeList = mode === 'add' ? [...fixedTimeList, {
       ...fixedTime,
       index: fixedTimeList.length
     }] : cloneFixedTimeList
+    if (((mode === 'edit' || mode ===  'set') && 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
+        }
+      })
+      if (itselfConflict && mode === 'set') {
+        return 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()
+            setFixedTimeList(cloneList)
+            state.loading = false
+          },
+          onCancel: () => {
+            state.loading = false
+            Dialog.close()
+          }
+        })
+      }
+      newFixedTimeList = cloneList
+    }
     const res = await setFixedTimeList(newFixedTimeList)
     state.loading = false
     if (res.success && goBack) {
@@ -106,7 +134,7 @@ const FixedTimeForPlugPage = (props: { theme?: ThemeType}) => {
               item={item}
               is24Hour={params.is24Hour}
               onSwitch={async (v) => {
-                await onPost('edit', {
+                await onPost('set', {
                   ...item,
                   enable: v,
                   settingTime: new Date().getTime()

package/src/modules/fixedTimingForLight/FixedTimingForLightDetailPage.tsx

@@ -36,6 +36,7 @@ interface FixedTimeDetailParam extends FixedTimingParam {
 const newFixedTimingItem = (): FixedTimingItem => {
   const startTime = dayjs().hour() * 60 + dayjs().minute()
   return {
+    name: I18n.getLang('fixedTimeCycle_socket_headline'),
     power: true,
     channel: 0,
     weeks: [0, 0, 0, 0, 0, 0, 0],
@@ -105,14 +106,14 @@ const FixedTimingForLightDetailPage = (props: { theme?: ThemeType }) => {
     return timeInterval >= workTime
   }, [state.item.startTime, state.item.endTime, state.onHour, state.onMinute, state.offHour, state.offMinute])
 
-  const canSave = useMemo(() => {
-    return state.item.name && state.item.name.length < 33 && state.item.channel !== undefined && isTimeEffective
-  }, [state.item.name, state.item.channel, isTimeEffective])
-
   const showConfirm = useMemo(() => {
     return !isEqual(state.item, params.mode === 'edit' ? params.item : initItem)
   }, [JSON.stringify(state.item), JSON.stringify(params.item)])
 
+  const canSave = useMemo(() => {
+    return state.item.name && state.item.name.length < 33 && state.item.channel !== undefined && isTimeEffective && (showConfirm || params.mode === 'add')
+  }, [state.item.name, state.item.channel, isTimeEffective, showConfirm])
+
   const onSave = async () => {
     if (!canSave) {
       return
@@ -230,6 +231,7 @@ const FixedTimingForLightDetailPage = (props: { theme?: ThemeType }) => {
         />
         {/* pick */}
         <TimerPicker
+          key={props.theme?.type}
           itemTextColor='#aeadb5'
           style={{ paddingVertical: cx(0), marginVertical: cx(0), backgroundColor: props.theme?.global.background }}
           pickerFontColor={props.theme?.global.fontColor}

package/src/modules/fixedTimingForLight/FixedTimingForLightPage.tsx

@@ -6,7 +6,7 @@ import res from "@ledvance/base/src/res/index";
 import {useReactive} from "ahooks";
 import React, {useCallback, useMemo} from "react";
 import {FlatList, Image, ScrollView, StyleSheet, Text, TouchableOpacity, View} from "react-native";
-import {Utils} from "tuya-panel-kit";
+import {Utils, Dialog} from "tuya-panel-kit";
 import {ui_biz_routerKey} from "../../navigation/Routers";
 import {FixedTimingItem, FixedTimingParam, useFixedTiming} from "./FixedTimingForLightAction";
 import Spacer from "@ledvance/base/src/components/Spacer";
@@ -14,7 +14,7 @@ import ItemCard from "./ItemCard";
 import {cloneDeep} from "lodash";
 import InfoText from "@ledvance/base/src/components/InfoText";
 import ThemeType from '@ledvance/base/src/config/themeType'
-import { showDialog } from "@ledvance/base/src/utils/common";
+import { isConflictTask, showDialog } from "@ledvance/base/src/utils/common";
 
 const {convertX: cx, topBarHeight} = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
@@ -43,18 +43,46 @@ const FixedTimeForLightPage =  (props: { theme?: ThemeType}) => {
     })
   }
 
-  const onPost = useCallback(async (mode: 'add' | 'edit' | 'del', fixedTiming: FixedTimingItem, goBack?: boolean) => {
+  const onPost = useCallback(async (mode: 'add' | 'edit' | 'del' | 'set', fixedTiming: FixedTimingItem, goBack?: boolean) => {
     state.loading = true
     const cloneFixedTimingList = cloneDeep(fixedTimingList)
     const idx = fixedTimingList.findIndex(it => it.index === fixedTiming.index)
-    if (mode === 'edit') {
+    if (mode === 'edit' || mode === 'set') {
       cloneFixedTimingList.splice(idx, 1, fixedTiming)
     }
     if (mode === 'del') cloneFixedTimingList.splice(idx, 1)
-    const newFixedTimingList = mode === 'add' ? [...fixedTimingList, {
+      let newFixedTimingList = mode === 'add' ? [...fixedTimingList, {
       ...fixedTiming,
       index: fixedTimingList.length
     }] : cloneFixedTimingList
+    if (((mode === 'edit' || mode ===  'set') && fixedTiming.power) || mode === 'add') {
+      const cloneList = cloneDeep(newFixedTimingList)
+      let itselfConflict = false
+      cloneList.forEach((item, idx) => {
+        const itself = mode === 'add' ? (idx === cloneList.length - 1) : fixedTiming.index === item.index
+        if (!itself && item.power && isConflictTask(item, fixedTiming)) {
+          itselfConflict = true
+          item.power = false
+        }
+      })
+      if (itselfConflict && mode === 'set') {
+        return 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()
+            await setFixedTimingList(cloneList)
+            state.loading = false
+          },
+          onCancel: () => {
+            state.loading = false
+            Dialog.close()
+          }
+        })
+      }
+      newFixedTimingList = cloneList
+    }
     const res = await setFixedTimingList(newFixedTimingList)
     state.loading = false
     if (res.success && goBack) {
@@ -111,7 +139,7 @@ const FixedTimeForLightPage =  (props: { theme?: ThemeType}) => {
               item={item}
               is24Hour={params.is24Hour}
               onSwitch={async (v) => {
-                await onPost('edit', {
+                await onPost('set', {
                   ...item,
                   power: v,
                   settingTime: new Date().getTime()

package/src/modules/music/MusicActions.ts

@@ -47,6 +47,9 @@ export const useDreamMusicData = (musicOption: MusicPageParams) => {
         }
         dps[musicOption.workModeDp] = WorkMode.Music
         dps[musicOption.switchLedDp] = true
+        if (musicOption.colourLedDp && musicOption.isCeilingLight){
+          dps[musicOption.colourLedDp] = true 
+        }
       }else{
         dps[musicOption.workModeDp] = v.lastWorkMode
       }

package/src/modules/music/MusicPage.tsx

@@ -30,6 +30,8 @@ export interface MusicPageParams {
   musicDataDp: string
   dreamMusicDp?: string
   isMixLight?: boolean
+  isCeilingLight?: boolean
+  colourLedDp?: string 
 }
 
 const MusicPage = (props: { theme?: ThemeType }) => {

package/src/modules/randomTimeForPlug/RandomTimeForPlugDetailPage.tsx

@@ -33,6 +33,7 @@ interface RandomTimeDetailParam extends RandomTimeParam {
 const newRandomTimeItem = (): RandomTimeItem => {
   const startTime = dayjs().hour() * 60 + dayjs().minute()
   return {
+    name: I18n.getLang('randomtimecycle_sockets_headline_text'),
     enable: true,
     channel: 0,
     weeks: [0, 0, 0, 0, 0, 0, 0, 0],
@@ -51,14 +52,14 @@ const RandomTimeForPlugDetailPage = (props: { theme?: ThemeType }) => {
     loading: false
   })
 
-  const canSave = useMemo(() => {
-    return state.item.name && state.item.name.length < 33 && state.item.channel !== undefined
-  }, [state.item.name, state.item.channel])
-
   const showConfirm = useMemo(() => {
     return !isEqual(state.item, params.mode === 'edit' ? params.item : initItem)
   }, [JSON.stringify(state.item), JSON.stringify(params.item)])
 
+  const canSave = useMemo(() => {
+    return state.item.name && state.item.name.length < 33 && state.item.channel !== undefined && (showConfirm || params.mode === 'add')
+  }, [state.item.name, state.item.channel, showConfirm])
+
   const onSave = async () => {
     if (!canSave) {
       return
@@ -162,6 +163,7 @@ const RandomTimeForPlugDetailPage = (props: { theme?: ThemeType }) => {
         />
         {/* pick */}
         <TimerPicker
+          key={props.theme?.type}
           itemTextColor="#aeadb5"
           style={{ paddingVertical: cx(0), marginVertical: cx(0), backgroundColor: props.theme?.global.background }}
           pickerFontColor={props.theme?.global.fontColor}

package/src/modules/randomTimeForPlug/RandomTimeForPlugPage.tsx

@@ -6,7 +6,7 @@ import res from "@ledvance/base/src/res/index";
 import {useReactive} from "ahooks";
 import React, {useCallback, useMemo} from "react";
 import {FlatList, Image, ScrollView, StyleSheet, Text, TouchableOpacity, View} from "react-native";
-import {Utils} from "tuya-panel-kit";
+import {Dialog, Utils} from "tuya-panel-kit";
 import {ui_biz_routerKey} from "../../navigation/Routers";
 import {RandomTimeItem, RandomTimeParam, useRandomTime} from "./RandomTimeForPlugAction";
 import Spacer from "@ledvance/base/src/components/Spacer";
@@ -14,7 +14,7 @@ import ItemCard from "./ItemCard";
 import {cloneDeep} from "lodash";
 import InfoText from "@ledvance/base/src/components/InfoText";
 import ThemeType from '@ledvance/base/src/config/themeType'
-import { showDialog } from "@ledvance/base/src/utils/common";
+import { isConflictTask, showDialog } from "@ledvance/base/src/utils/common";
 
 const {convertX: cx, topBarHeight} = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
@@ -43,18 +43,46 @@ const RandomTimeForPlugPage = (props: { theme?: ThemeType}) => {
     })
   }
 
-  const onPost = useCallback(async (mode: 'add' | 'edit' | 'del', randomTime: RandomTimeItem, goBack?: boolean) => {
+  const onPost = useCallback(async (mode: 'add' | 'edit' | 'del' | 'set', randomTime: RandomTimeItem, goBack?: boolean) => {
     state.loading = true
     const cloneRandomTimeList = cloneDeep(randomTimeList)
     const idx = randomTimeList.findIndex(it => it.index === randomTime.index)
-    if (mode === 'edit') {
+    if (mode === 'edit' || mode === 'set') {
       cloneRandomTimeList.splice(idx, 1, randomTime)
     }
     if (mode === 'del') cloneRandomTimeList.splice(idx, 1)
-    const newRandomTimeList = mode === 'add' ? [...randomTimeList, {
+      let newRandomTimeList = mode === 'add' ? [...randomTimeList, {
       ...randomTime,
       index: randomTimeList.length
     }] : cloneRandomTimeList
+    if (((mode === 'edit' || mode ===  'set') && 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
+        }
+      })
+      if (itselfConflict && mode === 'set') {
+        return 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()
+            await setRandomTimeList(cloneList)
+            state.loading = false
+          },
+          onCancel: () => {
+            state.loading = false
+            Dialog.close()
+          }
+        })
+      }
+      newRandomTimeList = cloneList
+    }
     const res = await setRandomTimeList(newRandomTimeList)
     state.loading = false
     if (res.success && goBack) {
@@ -120,7 +148,7 @@ const RandomTimeForPlugPage = (props: { theme?: ThemeType}) => {
               item={item}
               is24Hour={params.is24Hour}
               onSwitch={async (v) => {
-                await onPost('edit', {
+                await onPost('set', {
                   ...item,
                   enable: v,
                   settingTime: new Date().getTime()

package/src/modules/randomTimingForLight/ItemCard.tsx

@@ -24,10 +24,11 @@ export interface ItemCardProps<T> {
   is24Hour?: boolean,
   onSwitch: (enable: boolean) => void
   onPress: () => void
+  onLongPress: () => void
 }
 
 const ItemCard = <T, >(props: ItemCardProps<T>) => {
-  const {item, is24Hour, onSwitch, onPress} = props
+  const {item, is24Hour, onSwitch, onPress, onLongPress} = props
   // 判断是否关闭
   const closed = getIsClosed(item)
 
@@ -56,7 +57,7 @@ const ItemCard = <T, >(props: ItemCardProps<T>) => {
   })
 
   return (
-    <Card style={styles.itemCard} onPress={onPress}>
+    <Card style={styles.itemCard} onPress={onPress} onLongPress={onLongPress}>
       <Spacer height={cx(16)}/>
       <View style={styles.switchLine}>
         <Text style={styles.time}>

package/src/modules/randomTimingForLight/RandomTimingForLightDetailPage.tsx

@@ -35,6 +35,7 @@ interface RandomTimeDetailParam extends RandomTimingParam {
 const newRandomTimingItem = (): RandomTimingItem => {
   const startTime = dayjs().hour() * 60 + dayjs().minute()
   return {
+    name: I18n.getLang('randomtimecycle_sockets_headline_text'),
     power: true,
     channel: 0,
     weeks: [0, 0, 0, 0, 0, 0, 0],
@@ -66,14 +67,14 @@ const RandomTimingForLightDetailPage = (props: { theme?: ThemeType }) => {
     state.isColorMode = brightness === 0 && temperature === 0 && (hue !== 0 || saturation !== 0 || value !== 0)
   }, [])
 
-  const canSave = useMemo(() => {
-    return state.item.name && state.item.name.length < 33 && state.item.channel !== undefined
-  }, [state.item.name, state.item.channel])
-
   const showConfirm = useMemo(() => {
     return !isEqual(state.item, params.mode === 'edit' ? params.item : initItem)
   }, [JSON.stringify(state.item), JSON.stringify(params.item)])
 
+  const canSave = useMemo(() => {
+    return state.item.name && state.item.name.length < 33 && state.item.channel !== undefined && (showConfirm || params.mode === 'add')
+  }, [state.item.name, state.item.channel, showConfirm])
+
   const onSave = async () => {
     if (!canSave) {
       return
@@ -185,6 +186,7 @@ const RandomTimingForLightDetailPage = (props: { theme?: ThemeType }) => {
         />
         {/* pick */}
         <TimerPicker
+          key={props.theme?.type}
           itemTextColor='#aeadb5'
           style={{ paddingVertical: cx(0), marginVertical: cx(0), backgroundColor: props.theme?.global.background }}
           pickerFontColor={props.theme?.global.fontColor}

package/src/modules/randomTimingForLight/RandomTimingForLightPage.tsx

@@ -6,7 +6,7 @@ import res from "@ledvance/base/src/res/index";
 import {useReactive} from "ahooks";
 import React, {useCallback, useMemo} from "react";
 import {FlatList, Image, ScrollView, StyleSheet, Text, TouchableOpacity, View} from "react-native";
-import {Utils} from "tuya-panel-kit";
+import {Utils, Dialog} from "tuya-panel-kit";
 import {ui_biz_routerKey} from "../../navigation/Routers";
 import {RandomTimingItem, RandomTimingParam, useRandomTiming} from "./RandomTimingForLightAction";
 import Spacer from "@ledvance/base/src/components/Spacer";
@@ -14,7 +14,7 @@ import ItemCard from "./ItemCard";
 import {cloneDeep} from "lodash";
 import InfoText from "@ledvance/base/src/components/InfoText";
 import ThemeType from '@ledvance/base/src/config/themeType'
-import { showDialog } from "@ledvance/base/src/utils/common";
+import { isConflictTask, showDialog } from "@ledvance/base/src/utils/common";
 
 const {convertX: cx, topBarHeight} = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
@@ -43,18 +43,46 @@ const RandomTimeForLightPage = (props: { theme?: ThemeType}) => {
     })
   }
 
-  const onPost = useCallback(async (mode: 'add' | 'edit' | 'del', randomTiming: RandomTimingItem, goBack?: boolean) => {
+  const onPost = useCallback(async (mode: 'add' | 'edit' | 'del' | 'set', randomTiming: RandomTimingItem, goBack?: boolean) => {
     state.loading = true
     const cloneRandomTimingList = cloneDeep(randomTimingList)
     const idx = randomTimingList.findIndex(it => it.index === randomTiming.index)
-    if (mode === 'edit') {
+    if (mode === 'edit' || mode === 'set') {
       cloneRandomTimingList.splice(idx, 1, randomTiming)
     }
     if (mode === 'del') cloneRandomTimingList.splice(idx, 1)
-    const newRandomTimingList = mode === 'add' ? [...randomTimingList, {
+    let newRandomTimingList = mode === 'add' ? [...randomTimingList, {
       ...randomTiming,
       index: randomTimingList.length
     }] : cloneRandomTimingList
+    if (((mode === 'edit' || mode ===  'set') && randomTiming.power) || mode === 'add') {
+      const cloneList = cloneDeep(newRandomTimingList)
+      let itselfConflict = false
+      cloneList.forEach((item, idx) => {
+        const itself = mode === 'add' ? (idx === cloneList.length - 1) : randomTiming.index === item.index
+        if (!itself && item.power && isConflictTask(item, randomTiming)) {
+          itselfConflict = true
+          item.power = false
+        }
+      })
+      if (itselfConflict && mode === 'set') {
+        return 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()
+            await setRandomTimingList(cloneList)
+            state.loading = false
+          },
+          onCancel: () => {
+            state.loading = false 
+            Dialog.close()
+          }
+        })
+      }
+      newRandomTimingList = cloneList
+    }
     const res = await setRandomTimingList(newRandomTimingList)
     state.loading = false
     if (res.success && goBack) {
@@ -123,7 +151,7 @@ const RandomTimeForLightPage = (props: { theme?: ThemeType}) => {
               item={item}
               is24Hour={params.is24Hour}
               onSwitch={async (v) => {
-                await onPost('edit', {
+                await onPost('set', {
                   ...item,
                   power: v,
                   settingTime: new Date().getTime()

package/src/modules/sleepWakeUp/SleepWakeUpActions.ts

@@ -41,7 +41,7 @@ export function getEndTime(item: SleepWakeUpItem) {
   return time > 1440 ? time - 1440 : time
 }
 
-const encodeSleepOrWakeUp = (items: SleepWakeUpItem[]) => {
+export const encodeSleepOrWakeUp = (items: SleepWakeUpItem[]) => {
   const bytes: number[] = []
   bytes.push(numToByte(0))
   bytes.push(numToByte(items.length))

package/src/modules/sleepWakeUp/SleepWakeUpDetailPage.tsx

@@ -91,7 +91,7 @@ const SleepWakeUpDetailPage = (props: {theme?: ThemeType}) => {
     return cctToColor(state.sleepWakeUp.temperature);
   }, [state.sleepWakeUp]);
 
-  const showBackDialog = () => {
+  const showBackDialog = useMemo(() => {
     const excludeKeys: string[] = []
     if (state.sleepWakeUp.isColorMode) {
       excludeKeys.push('brightness', 'temperature')
@@ -99,11 +99,11 @@ const SleepWakeUpDetailPage = (props: {theme?: ThemeType}) => {
       excludeKeys.push('hue', 'sat', 'value')
     }
     return !isEqual(omit(params.scheduleItem, excludeKeys), omit(state.sleepWakeUp, excludeKeys))
-  };
+  }, [JSON.stringify(params.scheduleItem), JSON.stringify(state.sleepWakeUp)])
 
   const caSubmit = useMemo(() => {
-    return state.sleepWakeUp.name?.length > 0 && state.sleepWakeUp.name?.length < 33;
-  }, [state.sleepWakeUp.name]);
+    return state.sleepWakeUp.name?.length > 0 && state.sleepWakeUp.name?.length < 33 && (showBackDialog || params.mode === 'add');
+  }, [state.sleepWakeUp.name, showBackDialog]);
 
   const mixLightCard = useMemo(() => {
     const applyList = params.applyForList.map(item => {
@@ -191,7 +191,7 @@ const SleepWakeUpDetailPage = (props: {theme?: ThemeType}) => {
     picker: {
       marginHorizontal: cx(24),
       marginVertical: cx(15),
-      color: props.theme?.global.backgournd,
+      color: props.theme?.global.background,
     },
     week: {},
     itemTitle: {
@@ -257,7 +257,7 @@ const SleepWakeUpDetailPage = (props: {theme?: ThemeType}) => {
   return (
     <Page
       backText={I18n.getLang('add_sleepschedule_one_source_system_back_text')}
-      showBackDialog={showBackDialog()}
+      showBackDialog={showBackDialog}
       loading={state.loading}
       backDialogTitle={I18n.getLang('cancel_dialog_leave_unsaved_titel')}
       backDialogContent={I18n.getLang(
@@ -265,9 +265,9 @@ const SleepWakeUpDetailPage = (props: {theme?: ThemeType}) => {
           ? 'cancel_dialog_leave_unsaved_sleepschedule_note'
           : 'cancel_dialog_leave_unsaved_wakeupschedule_note'
       )}
-      rightButtonIcon={showBackDialog() && caSubmit ? res.ic_check : res.ic_uncheck}
+      rightButtonIcon={caSubmit ? res.ic_check : res.ic_uncheck}
       rightButtonIconClick={async () => {
-        if (!showBackDialog() || !caSubmit || state.loading) return;
+        if (!caSubmit || state.loading) return;
         showDialog({
           method: 'confirm',
           title: I18n.getLang('conflict_dialog_active_item_sleepschedule_titel'),
@@ -326,6 +326,7 @@ const SleepWakeUpDetailPage = (props: {theme?: ThemeType}) => {
         />
         {/* pick */}
         <TimerPicker
+          key={props.theme?.type}
           itemTextColor="#aeadb5"
           style={{ paddingVertical: cx(0), marginVertical: cx(0), backgroundColor: props.theme?.global.background }}
           pickerFontColor={props.theme?.global.fontColor}