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

package/src/modules/sleepWakeUp/SleepWakeUpPage.tsx

@@ -1,27 +1,27 @@
-import React, {useCallback, useEffect, useMemo} from "react";
-import {FlatList, Image, StyleSheet, Text, View} from 'react-native'
+import React, { useCallback, useEffect, useMemo } from "react";
+import { FlatList, Image, StyleSheet, Text, View } from 'react-native'
 import Page from '@ledvance/base/src/components/Page'
 import Tag from '@ledvance/base/src/components/Tag'
 import Spacer from '@ledvance/base/src/components/Spacer'
-import {useNavigation} from '@react-navigation/native'
+import { useNavigation } from '@react-navigation/native'
 import I18n from '@ledvance/base/src/i18n'
 import res from '@ledvance/base/src/res'
-import {useDeviceInfo, useSystemTimeFormate} from "@ledvance/base/src/models/modules/NativePropsSlice";
-import {useReactive, useUpdateEffect} from "ahooks";
+import { useDeviceInfo, useSystemTimeFormate } from "@ledvance/base/src/models/modules/NativePropsSlice";
+import { useReactive, useUpdateEffect } from "ahooks";
 import CustomListDialog from "@ledvance/base/src/components/CustomListDialog";
-import {SwitchButton, Utils} from "tuya-panel-kit";
-import {convertMinutesTo12HourFormat, getIsClosed, loopText, showDialog} from "@ledvance/base/src/utils/common";
+import { Dialog, SwitchButton, Utils } from "tuya-panel-kit";
+import { convertMinutesTo12HourFormat, getGlobalParamsDp, getIsClosed, isConflictTask, 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";
+import { ui_biz_routerKey } from "../../navigation/Routers";
+import { cloneDeep } from "lodash";
 import Card from "@ledvance/base/src/components/Card";
-import {useParams} from "@ledvance/base/src/hooks/Hooks";
-import {ApplyForItem} from "@ledvance/base/src/utils/interface";
-import {getEndTime, getStartTime, SleepWakeUpItem, useSleepPlan, useWakeUpPlan} from "./SleepWakeUpActions";
+import { useParams } from "@ledvance/base/src/hooks/Hooks";
+import { ApplyForItem } from "@ledvance/base/src/utils/interface";
+import { encodeSleepOrWakeUp, getEndTime, getStartTime, SleepWakeUpItem, useSleepPlan, useWakeUpPlan } from "./SleepWakeUpActions";
 import ThemeType from '@ledvance/base/src/config/themeType'
 
 const cx = Utils.RatioUtils.convertX
-const {parseTimer} = Utils.TimeUtils
+const { parseTimer } = Utils.TimeUtils
 const { withTheme } = Utils.ThemeUtils
 
 export interface SleepWakeUpPageRouteParams {
@@ -35,7 +35,7 @@ export interface SleepWakeUpPageRouteParams {
 }
 
 const MAX_SCHEDULE = 4
-const SleepWakeUpPage = (props: {theme?: ThemeType}) => {
+const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
   const deviceInfo = useDeviceInfo()
   const navigation = useNavigation()
   const is24HourClock = useSystemTimeFormate()
@@ -49,23 +49,23 @@ const SleepWakeUpPage = (props: {theme?: ThemeType}) => {
     sleepScheduleList: cloneDeep(sleepList),
     wakeUpScheduleList: cloneDeep(wakeUpList),
     filteredScheduleList: [] as any[],
-    loading: false 
+    loading: false
   })
 
   const isMaxNum = useMemo(() => {
     return state.sleepScheduleList.length >= MAX_SCHEDULE && state.wakeUpScheduleList.length >= MAX_SCHEDULE
-  }, [state.sleepScheduleList, state.wakeUpScheduleList])
+  }, [JSON.stringify(state.sleepScheduleList), JSON.stringify(state.wakeUpScheduleList)])
 
-  useUpdateEffect(() =>{
+  useUpdateEffect(() => {
     state.sleepScheduleList = cloneDeep(sleepList)
-  }, [sleepList])
+  }, [JSON.stringify(sleepList)])
 
