@ledvance/ui-biz-bundle 1.1.105 → 1.1.107

package/src/newModules/timeSchedule/TimeSchedulePage.tsx

@@ -22,6 +22,7 @@ import { ui_biz_routerKey } from '../../navigation/Routers';
 import Tag from '@ledvance/base/src/components/Tag';
 import { cloneDeep } from 'lodash';
 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
@@ -40,6 +41,7 @@ export interface TimeSchedulePageParams {
   isFanLight?: boolean;
   isUVCFan?: boolean;
   isPowerStrip?: boolean
+  isMoodStrip?: boolean
   featureId?: string
   applyForList: ApplyForItem[];
   applyForDisabled?: boolean; // 是否可以选择apply for
@@ -75,6 +77,8 @@ const TimeSchedulePage = (props: { theme?: ThemeType }) => {
   useEffect(() => {
     getTimeSchedule(devId).then(res => {
       state.originList = cloneDeep(res)
+      const status = res?.some(item => item.enable);
+      setTimeScheduleStatus(status);
     });
   }, [state.flag]);
 
@@ -214,6 +218,19 @@ const TimeSchedulePage = (props: { theme?: ThemeType }) => {
               onPress={() => {
                 navigateToEdit('update', 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('delete', item);
+                    state.loading = false;
+                  },
+                });
+              }}
             />
           )}
           keyExtractor={item => item.id.toString()}
@@ -238,12 +255,12 @@ const TimeSchedulePage = (props: { theme?: ThemeType }) => {
             />
             <Spacer height={cx(16)} />
             {!state.originList.length && <DeleteButton
-              style={styles.addBtn}
-              text={`${I18n.getLang('timeschedule_overview_empty_button_add_text')}`}
-              textStyle={{ fontSize: cx(12) }}
-              onPress={() => {
-                navigateToEdit('add');
-              }}
+                style={styles.addBtn}
+                text={`${I18n.getLang('timeschedule_overview_empty_button_add_text')}`}
+                textStyle={{ fontSize: cx(12) }}
+                onPress={() => {
+                  navigateToEdit('add');
+                }}
             />}
           </View>}
       </ScrollView>

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

@@ -1,19 +1,23 @@
-import React, { memo, useMemo } from 'react';
-import { DeviceType, directOptions, FanLightData, ManualSettingProps, modeOptions, StripLightData } from '../Interface';
-import { View } from 'react-native';
+import React, {memo, useMemo} from 'react';
+import {DeviceType, directOptions, FanLightData, ManualSettingProps, modeOptions, StripLightData} from '../Interface';
+import {View} from 'react-native';
 import Card from '@ledvance/base/src/components/Card';
 import LampAdjustView from '@ledvance/base/src/components/LampAdjustView';
-import { Utils } from 'tuya-panel-kit';
-import { useCreation, useReactive, useUpdateEffect } from 'ahooks';
+import {Utils} from 'tuya-panel-kit';
+import {useCreation, useReactive, useUpdateEffect} from 'ahooks';
 import LdvSwitch from '@ledvance/base/src/components/ldvSwitch';
 import ColorTempAdjustView from '@ledvance/base/src/components/ColorTempAdjustView';
 import ColorAdjustView from '@ledvance/base/src/components/ColorAdjustView';
 import I18n from '@ledvance/base/src/i18n';
 import StripAdjustView from '@ledvance/base/src/components/StripAdjustView';
 import Spacer from '@ledvance/base/src/components/Spacer';
-import { FanAdjustViewContent } from '@ledvance/base/src/components/FanAdjustView';
+import {FanAdjustViewContent} from '@ledvance/base/src/components/FanAdjustView';
 import SocketItem from '@ledvance/base/src/components/SocketItem'
 import res from '@ledvance/base/src/res';
+import { cctToColor } from '@ledvance/base/src/utils/cctUtils';
+import {hsv2Hex, mapFloatToRange } from '@ledvance/base/src/utils';
+import {AdjustType} from "@ledvance/base/src/utils/interface";
+
 const { convertX: cx } = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
 
