@ledvance/group-ui-biz-bundle 1.0.91 → 1.0.93

package/src/modules/energyConsumption/EnergyConsumptionActions.ts

@@ -1,5 +1,10 @@
 import {useGroupEzvizConfig} from "@ledvance/base/src/models/modules/NativePropsSlice";
-import {getDataWithSpecified, getDpResultByHour, getDpResultByMonth} from "@ledvance/base/src/models/TuyaApi";
+import {
+    DpResultByMonthResData,
+    getDataWithSpecified,
+    getDpResultByHour,
+    getDpResultByMonth
+} from "@ledvance/base/src/models/TuyaApi";
 import {overDays} from "@ledvance/base/src/utils";
 import {loopsText, monthFormat, monthFormatShort} from "@ledvance/base/src/utils/common";
 import {DateType} from "@ledvance/group-ui-biz-bundle/src/modules/energyConsumption/co2Data";
@@ -9,150 +14,160 @@ import {isNumber} from "lodash";
 import {EnergyData, UnitList} from "./component/EnergyModal";
 
 interface LightConfig {
-  energyConsumption?: EnergyData
+    energyConsumption?: EnergyData
 }
 
-export const useEnergyConsumption = () =>{
-  return useGroupEzvizConfig<LightConfig, EnergyData>('energyConsumption', {unit: UnitList[0], price: ''})
+export const useEnergyConsumption = () => {
+    return useGroupEzvizConfig<LightConfig, EnergyData>('energyConsumption', {unit: UnitList[0], price: ''})
 }
 
 export const unitDivision = (str: string) => {
-  if (!str) { return ['', ''] }
-  const strIndex = str.indexOf('(' || '（')
-  const unit = str.substring(strIndex)
-  const name = str.split(unit)[0]
-  return [name, unit]
+    if (!str) {
+        return ['', '']
+    }
+    const strIndex = str.indexOf('(' || '（')
+    const unit = str.substring(strIndex)
+    const name = str.split(unit)[0]
+    return [name, unit]
 }
 
 
 export async function getElectricity(devIdGroup: string[], addEleDpCode: string, date: string, dateType: DateType): Promise<OverviewItem[]> {
-  let res: OverviewItem[] = []
-  switch (dateType) {
-    case DateType.Year:
-      res = await getDpResultByYear(devIdGroup, addEleDpCode, date)
-      break
-    case DateType.Month:
-      res = await getDpResultByYearMonth(devIdGroup, addEleDpCode, date)
-      break
-    case DateType.Day:
-      res = await getDpResultByDate(devIdGroup, addEleDpCode, date);
-      break
-  }
-  return res
+    let res: OverviewItem[] = []
+    switch (dateType) {
+        case DateType.Year:
+            res = await getDpResultByYear(devIdGroup, addEleDpCode, date)
+            break
+        case DateType.Month:
+            res = await getDpResultByYearMonth(devIdGroup, addEleDpCode, date)
+            break
+        case DateType.Day:
+            res = await getDpResultByDate(devIdGroup, addEleDpCode, date);
+            break
+    }
+    return res
 }
 
+let dpResultByMonthCache: DpResultByMonthResData[] | undefined
 const getDpResultByYear = async (devIdGroup: string[], addEleDpCode: string, dateStr: string): Promise<OverviewItem[]> => {
-  const year = dateStr;
-  const promiseGroup = devIdGroup.map(devId =>
-      getDpResultByMonth(devId, addEleDpCode, 'sum').catch(error => ({error}))
-  );
-  const res = await Promise.all(promiseGroup);
-  // @ts-ignore
-  const successGroup: DpResultByMonthResData[] = res.filter(v => !v.error);
-  const mergedData = {}
-  successGroup.forEach(item => {
-    const monthData = item.years[year];
-    if (monthData) {
-      Object.keys(monthData).forEach(month => {
-        if (mergedData[month] === undefined) {
-          mergedData[month] = 0
-        }
-        const monthNum = Number(monthData[month])
-        mergedData[month] += Number(isNumber(monthNum) ? monthNum : 0)
-      })
+    const year = dateStr;
+    let successGroup = dpResultByMonthCache;
+    if (!successGroup) {
+        const promiseGroup = devIdGroup.map(devId =>
+            getDpResultByMonth(devId, addEleDpCode, 'sum').catch(error => ({error}))
+        );
+        // @ts-ignore
+        dpResultByMonthCache = (await Promise.all(promiseGroup)).filter(v => !v.error);
+        successGroup = dpResultByMonthCache
     }
-  })
-  const curMonthList = Object.keys(mergedData).sort((a, b) => parseInt(b) - parseInt(a));
-  return curMonthList.map(month => {
-    return {
-      key: `${monthFormat(month)} ${year}`,
-      value: (Number(mergedData[month]) || 0).toFixed(2),
-      headlineText: `${year}${month}`,
-      chartTitle: `${monthFormatShort(month)}\n${year}`
+    if (!successGroup) {
+        return []
     }
-  })
+    // @ts-ignore
+    const mergedData = {}
+    successGroup.forEach(item => {
+        const monthData = item.years[year];
+        if (monthData) {
+            Object.keys(monthData).forEach(month => {
+                if (mergedData[month] === undefined) {
+                    mergedData[month] = 0
+                }
+                const monthNum = Number(monthData[month])
+                mergedData[month] += Number(isNumber(monthNum) ? monthNum : 0)
+            })
+        }
+    })
+    const curMonthList = Object.keys(mergedData).sort((a, b) => parseInt(b) - parseInt(a));
+    return curMonthList.map(month => {
+        return {
+            key: `${monthFormat(month)} ${year}`,
+            value: (Number(mergedData[month]) || 0).toFixed(2),
+            headlineText: `${year}${month}`,
+            chartTitle: `${monthFormatShort(month)}\n${year}`
+        }
+    })
 }
 
 
 const getDpResultByYearMonth = async (deviceIdGroup: string[], addEleDpCode: string, dateStr: string): Promise<OverviewItem[]> => {
-  const date = dayjs(dateStr)
-  const startDay = date.startOf('month').format('YYYYMMDD')
-  const endDay = date.endOf('month').format('YYYYMMDD')
-  const promiseGroup = deviceIdGroup.map(devId => getDataWithSpecified(devId, addEleDpCode, startDay, endDay, 'sum').catch(error => ({error})))
-  const res = await Promise.all(promiseGroup);
-  // @ts-ignore
-  const successGroup: DpResultByDataWithSpecifiedResData[] = res.filter(v => !v.error);
-  const mergedData = {}
-  successGroup.forEach(item => {
-    if (item.result) {
-      Object.keys(item.result).forEach(day => {
-        if (mergedData[day] === undefined) {
-          mergedData[day] = 0
+    const date = dayjs(dateStr)
+    const startDay = date.startOf('month').format('YYYYMMDD')
+    const endDay = date.endOf('month').format('YYYYMMDD')
+    const promiseGroup = deviceIdGroup.map(devId => getDataWithSpecified(devId, addEleDpCode, startDay, endDay, 'sum').catch(error => ({error})))
+    const res = await Promise.all(promiseGroup);
+    // @ts-ignore
+    const successGroup: DpResultByDataWithSpecifiedResData[] = res.filter(v => !v.error);
+    const mergedData = {}
+    successGroup.forEach(item => {
+        if (item.result) {
+            Object.keys(item.result).forEach(day => {
+                if (mergedData[day] === undefined) {
+                    mergedData[day] = 0
+                }
+                const dayNum = Number(item.result[day])
+                mergedData[day] += Number(isNumber(dayNum) ? dayNum : 0)
+            })
         }
-        const dayNum = Number(item.result[day])
-        mergedData[day] += Number(isNumber(dayNum) ? dayNum : 0)
-      })
-    }
-  })
-  return Object.keys(mergedData).filter(v => Number(mergedData[v]) > 0).map(time => {
-    // 提取年、月和日
-    const year = time.slice(0, 4);
-    const month = time.slice(4, 6);
-    const day = time.slice(6, 8);
+    })
+    return Object.keys(mergedData).filter(v => Number(mergedData[v]) > 0).map(time => {
+        // 提取年、月和日
+        const year = time.slice(0, 4);
+        const month = time.slice(4, 6);
+        const day = time.slice(6, 8);
 
-    // 格式化为 'YYYY/MM/DD' 格式
-    const formattedDate = `${year}/${month}/${day}`
-    const dateStr = `${day}/${month}/${year}`
-    const dateObj = dayjs(formattedDate, "YYYY/MM/DD");
-    const dayOfWeek = dateObj.day() % 7;
-    const key = `${dateStr} (${loopsText[dayOfWeek]})`
-    return {
-      key,
-      value: Number(mergedData[time] || 0).toFixed(2),
-      headlineText: formattedDate,
-      chartTitle: `${Number(key?.split('/')[0])}\n${loopsText[dayOfWeek]}`
-    }
-  })
+        // 格式化为 'YYYY/MM/DD' 格式
+        const formattedDate = `${year}/${month}/${day}`
+        const dateStr = `${day}/${month}/${year}`
+        const dateObj = dayjs(formattedDate, "YYYY/MM/DD");
+        const dayOfWeek = dateObj.day() % 7;
+        const key = `${dateStr} (${loopsText[dayOfWeek]})`
+        return {
+            key,
+            value: Number(mergedData[time] || 0).toFixed(2),
+            headlineText: formattedDate,
+            chartTitle: `${Number(key?.split('/')[0])}\n${loopsText[dayOfWeek]}`
+        }
+    })
 }
 
 
 const getDpResultByDate = async (deviceIdGroup: string[], addEleDpCode: string, date: string): Promise<OverviewItem[]> => {
-  if (overDays(date, 7)) {
-    console.log("getDpResultByDate overDays true")
-    return []
-  }
-  const promiseGroup = deviceIdGroup.map(devId => getDpResultByHour(devId, addEleDpCode, date, 'sum').catch(error => ({error})))
-  const res = await Promise.all(promiseGroup);
-  // @ts-ignore
-  const successGroup: DpResultByDataWithSpecifiedResData[] = res.filter(v => !v.error);
-  const mergedData = {}
-  successGroup.forEach(item => {
-    if (item) {
-      Object.keys(item).forEach(day => {
-        if (mergedData[day] === undefined) {
-          mergedData[day] = 0
-        }
-        const dayNum = Number(item[day])
-        mergedData[day] += Number(isNumber(dayNum) ? dayNum : 0)
-      })
+    if (overDays(date, 7)) {
+        console.log("getDpResultByDate overDays true")
+        return []
     }
-  });
+    const promiseGroup = deviceIdGroup.map(devId => getDpResultByHour(devId, addEleDpCode, date, 'sum').catch(error => ({error})))
+    const res = await Promise.all(promiseGroup);
+    // @ts-ignore
+    const successGroup: DpResultByDataWithSpecifiedResData[] = res.filter(v => !v.error);
+    const mergedData = {}
+    successGroup.forEach(item => {
+        if (item) {
+            Object.keys(item).forEach(day => {
+                if (mergedData[day] === undefined) {
+                    mergedData[day] = 0
+                }
+                const dayNum = Number(item[day])
+                mergedData[day] += Number(isNumber(dayNum) ? dayNum : 0)
+            })
+        }
+    });
 
 
-  const list: Array<OverviewItem> = []
-  const resData = Object.keys(mergedData)?.map(val => {
-    return {key: Number(val?.slice(8, 10)), value: Number(mergedData[val])}
-  })
-  for (let i = 0; i <= 23; i++) {
-    const hourData = resData?.find(val => val?.key === i)
-    const hourKey = hourData?.key || i
-    const hourValue = Number(hourData?.value) || 0
-    list.push({
-      key: `${hourKey.toString().padStart(2, '0')}:00`,
-      value: hourValue,
-      chartTitle: `${hourKey}:00`,
-      headlineText: `${hourKey}:00`
+    const list: Array<OverviewItem> = []
+    const resData = Object.keys(mergedData)?.map(val => {
+        return {key: Number(val?.slice(8, 10)), value: Number(mergedData[val])}
     })
-  }
-  return list
+    for (let i = 0; i <= 23; i++) {
+        const hourData = resData?.find(val => val?.key === i)
+        const hourKey = hourData?.key || i
+        const hourValue = Number(hourData?.value) || 0
+        list.push({
+            key: `${hourKey.toString().padStart(2, '0')}:00`,
+            value: hourValue,
+            chartTitle: `${hourKey}:00`,
+            headlineText: `${hourKey}:00`
+        })
+    }
+    return list
 }

package/src/modules/energyConsumption/EnergyConsumptionChart.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback } from "react";
-import { Platform, View, StyleSheet, Image, Text} from "react-native";
+import { Platform, View, StyleSheet, Image, 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";
@@ -18,6 +18,7 @@ import DateTypeItem from "@ledvance/group-ui-biz-bundle/src/modules/energyConsum
 import DateSelectedItem from "@ledvance/group-ui-biz-bundle/src/modules/energyConsumption/component/DateSelectedItem";
 import NewBarChart from "@ledvance/group-ui-biz-bundle/src/modules/energyConsumption/component/NewBarChart";
 import { getElectricity } from "@ledvance/group-ui-biz-bundle/src/modules/energyConsumption/EnergyConsumptionActions";
+import DateSwitch from "./component/DateSwitch";
 
 const { convertX: cx, height, width } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
@@ -49,6 +50,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) => {
@@ -87,7 +96,9 @@ const EnergyConsumptionChart = (props: { theme?: ThemeType }) => {
     getElectricity(deviceIdGroup, addEleDpCode, state.date, state.dateType).then((res) => {
       state.chartData = res;
       state.loading = false;
-    })
+    }).catch(()=>{
+      state.loading = false;
+    });
   }, [state.date]);
 
   useUpdateEffect(() => {
@@ -127,7 +138,7 @@ const EnergyConsumptionChart = (props: { theme?: ThemeType }) => {
   }, [state.dateType, state.headlineText]);
 
   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}
           greeneryIcon={res.energy_consumption_greenery}
           loading={state.loading}
           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/modules/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 res from "@ledvance/base/src/res";
+import dayjs from "dayjs";
+import {DateType} from "../co2Data";
+
+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/modules/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";
@@ -29,7 +29,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,
@@ -57,7 +70,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/modules/fixedTimeForPlug/FixedTimeForPlugPage.tsx

@@ -14,6 +14,7 @@ import {Utils} from "tuya-panel-kit";
 import ItemCard from "./ItemCard";
 import InfoText from "@ledvance/base/src/components/InfoText";
 import ThemeType from '@ledvance/base/src/config/themeType'
+import { showDialog } from "@ledvance/base/src/utils/common";
 
 const {convertX: cx, topBarHeight} = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
@@ -114,6 +115,19 @@ const FixedTimeForPlugPage = (props: { theme?: ThemeType}) => {
               onPress={() => {
                 onAddOrEditItem('edit', item)
               }}
+              onLongPress={async () =>{
+                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}`}

package/src/modules/fixedTimeForPlug/ItemCard.tsx

@@ -18,10 +18,11 @@ export interface ItemCardProps {
   is24Hour?: boolean,
   onSwitch: (enable: boolean) => void
   onPress: () => void
+  onLongPress: () => void
 }
 
 const ItemCard = (props: ItemCardProps) => {
-  const {item, is24Hour, onSwitch, onPress} = props
+  const {item, is24Hour, onSwitch, onPress, onLongPress} = props
   // 判断是否关闭
   const closed = getIsClosed(item)
 
@@ -50,7 +51,7 @@ const ItemCard = (props: ItemCardProps) => {
   })
 
   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/fixedTimingForLight/FixedTimingForLightPage.tsx

@@ -14,6 +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";
 
 const {convertX: cx, topBarHeight} = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
@@ -119,6 +120,19 @@ const FixedTimeForLightPage =  (props: { theme?: ThemeType}) => {
               onPress={() => {
                 onAddOrEditItem('edit', item)
               }}
+              onLongPress={async () =>{
+                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}`}

package/src/modules/fixedTimingForLight/ItemCard.tsx

@@ -18,10 +18,11 @@ export interface ItemCardProps {
   is24Hour?: boolean,
   onSwitch: (enable: boolean) => void
   onPress: () => void
+  onLongPress: () => void
 }
 
 const ItemCard = (props: ItemCardProps) => {
-  const {item, is24Hour, onSwitch, onPress} = props
+  const {item, is24Hour, onSwitch, onPress, onLongPress} = props
   // 判断是否关闭
   const closed = getIsClosed(item)
 
@@ -50,7 +51,7 @@ const ItemCard = (props: ItemCardProps) => {
   })
 
   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/flags/FlagActions.ts

@@ -71,7 +71,9 @@ export const useFlag: UseFlagType = (params) => {
       const dps = {}
       const { flag } = flagData
       if (!(params.isStripLight || params.isCeilingLight)){
-        const moodDp = obj2Dp(flag, params)
+        const cloneFlag = cloneDeep(flag)
+        cloneFlag.colors = cloneFlag.colors.reverse()
+        const moodDp = obj2Dp(cloneFlag, params)
         if (params.isStringLight){
           dps[getGlobalParamsDp('rgbic_linerlight_scene')] = moodDp
         }else{

package/src/modules/flags/FlagPage.tsx

@@ -49,6 +49,7 @@ const FlagPage = (props: { theme?: ThemeType }) => {
   const state = useReactive({
     loading: false,
     flags: cloneDeep(flags) as FlagUiInfo[],
+    filterFlags: cloneDeep(flags) as FlagUiInfo[],
     searchText: ''
   })
 
@@ -57,8 +58,8 @@ const FlagPage = (props: { theme?: ThemeType }) => {
   }, [])
 
   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 defNum = uaGroupInfo.groupDevices.filter(device => !(def2Pids.includes(device.tyPid) || def3Pids.includes(device.tyPid))).length
@@ -177,7 +178,7 @@ const FlagPage = (props: { theme?: ThemeType }) => {
         </TouchableOpacity>
       </View>
       <FlatList
-        data={state.flags}
+        data={state.filterFlags}
         renderItem={({ item }) => <FlagItem
           enable={flagMode?.flagId === item.id && flagMode?.flagMode && switch_led}
           title={item.name}