@ledvance/group-ui-biz-bundle 1.0.92 → 1.0.94

package/package.json

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

package/src/modules/biorhythm/BiorhythmBean.ts

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

package/src/modules/diyScene/DiyScenePage.tsx

@@ -2,7 +2,7 @@ import React, {useCallback, useEffect, useMemo} from 'react';
 import Page from '@ledvance/base/src/components/Page';
 import {Utils} from 'tuya-panel-kit';
 import {useDeviceInfo} from '@ledvance/base/src/models/modules/NativePropsSlice';
-import {useReactive} from 'ahooks';
+import {useReactive, useUpdateEffect} from 'ahooks';
 import I18n from '@ledvance/base/src/i18n';
 import res from '@ledvance/base/src/res';
 import {FlatList, Image, Platform, StyleSheet, TouchableOpacity, View} from 'react-native';
@@ -111,6 +111,10 @@ const DiyScenePage = (props: { theme?: ThemeType }) => {
     [workMode, switchLed, sceneStatusId]
   );
 
+  useUpdateEffect(() => {
+    state.originScenes = cloneDeep(scenes) as DiySceneInfo[];
+  }, [scenes]);
+
   const nameRepeat = useCallback((scene: DiySceneInfo) => {
     return !!state.originScenes.filter(m => m.id !== scene.id).find(m => m.name === scene.name)
   }, [state.originScenes])
@@ -231,7 +235,7 @@ const DiyScenePage = (props: { theme?: ThemeType }) => {
                               subTitle: I18n.getLang('reset_mooddescription'),
                               onConfirm: async (_, { close }) => {
                                 close()
-                                resetMixScenes()
+                                resetMixScenes().then();
                               }
                             })
                           }}

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}

package/src/modules/mood_new/Interface.ts

