@ledvance/ui-biz-bundle 1.1.104 → 1.1.106

package/src/newModules/timeSchedule/TimeSchedulePage.tsx

@@ -40,6 +40,7 @@ export interface TimeSchedulePageParams {
   isFanLight?: boolean;
   isUVCFan?: boolean;
   isPowerStrip?: boolean
+  isMoodStrip?: boolean
   featureId?: string
   applyForList: ApplyForItem[];
   applyForDisabled?: boolean; // 是否可以选择apply for
@@ -197,31 +198,31 @@ const TimeSchedulePage = (props: { theme?: ThemeType }) => {
         )}
         {params.applyForList.length > 1 && !!state.originList.length && !(params.isCeilingLight || params.isMixLight) && showTags}
         {state.timeScheduleList.length > 0 ? <FlatList
-          data={state.timeScheduleList}
-          renderItem={({ item }) => (
-            <ScheduleCard
-              item={item}
-              tags={params.applyForList}
-              showTag={params.applyForList.length > 1}
-              onEnableChange={async enable => {
-                state.loading = true;
-                await modDeleteTimeSchedule('update', {
-                  ...item,
-                  enable,
-                });
-                state.loading = false;
-              }}
-              onPress={() => {
-                navigateToEdit('update', item);
-              }}
-            />
-          )}
-          keyExtractor={item => item.id.toString()}
-          ListEmptyComponent={<Spacer />}
-          ListHeaderComponent={() => <Spacer height={cx(10)} />}
-          ItemSeparatorComponent={() => <Spacer />}
-          ListFooterComponent={() => <Spacer height={cx(30)} />}
-        /> :
+            data={state.timeScheduleList}
+            renderItem={({ item }) => (
+              <ScheduleCard
+                item={item}
+                tags={params.applyForList}
+                showTag={params.applyForList.length > 1}
+                onEnableChange={async enable => {
+                  state.loading = true;
+                  await modDeleteTimeSchedule('update', {
+                    ...item,
+                    enable,
+                  });
+                  state.loading = false;
+                }}
+                onPress={() => {
+                  navigateToEdit('update', item);
+                }}
+              />
+            )}
+            keyExtractor={item => item.id.toString()}
+            ListEmptyComponent={<Spacer />}
+            ListHeaderComponent={() => <Spacer height={cx(10)} />}
+            ItemSeparatorComponent={() => <Spacer />}
+            ListFooterComponent={() => <Spacer height={cx(30)} />}
+          /> :
           <View style={styles.emptyContainer}>
             <Spacer height={cx(60)} />
             <Image
@@ -238,12 +239,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) => {