-  useUpdateEffect(() =>{
+  useUpdateEffect(() => {
     state.wakeUpScheduleList = cloneDeep(wakeUpList)
-  }, [wakeUpList])
+  }, [JSON.stringify(wakeUpList)])
 
 
-  const onAddScheduleDialogItemClick = useCallback((isSleep: boolean, mode: 'add' | 'edit', scheduleItem: SleepWakeUpItem) => {
+  const onAddScheduleDialogItemClick = (isSleep: boolean, mode: 'add' | 'edit', scheduleItem: SleepWakeUpItem) => {
     if (mode === 'add' && isSleep && state.sleepScheduleList.length === MAX_SCHEDULE) return
     if (mode === 'add' && !isSleep && state.wakeUpScheduleList.length === MAX_SCHEDULE) return
     navigateToEdit({
@@ -76,9 +76,11 @@ const SleepWakeUpPage = (props: {theme?: ThemeType}) => {
       modDeleteTimeSchedule
     })
     state.showAddSchedulePopover = false
-  }, [state.filteredScheduleList])
+  }
 
-  const modDeleteTimeSchedule = async (mode: 'add' | 'edit' | 'del', isSleep: boolean, sleepWakeUp: SleepWakeUpItem) => {
+  const modDeleteTimeSchedule = async (mode: 'add' | 'edit' | 'del' | 'set', isSleep: boolean, sleepWakeUp: SleepWakeUpItem) => {
+    const conflictDps = {}
+    const conflictConfig = {}
     let cloneSleepWakeUp: SleepWakeUpItem[] = isSleep ? cloneDeep(state.sleepScheduleList) : cloneDeep(state.wakeUpScheduleList)
     if (mode === 'add') {
       cloneSleepWakeUp = [
@@ -92,7 +94,7 @@ const SleepWakeUpPage = (props: {theme?: ThemeType}) => {
     if (mode === 'del') {
       cloneSleepWakeUp = cloneSleepWakeUp.filter(item => sleepWakeUp.index !== item.index)
     }
-    if (mode === 'edit') {
+    if (mode === 'edit' || mode === 'set') {
       cloneSleepWakeUp = cloneSleepWakeUp.map(item => {
         if (item.index === sleepWakeUp.index) {
           return sleepWakeUp
@@ -100,18 +102,98 @@ const SleepWakeUpPage = (props: {theme?: ThemeType}) => {
         return item
       })
     }
+    if (((mode === 'edit' || mode === 'set') && sleepWakeUp.enable) || mode === 'add') {
+      let sleepConflict = false
+      let wakeUpConflict = false
+      const cloneSleepPlan = isSleep ? cloneSleepWakeUp : cloneDeep(sleepList)
+      const cloneWakeUpPlan = isSleep ? cloneDeep(wakeUpList) : cloneSleepWakeUp
+      const currentSleepWakeUp = {
+        ...sleepWakeUp,
+        startTime: getStartTime(sleepWakeUp),
+        endTime: getEndTime(sleepWakeUp)
+      }
+      const newSleepList = cloneSleepPlan.map((item, idx) => {
+        const itself = isSleep ? (mode === 'add' ? (idx === cloneSleepPlan.length - 1) : sleepWakeUp.index === item.index) : isSleep
+        if (!itself && item.enable && isConflictTask({
+          ...item,
+          startTime: getStartTime(item),
+          endTime: getEndTime(item)
+        }, currentSleepWakeUp)) {
+          sleepConflict = true
+          item.enable = false
+          return item
+        }
 
-    const res = isSleep ? await setSleepList(cloneSleepWakeUp) : await setWakeUpList(cloneSleepWakeUp)
-    if(res.success){
-      if(isSleep){
+        return item
+      })
+      const newWakeUpList = cloneWakeUpPlan.map((item, idx) => {
+        const itself = !isSleep ? (mode === 'add' ? (idx === cloneWakeUpPlan.length - 1) : sleepWakeUp.index === item.index) : !isSleep
+        if (!itself && item.enable && isConflictTask({
+          ...item,
+          startTime: getStartTime(item),
+          endTime: getEndTime(item)
+        }, currentSleepWakeUp)) {
+          wakeUpConflict = true
+          item.enable = false
+          return item
+        }
+        return item
+      })
+      const isConflict = sleepConflict || wakeUpConflict
+      if (isSleep) {
+        if (wakeUpConflict) {
+          conflictDps[getGlobalParamsDp('wakeup_mode')] = encodeSleepOrWakeUp(newWakeUpList)
+          conflictConfig['wakeupMode'] = newWakeUpList
+        }
+      } else {
+        if (sleepConflict) {
+          conflictDps[getGlobalParamsDp('sleep_mode')] = encodeSleepOrWakeUp(newSleepList)
+          conflictConfig['sleepMode'] = newSleepList
+        }
+      }
+      if (isConflict && mode === 'set') {
+        return new Promise((resolve) => {
+          showDialog({
+            method: 'confirm',
+            title: I18n.getLang(isSleep ? 'conflict_dialog_active_item_sleepschedule_titel' : 'conflict_dialog_active_item_wakeupschedule_titel'),
+            subTitle: I18n.getLang(isSleep ? 'conflict_dialog_active_item_sleepschedule_description' : 'conflict_dialog_active_item_wakeupschedule_description'),
+            onConfirm: async (_, { close }) => {
+              close()
+              const res = isSleep ? await setSleepList(newSleepList, conflictDps, conflictConfig) : await setWakeUpList(newWakeUpList, conflictDps, conflictConfig)
+              if (isSleep) {
+                state.sleepScheduleList = cloneDeep(newSleepList)
+              } else {
+                state.wakeUpScheduleList = cloneDeep(newWakeUpList)
+              }
+              resolve(res)
+            },
+            onCancel: () => {
+              resolve({
+                success: false
+              })
+              Dialog.close()
+            }
+          })
+        })
+      }
+      if (isSleep) {
+        cloneSleepWakeUp = newSleepList
+      } else {
+        cloneSleepWakeUp = newWakeUpList
+      }
+    }
+    const res = isSleep ? await setSleepList(cloneSleepWakeUp, conflictDps, conflictConfig) : await setWakeUpList(cloneSleepWakeUp, conflictDps, conflictConfig)
+    console.log(cloneSleepWakeUp, '< --- cloneSleepWakeUp')
+    if (res.success) {
+      if (isSleep) {
         state.sleepScheduleList = cloneDeep(cloneSleepWakeUp)
-      }else{
+      } else {
         state.wakeUpScheduleList = cloneDeep(cloneSleepWakeUp)
       }
       return {
         success: true
       }
-    }else{
+    } else {
       return {
         success: false
       }
@@ -126,7 +208,7 @@ const SleepWakeUpPage = (props: {theme?: ThemeType}) => {
     } else {
       state.filteredScheduleList = state.wakeUpScheduleList
     }
-  }, [state.sleepTagChecked, state.wakeUpTagChecked, state.sleepScheduleList, state.wakeUpScheduleList])
+  }, [state.sleepTagChecked, state.wakeUpTagChecked, JSON.stringify(state.sleepScheduleList), JSON.stringify(state.wakeUpScheduleList)])
 
   const getTipText = useCallback(() => {
     if (state.sleepScheduleList.length >= MAX_SCHEDULE && state.wakeUpScheduleList.length >= MAX_SCHEDULE) return "both"
@@ -193,7 +275,7 @@ const SleepWakeUpPage = (props: {theme?: ThemeType}) => {
       alignItems: 'center'
     },
     emptyBtn: {
-      backgroundColor: props.theme?.button.active,
+      backgroundColor: props.theme?.button.primary,
       borderRadius: cx(5),
       paddingHorizontal: cx(15),
       paddingVertical: cx(10)
@@ -266,9 +348,9 @@ const SleepWakeUpPage = (props: {theme?: ThemeType}) => {
         <Spacer />
         {!!getTipText() && <View style={{ marginHorizontal: cx(24), marginVertical: cx(10), flexDirection: 'row', alignItems: 'center' }}>
           <Image style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.warning }} source={res.ic_warning_amber} />
-          {getTipText() === "sleep" && <Text style={{fontSize: cx(12), color: props.theme?.global.secondFontColor}}>{I18n.getLang('sleepwakeschedule_warning_max_number_sleep_text')}</Text>}
-          {getTipText() === "wakeup" && <Text style={{fontSize: cx(12), color: props.theme?.global.secondFontColor}}>{I18n.getLang('sleepwakeschedule_warning_max_number_wakeup_text')}</Text>}
-          {getTipText() === "both" && <Text style={{fontSize: cx(12), color: props.theme?.global.secondFontColor}}>{I18n.getLang('sleepwakeschedule_warning_max_number_both_text')}</Text>}
+          {getTipText() === "sleep" && <Text style={{ fontSize: cx(12), color: props.theme?.global.secondFontColor }}>{I18n.getLang('sleepwakeschedule_warning_max_number_sleep_text')}</Text>}
+          {getTipText() === "wakeup" && <Text style={{ fontSize: cx(12), color: props.theme?.global.secondFontColor }}>{I18n.getLang('sleepwakeschedule_warning_max_number_wakeup_text')}</Text>}
+          {getTipText() === "both" && <Text style={{ fontSize: cx(12), color: props.theme?.global.secondFontColor }}>{I18n.getLang('sleepwakeschedule_warning_max_number_both_text')}</Text>}
           <Spacer />
         </View>}
         {hasScheduleList() && <View style={styles.tagLine}>
@@ -298,13 +380,13 @@ const SleepWakeUpPage = (props: {theme?: ThemeType}) => {
                   onAddScheduleDialogItemClick(item.isSleep, 'edit', item)
                 }}
                 onSwitch={async (v) => {
-                  await modDeleteTimeSchedule('edit', item.isSleep, {
+                  await modDeleteTimeSchedule('set', item.isSleep, {
                     ...item,
                     enable: v,
                     settingTime: new Date().getTime()
                   })
                 }}
-                onLongPress={() =>{
+                onLongPress={() => {
                   showDialog({
                     method: 'confirm',
                     title: I18n.getLang(
@@ -410,7 +492,7 @@ const SleepWakeUpCard = ({ sleepWakeUp, is24HourClock, onSwitch, onPress, onLong
   is24HourClock: boolean
   styles: StyleSheet.NamedStyles<any>
 }) => {
-  const closed = getIsClosed({weeks: sleepWakeUp.weeks, settingTime: sleepWakeUp.settingTime, endTime: getEndTime(sleepWakeUp)})
+  const closed = getIsClosed({ weeks: sleepWakeUp.weeks, settingTime: sleepWakeUp.settingTime, endTime: getEndTime(sleepWakeUp) })
   return (
     <Card style={styles.randomTimingCard} onPress={onPress} onLongPress={onLongPress}>
       <Spacer height={cx(16)} />
@@ -441,7 +523,7 @@ const getNewSleepWakeUp = (isSleep: boolean, params: SleepWakeUpPageRouteParams)
   const hour = isSleep ? 23 : 7
   return {
     enable: true,
-    name: '',
+    name: `${I18n.getLang(isSleep ? 'sleepwakeschedule_field_3_Times_chips2_text' : 'sleepwakeschedule_field_3_Times_chips_text')}`,
     weeks: [0, 0, 0, 0, 0, 0, 0],
     fade: 6,
     time: hour * 60,

package/src/modules/timeSchedule/TimeScheduleDetailPage.tsx

@@ -231,7 +231,7 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
       (state.timeSchedule.aliasName.length && state.timeSchedule.aliasName.length < 33) &&
       state.selectedSkill.length &&
       (state.isManual ? state.isManual : !!state.mood) &&
-      !isModify &&
+      (!isModify || params.mode === 'add') &&
       !showMoodFanSelectText
     );
   }, [state.timeSchedule.aliasName, state.selectedSkill, isModify, state.isManual, state.mood, showMoodFanSelectText]);
@@ -350,6 +350,7 @@ const TimeScheduleDetailPage = (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}
@@ -681,7 +682,7 @@ const newTimeSchedule = () => {
     status: 1,
     loops: '0000000',
     isAppPush: false,
-    aliasName: '',
+    aliasName: I18n.getLang('timeschedule_add_schedule_system_back_text'),
     time: `${toFixedString(new Date().getHours(), 2)}:${toFixedString(new Date().getMinutes(), 2)}`,
     dps: {},
     id: -1,

package/src/modules/timeSchedule/TimeSchedulePage.tsx

@@ -21,6 +21,7 @@ import ScheduleCard from './components/ScheduleCard';
 import { ui_biz_routerKey } from "../../navigation/Routers";
 import { ApplyForItem } from '@ledvance/base/src/utils/interface';
 import ThemeType from '@ledvance/base/src/config/themeType'
+import { showDialog } from '@ledvance/base/src/utils/common';
 
 const { convertX: cx } = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
@@ -112,7 +113,6 @@ const TimeSchedulePage = (props: { theme?: ThemeType }) => {
     const res = await getTimeSchedule({
       bizId: uaGroupInfo.tyGroupId.toString()
     })
-    console.log(res, '< --- res --- >')
     if (res.success) {
       state.timeScheduleList = res.data || []
     } else {
@@ -186,6 +186,20 @@ const TimeSchedulePage = (props: { theme?: ThemeType }) => {
                 onPress={() => {
                   navigateToEdit('edit', item);
                 }}
+                onLongPress={() =>{
+                  showDialog({
+                    method: 'confirm',
+                    title: I18n.getLang('cancel_dialog_delete_item_timeschedule_titel'),
+                    subTitle: I18n.getLang('cancel_dialog_delete_item_timeschedule_description'),
+                    onConfirm: async (_, { close }) => {
+                      state.loading = true;
+                      close();
+                      await modDeleteTimeSchedule('del', {...item, status: 2}, item.id.toString());
+                      state.flag = Symbol()
+                      state.loading = false;
+                    },
+                  });
+                }}
               />
             )}
             keyExtractor={item => item.id.toString()}

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

@@ -1,5 +1,13 @@
 import React, { memo, useMemo } from 'react';
-import { CeilingLightData, DeviceType, FanLightData, ManualSettingProps, StripLightData, directOptions, modeOptions } from '../Interface';
+import {
+  CeilingLightData,
+  DeviceType,
+  FanLightData,
+  ManualSettingProps,
+  StripLightData,
+  directOptions,
+  modeOptions,
+} from '../Interface';
 import { View } from 'react-native';
 import Card from '@ledvance/base/src/components/Card';
 import LampAdjustView from '@ledvance/base/src/components/LampAdjustView';
@@ -17,7 +25,7 @@ import { cloneDeep } from 'lodash';
 import { FanAdjustViewContent } from '@ledvance/base/src/components/FanAdjustView';
 import { cctToColor } from '@ledvance/base/src/utils/cctUtils';
 import {hsv2Hex, mapFloatToRange } from '@ledvance/base/src/utils';
-import { AdjustType } from '@ledvance/base/src/utils/interface';
+import { AdjustType, ApplyForItem } from '@ledvance/base/src/utils/interface';
 const { convertX: cx } = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
 
@@ -69,11 +77,13 @@ function ManualSettings(props: ManualSettingProps) {
 
   const lightSourceCard = useMemo(() => {
     const { deviceData } = state;
-    const getBlockColor = () => {
-      if (!deviceData.isColorMode) return cctToColor(deviceData.temperature)
-      if (deviceData.isColorMode) {
-        const s = Math.round(mapFloatToRange(deviceData.s / 100, 30, 100))
-        return hsv2Hex(deviceData.h, s, 100)
+    const getBlockColor = (item: ApplyForItem) => {
+      if (['light', 'mainLight', 'secondaryLight'].includes(item.type)) {
+        if (!deviceData.isColorMode) return cctToColor(deviceData.temperature)
+        if (deviceData.isColorMode) {
+          const s = Math.round(mapFloatToRange(deviceData.s / 100, 30, 100))
+          return hsv2Hex(deviceData.h, s, 100)
+        }
       }
       return props.theme?.card?.background
     };
@@ -84,7 +94,7 @@ function ManualSettings(props: ManualSettingProps) {
             <Card style={{ marginHorizontal: cx(24) }}>
               <LdvSwitch
                 title={item.name || item.key}
-                color={getBlockColor()}
+                color={getBlockColor(item)}
                 colorAlpha={1}
                 enable={item.enable}
                 setEnable={(enable: boolean) => {