@ledvance/ui-biz-bundle 1.1.105 → 1.1.107

package/src/newModules/energyConsumption/EnergyConsumptionActions.ts

@@ -2,7 +2,12 @@ import {useDp} from "@ledvance/base/src/models/modules/NativePropsSlice";
 import {localeNumber, loopsText, monthFormat, monthFormatShort} from "@ledvance/base/src/utils/common";
 import {EnergyData} from "./component/EnergyModal";
 import {NativeApi} from "@ledvance/base/src/api/native";
-import {getDataWithSpecified, getDpResultByHour, getDpResultByMonth} from "@ledvance/base/src/models/TuyaApi";
+import {
+  DpResultByMonthResData,
+  getDataWithSpecified,
+  getDpResultByHour,
+  getDpResultByMonth
+} from "@ledvance/base/src/models/TuyaApi";
 import {DateType} from "@ledvance/ui-biz-bundle/src/newModules/energyConsumption/co2Data";
 import {OverviewItem} from "@ledvance/ui-biz-bundle/src/newModules/energyConsumption/EnergyConsumptionPage";
 import {overDays} from "@ledvance/base/src/utils/index";
@@ -44,8 +49,13 @@ export async function getElectricity(devId: string, addEleDpCode: string, date:
   return res
 }
 
+let dpResultByMonthCache: DpResultByMonthResData | undefined = undefined
 const getDpResultByYear = async (devId: string, addEleDpCode: string, dateStr: string): Promise<OverviewItem[]> => {
-  const res = await getDpResultByMonth(devId, addEleDpCode, 'sum')
+  let res: DpResultByMonthResData | undefined;
+  if (!dpResultByMonthCache) {
+    dpResultByMonthCache = await getDpResultByMonth(devId, addEleDpCode, 'sum')
+  }
+  res = dpResultByMonthCache;
   if (!isEmpty(res)) {
     if (!isEmpty(res.years)) {
       const year = dateStr;
@@ -105,6 +115,9 @@ const getDpResultByDate = async (devId: string, addEleDpCode: string, date: stri
     return []
   }
   const res = await getDpResultByHour(devId, addEleDpCode, date, 'sum')
+  if (!res) {
+    return []
+  }
   const list: Array<OverviewItem> = []
   const resData = Object.keys(res)?.map(val => {
     return {key: Number(val?.slice(8, 10)), value: Number(res[val])}

package/src/newModules/energyConsumption/EnergyConsumptionChart.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback } from "react";
-import {Image, Platform, StyleSheet, View, Text} from "react-native";
+import {Image, Platform, StyleSheet, View, Text, TouchableOpacity} from "react-native";
 import {useRoute} from '@react-navigation/core'
 import Page from "@ledvance/base/src/components/Page";
 import res from "@ledvance/base/src/res";
@@ -19,6 +19,7 @@ import DateSelectedItem from "@ledvance/ui-biz-bundle/src/newModules/energyConsu
 import {useReactive, useUpdateEffect} from "ahooks";
 import {getElectricity} from "@ledvance/ui-biz-bundle/src/newModules/energyConsumption/EnergyConsumptionActions";
 import {useDeviceId} from "@ledvance/base/src/models/modules/NativePropsSlice";
+import DateSwitch from "@ledvance/ui-biz-bundle/src/newModules/energyConsumption/component/DateSwitch";
 
 const {convertX: cx} = Utils.RatioUtils
 const {withTheme} = Utils.ThemeUtils
@@ -50,6 +51,14 @@ const EnergyConsumptionChart = (props: { theme?: ThemeType }) => {
     listEmptyText: {
       flex: 0
     },
+    downloadIcon: {
+      width: cx(24),
+      height: cx(24),
+      tintColor: props.theme?.global.brand,
+      position: 'absolute',
+      right: 0,
+      top: cx(10)
+    }
   });
 
   const getDateType = useCallback((date: string) => {
@@ -64,7 +73,7 @@ const EnergyConsumptionChart = (props: { theme?: ThemeType }) => {
       }
     }
     return DateType.Day;
-  }, [])
+  }, []);
   const dateType = getDateType(date);
   const state = useReactive({
     loading: false,
@@ -87,11 +96,13 @@ const EnergyConsumptionChart = (props: { theme?: ThemeType }) => {
     getElectricity(devId, addEleDpCode, state.date, state.dateType).then((res) => {
       state.chartData = res;
       state.loading = false;
-    })
+    }).catch(()=>{
+      state.loading = false;
+    });
   }, [state.date]);
 
   const getEmptyDataTip = useCallback(() => {
-    if (state.over365Days) {
+    if (state.over365Days && state.dateType !== DateType.Day) {
       return I18n.getLang('energyconsumption_Daylimit')
     }
     if (state.dateType === DateType.Day && state.over7Days) {
@@ -139,16 +150,26 @@ const EnergyConsumptionChart = (props: { theme?: ThemeType }) => {
   return (
       <Page
           backText={I18n.getLang('consumption_data_annual_bar_chart_system_back_text')}
-          headlineIcon={state.chartData?.length ? res.download_icon : undefined}
-          onHeadlineIconClick={() => {
-            exportFile(state.chartData,params.price,params.unit)
-          }}
           showGreenery={false}
           loading={state.loading}
           greeneryIcon={res.energy_consumption_greenery}
           headlineContent={
-            <View style={{alignItems: 'center', justifyContent: 'center', flex: 1, marginStart: cx(24)}}>
-              <Text style={{fontSize: cx(24), color: props.theme?.global.brand}}>{state.headlineText}</Text>
+            <View style={{width: '100%',flexDirection:'row'}}>
+              <DateSwitch
+                  style={{flex: 1}}
+                  date={state.date}
+                  dateType={state.dateType}
+                  headlineText={state.headlineText}
+                  onDateChange={(date) => {
+                    state.date = date;
+                  }}/>
+              <TouchableOpacity onPress={() => {
+                exportFile(state.chartData, params.price, params.unit)
+              }}>
+                <Image
+                    style={styles.downloadIcon}
+                    source={state.chartData?.length ? res.download_icon : undefined}/>
+              </TouchableOpacity>
             </View>
           }
       >

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

@@ -0,0 +1,111 @@
+import ThemeType from "@ledvance/base/src/config/themeType";
+import React, {PropsWithChildren, useCallback, useEffect} from "react";
+import {Image, Text, TouchableOpacity, View, ViewProps} from "react-native";
+import {Utils} from "tuya-panel-kit";
+import {useReactive} from "ahooks";
+import {DateType} from "@ledvance/ui-biz-bundle/src/newModules/energyConsumption/co2Data";
+import res from "@ledvance/base/src/res";
+import dayjs from "dayjs";
+
+const cx = Utils.RatioUtils.convertX;
+const {withTheme} = Utils.ThemeUtils
+
+interface DateSwitchProps extends PropsWithChildren<ViewProps> {
+    theme?: ThemeType
+    headlineText: string,
+    date: string,
+    dateType: DateType,
+    onDateChange: (string) => void
+}
+
+export default withTheme(function DateSwitch(props: DateSwitchProps) {
+    const {dateType, date, onDateChange, theme, headlineText} = props;
+    const state = useReactive({
+        date: date,
+        dateType: dateType,
+        headlineText: headlineText,
+        disableArrowLeft: false,
+        disableArrowRight: false,
+    });
+
+    useEffect(() => {
+        state.date = date;
+        state.headlineText = headlineText;
+        state.dateType = dateType;
+        const {canPreChangeDate, canNextChangeDate} = canPreOrNextChangeDate(dayjs(date));
+        state.disableArrowRight = !canNextChangeDate;
+        state.disableArrowLeft = !canPreChangeDate;
+    }, [date, headlineText, dateType]);
+
+    const canPreOrNextChangeDate = useCallback((datejs: dayjs.Dayjs) => {
+        const minDatejs = dayjs('2000-1-1');
+        const nowDatejs = dayjs();
+        const year = datejs.year();
+        const month = (datejs.month() + 1).toString().padStart(2, '0');
+        const day = datejs.date().toString().padStart(2, '0');
+        const dateType = state.dateType;
+        const dateUnit = dateType === DateType.Year ? 'year' : (dateType === DateType.Month ? 'month' : 'day');
+        let canPreChangeDate = datejs.isAfter(minDatejs, dateUnit);
+        let canNextChangeDate = datejs.isBefore(nowDatejs, dateUnit);
+        let date: string | undefined = undefined;
+        if (datejs >= minDatejs && datejs <= nowDatejs) {
+            switch (state.dateType) {
+                case DateType.Day:
+                    date = `${year}${month}${day}`;
+                    break
+                case DateType.Month:
+                    date = `${year}${month}`;
+                    break
+                case DateType.Year:
+                    date = `${year}`;
+                    break
+            }
+        }
+        return {date, canPreChangeDate, canNextChangeDate};
+    }, [state.dateType]);
+
+    const changeDate = useCallback((isNextDate: boolean) => {
+        const datejs = dayjs(state.date)
+        const dateType = state.dateType
+        const dateUnit = dateType === DateType.Year ? 'year' : (dateType === DateType.Month ? 'month' : 'day');
+        const newDatejs = datejs.add(isNextDate ? 1 : -1, dateUnit);
+        const {date, canPreChangeDate, canNextChangeDate} = canPreOrNextChangeDate(newDatejs);
+        state.disableArrowRight = !canNextChangeDate;
+        state.disableArrowLeft = !canPreChangeDate;
+        if (date) {
+            onDateChange(date);
+        }
+    }, [state.date, canPreOrNextChangeDate, state.disableArrowRight, state.disableArrowLeft, onDateChange]);
+
+    return (<View style={[props.style, {flexDirection: 'row', alignItems: 'center', justifyContent: 'center'}]}>
+        <TouchableOpacity
+            disabled={state.disableArrowLeft}
+            onPress={() => {
+                changeDate(false);
+            }}>
+            <Image
+                source={res.arrow_left}
+                style={{tintColor: state.disableArrowLeft ? theme?.global.disabledFontColor : theme?.global.brand}}
+                height={cx(36)}
+                width={cx(36)}/>
+        </TouchableOpacity>
+        <Text style={{
+            fontSize: cx(24),
+            minWidth: cx(200),
+            textAlign: 'center',
+            color: theme?.global.brand,
+            fontFamily: 'helvetica_neue_lt_std_roman',
+        }}>{state.headlineText}</Text>
+        <TouchableOpacity
+            disabled={state.disableArrowRight}
+            onPress={() => {
+                changeDate(true);
+            }}>
+            <Image
+                source={res.arrow_right}
+                style={{tintColor: state.disableArrowRight ? theme?.global.disabledFontColor : theme?.global.brand}}
+                height={cx(36)}
+                width={cx(36)}/>
+        </TouchableOpacity>
+    </View>)
+})

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/energyConsumption/component/NewBarChart.tsx

@@ -1,4 +1,4 @@
-import React, {useRef} from 'react';
+import React, {useMemo, useRef} from 'react';
 import {View} from 'react-native';
 import ECharts from '@ledvance/react-native-echarts-pro';
 import I18n from "@ledvance/base/src/i18n";
@@ -28,7 +28,20 @@ const BarChartWithTouch = (props: BarChartProps) => {
     const dataPriceY = data?.map(item => {
         return ((isNaN(Number(item.value)) ? 0 : Number(item.value)) * price).toFixed(2);
     });
-    const maxValue = Math.max(...dataKwhY);
+    const maxValue = useMemo(() => {
+        let max = Math.max(...dataKwhY)
+        if (max < 0.1) {
+            max += 0.02
+            max = max - (max % 0.02)
+        } else if (max < 1) {
+            max += 0.2
+            max = max - (max % 0.2)
+        } else if (max < 10) {
+            max = Math.ceil(max) + 2
+            max = max - (max % 2)
+        }
+        return max
+    }, [dataKwhY]);
     const option = {
         tooltip: {
             show: true,
@@ -56,7 +69,7 @@ const BarChartWithTouch = (props: BarChartProps) => {
         yAxis: [{
             type: 'value',
             name: I18n.getLang('consumption_data_annual_bar_chart_text'),
-            max: Math.ceil(maxValue),
+            max: Math.max(maxValue, 0.02),
             min: 0,
             position: 'left',
             axisLabel: {

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

@@ -23,7 +23,7 @@ import { getRemoteMoodList, useMoodScene } from './MoodActions';
 import { useParams } from '@ledvance/base/src/hooks/Hooks';
 import { ui_biz_routerKey } from '../../navigation/Routers'
 import { cloneDeep, filter, map } from 'lodash';
-import { saveFlagMode } from '@ledvance/ui-biz-bundle/src/modules/flags/FlagActions';
+import { saveFlagMode } from '../../modules/flags/FlagActions';
 import { SceneStatusType, WorkMode } from '@ledvance/base/src/utils/interface';
 import { showDialog } from '@ledvance/base/src/utils/common';
 import I18n from '@ledvance/base/src/i18n';
@@ -87,6 +87,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));
     }
   }
 
@@ -311,7 +312,7 @@ const MoodPage = (props: { theme?: ThemeType }) => {
       right: cx(60),
       top: Platform.OS === 'android' ? cx(90) : cx(130),
       maxWidth: cx(200),
-      backgroundColor: props.theme.card.background,
+      backgroundColor: props.theme?.card.background,
     },
     popoverItem: {
       padding: cx(5),
@@ -365,7 +366,7 @@ const MoodPage = (props: { theme?: ThemeType }) => {
                             })
                           }}
         >
-          <Image source={res.ic_refresh} style={{ width: cx(24), height: cx(24), tintColor: props.theme.global.fontColor }} />
+          <Image source={res.ic_refresh} style={{ width: cx(24), height: cx(24), tintColor: props.theme?.global.fontColor }} />
         </TouchableOpacity>
         <Spacer height={cx(10)} />
         {state.originMoods.length >= MAX_MOOD_COUNT && (

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}>