@@ -66,6 +70,14 @@ 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)
+      }
+      return props.theme?.card?.background
+    };
     return (
       <View>
         {state.applyForList.map((item, idx) => (
@@ -73,7 +85,7 @@ function ManualSettings(props: ManualSettingProps) {
             <Card style={{ marginHorizontal: cx(24) }}>
               <LdvSwitch
                 title={item.name || item.key}
-                color={props.theme?.card.background}
+                color={getBlockColor()}
                 colorAlpha={1}
                 enable={item.enable}
                 setEnable={(enable: boolean) => {
@@ -99,6 +111,7 @@ function ManualSettings(props: ManualSettingProps) {
                     state.deviceData = {
                       ...state.deviceData,
                       isColorMode: mode,
+                      adjustType: mode ? AdjustType.COLOUR : AdjustType.WHITE
                     };
                     state.manualFlag = Symbol()
                   }}
@@ -190,6 +203,15 @@ function ManualSettings(props: ManualSettingProps) {
   }, [state.deviceData, state.applyForList, props.theme?.type]);
 
   const mixLightCard = useMemo(() => {
+    const {deviceData} = state;
+    const getBlockColor = ((type: string) => {
+      if (type === 'mainLight') return cctToColor(deviceData.temperature);
+      if (type === 'secondaryLight') {
+        const s = Math.round(mapFloatToRange(deviceData.s / 100, 30, 100));
+        return hsv2Hex(deviceData.h, s, 100);
+      }
+      return props.theme?.card?.background;
+    });
     return (
       <View>
         {state.applyForList.map((item, idx) => (
@@ -197,7 +219,7 @@ function ManualSettings(props: ManualSettingProps) {
             <Card style={{ marginHorizontal: cx(24) }}>
               <LdvSwitch
                 title={item.key}
-                color={props.theme?.card.background}
+                color={getBlockColor(item.type)}
                 colorAlpha={1}
                 enable={item.enable}
                 setEnable={(enable: boolean) => {
@@ -318,6 +340,17 @@ function ManualSettings(props: ManualSettingProps) {
 
   const ceilingLightCard = useMemo(() => {
     const deviceData = state.deviceData as StripLightData
+    const getBlockColor = (type: string) => {
+      if (type === 'mainLight') {
+        return cctToColor(deviceData.temperature);
+      }
+      // deviceData.activeKey === 3为combination
+      if (type === 'secondaryLight' && deviceData.activeKey !== 3) {
+        const s = Math.round(mapFloatToRange(deviceData.s / 100, 30, 100));
+        return hsv2Hex(deviceData.h, s, 100);
+      }
+      return props.theme?.card.background;
+    }
     return (
       <View>
         {state.applyForList.map((item, idx) => (
@@ -325,7 +358,7 @@ function ManualSettings(props: ManualSettingProps) {
             <Card style={{ marginHorizontal: cx(24) }}>
               <LdvSwitch
                 title={item.key}
-                color={props.theme?.card.background}
+                color={getBlockColor(item.type)}
                 colorAlpha={1}
                 enable={item.enable}
                 setEnable={(enable: boolean) => {

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

@@ -18,10 +18,11 @@ interface ScheduleCardProps {
   tags: ApplyForItem[]
   onEnableChange: (enable: boolean) => void
   onPress: (item: any) => void
+  onLongPress?: (item: any) => void
 }
 
 const ScheduleCard = (props: ScheduleCardProps) => {
-  const { item, style, showTag, tags, onEnableChange, onPress } = props;
+  const { item, style, showTag, tags, onEnableChange, onPress, onLongPress } = props;
   const is24HourClock = useSystemTimeFormate()
   const showTags = useMemo(() => {
     return tags.filter(tag => item.dps.hasOwnProperty(tag.dp))
@@ -93,6 +94,9 @@ const ScheduleCard = (props: ScheduleCardProps) => {
       onPress={() => {
         onPress(item);
       }}
+      onLongPress={() =>{
+        onLongPress && onLongPress(item)
+      }}
     >
       <View style={styles.infoContainer}>
         <Text style={styles.time}>{is24HourClock ? item.time : convertTo12HourFormat(item.time)}</Text>