@@ -93,6 +93,7 @@ export interface DefMoodOption extends LightCategory{
   isSupportColor: boolean;
   isSupportTemperature: boolean;
   isSupportBrightness: boolean;
+  isRefresh?: boolean
 }
 
 export interface MoodDps {

package/src/modules/mood_new/MoodActions.ts

@@ -205,6 +205,18 @@ export const getRemoteMoodList = async (
   devId: string,
   option: DefMoodOption,
 ) => {
+  const defaultScene = getDefMoodList(option);
+  if (option.isRefresh){
+    const res = await setRemoteMoodList(devId, defaultScene, SceneFeatureId)
+    if (res.success){
+      return {
+        success: true,
+        data: defaultScene.map((item, index) =>
+          remoteMoodInfo2MoodUIState(item, index, option)
+        ),
+      }
+    }
+  }
   const res = await NativeApi.getJson(devId, SceneFeatureId);
   const isNormalData = Array.isArray(parseJSON(res?.data));
   if (res.success && isNormalData) {
@@ -216,7 +228,6 @@ export const getRemoteMoodList = async (
     };
   } else {
     if (res.msg?.includes('资源未找到') || !isNormalData) {
-      const defaultScene = getDefMoodList(option);
       const res = await setRemoteMoodList(devId, defaultScene, SceneFeatureId);
       if (res.success) {
         return {

package/src/modules/mood_new/MoodItem.tsx

@@ -118,8 +118,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/modules/mood_new/MoodPage.tsx

@@ -10,7 +10,7 @@ import {
 import { useReactive } from 'ahooks';
 import Strings from '@ledvance/base/src/i18n';
 import res from '@ledvance/base/src/res';
-import { FlatList, StyleSheet, View, Platform } from 'react-native';
+import { FlatList, StyleSheet, View, Platform, Image, TouchableOpacity } from 'react-native';
 import Tag from '@ledvance/base/src/components/Tag';
 import Spacer from '@ledvance/base/src/components/Spacer';
 import InfoText from '@ledvance/base/src/components/InfoText';
@@ -25,6 +25,8 @@ import { cloneDeep, filter, map } from 'lodash';
 import { useFlagMode } from '../flags/FlagActions';
 import { WorkMode } from '@ledvance/base/src/utils/interface';
 import ThemeType from '@ledvance/base/src/config/themeType'
+import { showDialog } from '@ledvance/base/src/utils/common';
+import I18n from '@ledvance/base/src/i18n';
 
 const cx = Utils.RatioUtils.convertX;
 const { withTheme } = Utils.ThemeUtils
@@ -63,17 +65,7 @@ const MoodPage = (props: {theme?: ThemeType}) => {
 
   useEffect(() => {
     state.timerId = setTimeout(() => {
-      state.loading = true
-      getRemoteMoodList(
-        uaGroupInfo.tyGroupId.toString(),
-        params
-      ).then(res => {
-        state.loading = false
-        if (res.success && Array.isArray(res.data)) {
-          state.originMoods = cloneDeep(res.data);
-          console.log(state.originMoods, '< --- originMoods')
-        }
-      });
+      getMoodList()
     }, 250);
 
     return () => {
@@ -93,6 +85,21 @@ const MoodPage = (props: {theme?: ThemeType}) => {
     });
   }, [state.staticTagChecked, state.dynamicTagChecked, state.originMoods]);
 
+  const getMoodList = (isRefresh?: boolean) =>{
+    state.loading = true 
+    getRemoteMoodList(
+      uaGroupInfo.tyGroupId.toString(),
+      {...params, isRefresh}
+    ).then(res => {
+      state.loading = false
+      if (res.success && Array.isArray(res.data)) {
+        state.originMoods = cloneDeep(res.data);
+        setMoods(cloneDeep(res.data));
+      }
+    });
+    state.loading = false
+  }
+
   const navigationRoute = (isStatic: boolean, mode: 'add' | 'edit', currentMood?: MoodUIInfo) => {
     const path =
       mode === 'add'
@@ -307,6 +314,21 @@ const MoodPage = (props: {theme?: ThemeType}) => {
                 }}
             />
         </View>}
+        <TouchableOpacity style={{ alignItems: 'flex-end',paddingRight: cx(24) }}
+          onPress={() => {
+            showDialog({
+              method: 'confirm',
+              title: I18n.getLang('mood_resetbutton'),
+              subTitle: I18n.getLang('reset_mooddescription'),
+              onConfirm: (_, { close }) => {
+                close()
+                getMoodList(true)
+              }
+            })
+          }}
+        >
+          <Image source={res.ic_refresh} style={{ width: cx(24), height: cx(24) }} />
+        </TouchableOpacity>
         <Spacer height={cx(10)} />
         {state.originMoods.length >= MAX_MOOD_COUNT && (
           <View style={styles.infoLine}>

package/src/modules/randomTimeForPlug/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/randomTimeForPlug/RandomTimeForPlugPage.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
@@ -128,6 +129,19 @@ const RandomTimeForPlugPage = (props: { theme?: ThemeType}) => {
               onPress={() => {
                 onAddOrEditItem('edit', item)
               }}
+              onLongPress={async () =>{
+                showDialog({
+                  method: 'confirm',
+                  title: I18n.getLang('cancel_dialog_delete_item_randomtimecycle_titel'),
+                  subTitle: I18n.getLang('cancel_dialog_delete_item_randomtimecycle_description'),
+                  onConfirm: async (_, {close}) => {
+                    close()
+                    state.loading = true
+                    await onPost('del', item)
+                    state.loading = false 
+                  }
+                })
+              }}
             />
           )}
           keyExtractor={(item: any) => `${item?.index}`}

package/src/modules/randomTimingForLight/RandomTimingForLightPage.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
@@ -131,6 +132,19 @@ const RandomTimeForLightPage = (props: { theme?: ThemeType}) => {
               onPress={() => {
                 onAddOrEditItem('edit', item)
               }}
+              onLongPress={async () =>{
+                showDialog({
+                  method: 'confirm',
+                  title: I18n.getLang('cancel_dialog_delete_item_randomtimecycle_titel'),
+                  subTitle: I18n.getLang('cancel_dialog_delete_item_randomtimecycle_description'),
+                  onConfirm: async (_, {close}) => {
+                    close()
+                    state.loading = true
+                    await onPost('del', item)
+                    state.loading = false 
+                  }
+                })
+              }}
             />
           )}
           keyExtractor={(item: any) => `${item?.index}`}

package/src/modules/sleepWakeUp/SleepWakeUpPage.tsx

@@ -10,7 +10,7 @@ import {useDeviceInfo, useSystemTimeFormate} from "@ledvance/base/src/models/mod
 import {useReactive, useUpdateEffect} from "ahooks";
 import CustomListDialog from "@ledvance/base/src/components/CustomListDialog";
 import {SwitchButton, Utils} from "tuya-panel-kit";
-import {convertMinutesTo12HourFormat, getIsClosed, loopText} from "@ledvance/base/src/utils/common";
+import {convertMinutesTo12HourFormat, getIsClosed, loopText, 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";
@@ -49,6 +49,7 @@ const SleepWakeUpPage = (props: {theme?: ThemeType}) => {
     sleepScheduleList: cloneDeep(sleepList),
     wakeUpScheduleList: cloneDeep(wakeUpList),
     filteredScheduleList: [] as any[],
+    loading: false 
   })
 
   const isMaxNum = useMemo(() => {
@@ -192,7 +193,7 @@ const SleepWakeUpPage = (props: {theme?: ThemeType}) => {
       alignItems: 'center'
     },
     emptyBtn: {
-      backgroundColor: props.theme?.button.primary,
+      backgroundColor: props.theme?.button.active,
       borderRadius: cx(5),
       paddingHorizontal: cx(15),
       paddingVertical: cx(10)
@@ -255,6 +256,7 @@ const SleepWakeUpPage = (props: {theme?: ThemeType}) => {
         onHeadlineIconClick={() => {
           state.showAddSchedulePopover = !state.showAddSchedulePopover
         }}
+        loading={state.loading}
       >
         <View style={{ marginHorizontal: cx(24) }}>
           <Text style={{ color: props.theme?.global.fontColor, fontSize: cx(12) }}>
@@ -302,6 +304,32 @@ const SleepWakeUpPage = (props: {theme?: ThemeType}) => {
                     settingTime: new Date().getTime()
                   })
                 }}
+                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)} />)}
@@ -374,16 +402,17 @@ const SleepWakeUpPage = (props: {theme?: ThemeType}) => {
   )
 }
 
-const SleepWakeUpCard = ({ sleepWakeUp, is24HourClock, onSwitch, onPress, styles }: {
+const SleepWakeUpCard = ({ sleepWakeUp, is24HourClock, onSwitch, onPress, onLongPress, styles }: {
   sleepWakeUp: SleepWakeUpItem,
   onSwitch: (enable: boolean) => void,
   onPress: () => void
+  onLongPress: () => void
   is24HourClock: boolean
   styles: StyleSheet.NamedStyles<any>
 }) => {
   const closed = getIsClosed({weeks: sleepWakeUp.weeks, settingTime: sleepWakeUp.settingTime, endTime: getEndTime(sleepWakeUp)})
   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}>
@@ -393,7 +422,7 @@ const SleepWakeUpCard = ({ sleepWakeUp, is24HourClock, onSwitch, onPress, styles
           thumbStyle={{ elevation: 0 }}
           onValueChange={onSwitch} />
       </View>
-      <Text style={styles.loopText}>{loopText(sleepWakeUp.weeks, parseTimer(getStartTime(sleepWakeUp) * 60))}</Text>
+      <Text style={styles.loopText}>{loopText(sleepWakeUp.weeks, parseTimer(getEndTime(sleepWakeUp) * 60))}</Text>
       <Spacer height={cx(5)} />
       <Text style={styles.loopText}>{sleepWakeUp.name}</Text>
       <Spacer height={cx(10)} />

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

@@ -15,11 +15,12 @@ interface ScheduleCardProps {
   item: Timer
   style?: ViewStyle
   onEnableChange: (enable: boolean) => void
-  onPress: (item: any) => void
+  onPress: () => void
+  onLongPress: () => void
 }
 
 const ScheduleCard = (props: ScheduleCardProps) => {
-  const { item, style, onEnableChange, onPress } = props;
+  const { item, style, onEnableChange, onPress, onLongPress } = props;
   const is24HourClock = useSystemTimeFormate()
 
   const styles = StyleSheet.create({
@@ -67,10 +68,8 @@ const ScheduleCard = (props: ScheduleCardProps) => {
     <Card
       style={styles.card}
       containerStyle={[styles.container, style]}
-      onPress={() => {
-        onPress(item);
-      }}
-    >
+      onPress={onPress}
+      onLongPress={onLongPress}>
       <View style={styles.infoContainer}>
         <Text style={styles.time}>{is24HourClock ? item.time : convertTo12HourFormat(item.time)}</Text>
         <Text style={styles.loop}>

package/src/modules/timer/TimerAction.ts

@@ -78,7 +78,7 @@ export function useTimerTasks(timerSettableDps: TimerSettableDp[], devIdGroup: s
         dps[task.dp.code] = task.duration
         const featureKey = timerSettableDps.find(timerSettableDp => timerSettableDp.dp.code === task.dp.code)?.cloudKey
         devIdGroup.forEach(devId => {
-          NativeApi.putJson(devId, task.cloudKey ?? featureKey, JSON.stringify({ [getKey('Status', task.dp.code)]: !!task.duration, [getKey('StartTime', task.dp.code)]: task.startTime, progressAllNumber: task.duration }))
+          NativeApi.putJson(devId, task.cloudKey ?? featureKey, JSON.stringify({ [getKey('Status', task.dp.code)]: !!task.duration, [getKey('StartTime', task.dp.code)]: dayjs(task.startTime * 1000).format('YYYY-MM-DD HH:mm:ss'), progressAllNumber: task.duration }))
         })
       })
       return dps