@ledvance/ui-biz-bundle 1.1.62 → 1.1.64

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

@@ -1,5 +1,5 @@
 import React, { memo, useMemo } from 'react';
-import { DeviceType, ManualSettingProps } from '../Interface';
+import { CeilingLightData, DeviceType, directOptions, 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';
@@ -11,9 +11,14 @@ 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 SocketItem from '@ledvance/base/src/components/SocketItem'
+import res from '@ledvance/base/src/res';
 const { convertX: cx } = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
 
+const PowerStripIcon = [res.switch_1, res.switch_2, res.switch_3, res.switch_4]
+
 function ManualSettings(props: ManualSettingProps) {
   const state = useReactive({
     deviceData: props.manualData.deviceData,
@@ -27,11 +32,11 @@ function ManualSettings(props: ManualSettingProps) {
     state.deviceData = props.manualData.deviceData;
   }, [props.applyForList, props.manualData]);
 
-  useUpdateEffect(() =>{
+  useUpdateEffect(() => {
     props.onApplyChange && props.onApplyChange(state.applyForList)
   }, [state.applyFlag])
 
-  useUpdateEffect(() =>{
+  useUpdateEffect(() => {
     props.onManualChange && props.onManualChange(state.deviceData)
   }, [state.manualFlag])
 
@@ -47,6 +52,9 @@ function ManualSettings(props: ManualSettingProps) {
         ),
       },
     ];
+    if (props.isCeilingLight) {
+      return tabs.filter(tab => tab.key !== 0)
+    }
     if (!isSupportWhite) {
       return tabs.filter(tab => tab.key !== 0);
     }
@@ -61,7 +69,7 @@ function ManualSettings(props: ManualSettingProps) {
     return (
       <View>
         {state.applyForList.map((item, idx) => (
-          <View  key={item.dp}>
+          <View key={item.dp}>
             <Card style={{ marginHorizontal: cx(24) }}>
               <LdvSwitch
                 title={item.key}
@@ -81,7 +89,7 @@ function ManualSettings(props: ManualSettingProps) {
                   state.applyFlag = Symbol()
                 }}
               />
-              {item.enable && item.type !== 'socket' && (
+              {item.enable && (item.type !== 'socket' && item.type !== 'fan') && (
                 <LampAdjustView
                   isSupportColor={props.isSupportColor}
                   isSupportBrightness={props.isSupportBrightness}
@@ -125,6 +133,53 @@ function ManualSettings(props: ManualSettingProps) {
                   }}
                 />
               )}
+
+              {item.enable && item.type === 'fan' && (
+                <FanAdjustViewContent
+                  hideEnable={true}
+                  fanEnable={item.enable}
+                  maxFanSpeed={props.isUVCFan ? 20 : 3}
+                  isSupportDirection={props.isUVCFan}
+                  isSupportDisinfect={props.isUVCFan}
+                  isSupportMode={props.isUVCFan}
+                  directValue={''}
+                  disinfect={true}
+                  modeValue={''}
+                  directOptions={directOptions}
+                  modeOptions={modeOptions}
+                  directChange={(direction: any) => {
+                    state.deviceData = {
+                      ...state.deviceData,
+                      direction
+                    }
+                    state.manualFlag = Symbol()
+                  }}
+                  modeChange={(mode: any) => {
+                    state.deviceData = {
+                      ...state.deviceData,
+                      mode
+                    }
+                    state.manualFlag = Symbol()
+                  }}
+                  disinfectChange={(disinfect: any) => {
+                    state.deviceData = {
+                      ...state.deviceData,
+                      disinfect
+                    }
+                    state.manualFlag = Symbol()
+                  }}
+                  // @ts-ignore
+                  fanSpeed={deviceData.fanSpeed}
+                  onFanSwitch={() => { }}
+                  onFanSpeedChangeComplete={(fanSpeed) => {
+                    state.deviceData = {
+                      ...state.deviceData,
+                      fanSpeed
+                    }
+                    state.manualFlag = Symbol()
+                  }}
+                />
+              )}
             </Card>
             <Spacer />
           </View>
@@ -137,7 +192,7 @@ function ManualSettings(props: ManualSettingProps) {
     return (
       <View>
         {state.applyForList.map((item, idx) => (
-          <View  key={item.dp}>
+          <View key={item.dp}>
             <Card style={{ marginHorizontal: cx(24) }}>
               <LdvSwitch
                 title={item.key}
@@ -195,6 +250,7 @@ function ManualSettings(props: ManualSettingProps) {
   }, [state.deviceData, state.applyForList, props.theme.type]);
 
   const stripLightCard = useMemo(() => {
+    const deviceData = state.deviceData as StripLightData
     return (
       <View>
         <Card>
@@ -214,8 +270,24 @@ function ManualSettings(props: ManualSettingProps) {
               isSupportTemperature={props.isSupportTemperature}
               lampTabs={tabList}
               reserveSV={true}
-              activeKey={0}
-              onActiveKeyChange={() => {}}
+              activeKey={deviceData.activeKey}
+              colorDiskActiveKey={deviceData.colorDiskActiveKey}
+              onActiveKeyChange={(activekey) => {
+                state.deviceData = {
+                  ...state.deviceData,
+                  activeKey: Number(activekey),
+                  isColorMode: !(Number(activekey) === 0)
+                }
+                state.manualFlag = Symbol()
+              }}
+              onColorDiskChange={(colors, idx) => {
+                state.deviceData = {
+                  ...state.deviceData,
+                  colors,
+                  colorDiskActiveKey: idx
+                }
+                state.manualFlag = Symbol()
+              }}
               h={state.deviceData.h}
               s={state.deviceData.s}
               v={state.deviceData.v}
@@ -243,13 +315,141 @@ function ManualSettings(props: ManualSettingProps) {
     );
   }, [state.deviceData, state.applyForList, props.theme.type]);
 
+  const ceilingLightCard = useMemo(() => {
+    const deviceData = state.deviceData as CeilingLightData
+    return (
+      <View>
+        {state.applyForList.map((item, idx) => (
+          <View key={item.dp}>
+            <Card style={{ marginHorizontal: cx(24) }}>
+              <LdvSwitch
+                title={item.key}
+                color={'#fff'}
+                colorAlpha={1}
+                enable={item.enable}
+                setEnable={(enable: boolean) => {
+                  state.applyForList[idx].enable = enable;
+                  state.applyFlag = Symbol()
+                }}
+              />
+              {item.enable &&
+                (item.type === 'mainLight' ? (
+                  <View>
+                    <ColorTempAdjustView
+                      isSupportBrightness={props.isSupportBrightness}
+                      isSupportTemperature={props.isSupportTemperature}
+                      colorTemp={deviceData.temperature}
+                      brightness={deviceData.brightness}
+                      onBrightnessChangeComplete={bright => {
+                        state.deviceData.brightness = bright;
+                        state.manualFlag = Symbol()
+                      }}
+                      onCCTChangeComplete={cct => {
+                        state.deviceData.temperature = cct;
+                        state.manualFlag = Symbol()
+                      }}
+                    />
+                    <Spacer height={cx(16)} />
+                  </View>
+                ) : (
+                  <View>
+                    <StripAdjustView
+                      isSupportBrightness={false}
+                      isSupportTemperature={false}
+                      lampTabs={tabList}
+                      reserveSV={true}
+                      activeKey={deviceData.activeKey}
+                      colorDiskActiveKey={deviceData.colorDiskActiveKey}
+                      onActiveKeyChange={(activekey) => {
+                        state.deviceData = {
+                          ...state.deviceData,
+                          activeKey: Number(activekey)
+                        }
+                        state.manualFlag = Symbol()
+                      }}
+                      onColorDiskChange={(colors, idx) => {
+                        state.deviceData = {
+                          ...state.deviceData,
+                          colors,
+                          colorDiskActiveKey: idx
+                        }
+                        state.manualFlag = Symbol()
+                      }}
+                      h={deviceData.h}
+                      s={deviceData.s}
+                      v={deviceData.v}
+                      brightness={deviceData.brightness}
+                      colorTemp={deviceData.temperature}
+                      onHSVChangeComplete={(h, s, v) => {
+                        state.deviceData.h = h;
+                        state.deviceData.s = s;
+                        state.deviceData.v = v;
+                        state.manualFlag = Symbol()
+                      }}
+                      onBrightnessChangeComplete={bright => {
+                        state.deviceData.brightness = bright;
+                        state.manualFlag = Symbol()
+                      }}
+                      onCCTChangeComplete={cct => {
+                        state.deviceData.temperature = cct;
+                        state.manualFlag = Symbol()
+                      }}
+                    />
+                    <Spacer />
+                  </View>
+                ))}
+              <Spacer height={cx(16)} />
+            </Card>
+            <Spacer />
+          </View>
+        ))}
+      </View>
+    )
+  }, [state.deviceData, state.applyForList])
+
+  const powerStripCard = useMemo(() => {
+    return (
+      <View>
+        {state.applyForList.map((item, idx) => (
+          <View key={item.dp}>
+            <SocketItem
+              title={item.key}
+              name={item.name!}
+              icon={{ uri: PowerStripIcon[item.index ?? 0] }}
+              disabledEdit={true}
+              onNameChange={() => { }}
+              enabled={item.enable}
+              onSwitchChange={async enable => {
+                state.applyForList = state.applyForList.map((apply, index) => {
+                  if (idx === index) {
+                    return {
+                      ...apply,
+                      enable,
+                    };
+                  }
+                  return apply;
+                });
+                state.applyFlag = Symbol()
+              }}
+            />
+            <Spacer />
+          </View>
+        ))}
+      </View>
+    )
+  }, [state.deviceData, state.applyForList])
+
   const componentRender = useMemo(() => {
     const component =
       props.manualData.type === DeviceType.MixLight
         ? mixLightCard
         : props.manualData.type === DeviceType.StripLight
           ? stripLightCard
-          : lightSourceCard;
+          : props.manualData.type === DeviceType.CeilingLight
+            ? ceilingLightCard
+            : props.manualData.type === DeviceType.PowerStrip
+              ? powerStripCard
+              : lightSourceCard;
     return component;
   }, [props.manualData, state.applyForList, state.deviceData, props.theme.type]);
 

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

@@ -1,9 +1,9 @@
-import React from "react";
+import React, { useMemo } from "react";
 import { ViewStyle, View, Text, StyleSheet } from "react-native";
 import Card from "@ledvance/base/src/components/Card";
 import { SwitchButton, Utils } from 'tuya-panel-kit';
 import { convertTo12HourFormat, loopText } from '@ledvance/base/src/utils/common';
-import { Timer } from "../Interface";
+import { ApplyForItem, Timer } from "../Interface";
 import { useSystemTimeFormate } from "@ledvance/base/src/models/modules/NativePropsSlice";
 const { convertX: cx } = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
@@ -12,13 +12,18 @@ interface ScheduleCardProps {
   theme?: any
   item: Timer
   style?: ViewStyle
+  showTag?: boolean
+  tags: ApplyForItem[]
   onEnableChange: (enable: boolean) => void
   onPress: (item: any) => void
 }
 
 const ScheduleCard = (props: ScheduleCardProps) => {
-  const { item, style, onEnableChange, onPress } = props;
+  const { item, style, showTag, tags, onEnableChange, onPress } = props;
   const is24HourClock = useSystemTimeFormate()
+  const showTags = useMemo(() => {
+    return tags.filter(tag => item.dps.hasOwnProperty(tag.dp))
+  }, [tags, item.dps])
 
   const styles = StyleSheet.create({
     card: {
@@ -65,17 +70,19 @@ const ScheduleCard = (props: ScheduleCardProps) => {
       flexDirection: 'row',
       marginTop: cx(8),
     },
-    typeWrap: {
-      backgroundColor: props.theme.card.head,
+    tag: {
+      borderRadius: cx(16),
+      height: cx(16),
+      backgroundColor: '#E6E7E8',
       marginRight: cx(10),
-      borderRadius: cx(10),
+      paddingHorizontal: cx(12)
+    },
+    tagTitle: {
+      fontSize: cx(10),
+      textAlign: 'center',
+      fontFamily: 'PingFangSC-Medium',
+      color: '#000'
     },
-    typeText: {
-      fontSize: cx(12),
-      color: props.theme.global.fontColor,
-      paddingHorizontal: cx(8),
-      paddingVertical: cx(2)
-    }
   });
   return (
     <Card
@@ -91,9 +98,15 @@ const ScheduleCard = (props: ScheduleCardProps) => {
           {loopText(item.loops.split('').map(loop => parseInt(loop)), item.time)}
         </Text>
         <Text style={styles.name}>{item.name}</Text>
-        {/* {showTags() && <View style={styles.typeContainer}>
-                    {renderTag()}
-                </View>} */}
+        {showTag && <View style={styles.typeContainer}>
+          {showTags.map(tag => (
+            <View style={styles.tag} key={tag.dp}>
+              <Text style={styles.tagTitle}>
+                {tag.key}
+              </Text>
+            </View>
+          ))}
+        </View>}
       </View>
       <View style={styles.switchContainer}>
         <SwitchButton