@ledvance/ui-biz-bundle 1.1.128 → 1.1.130

package/package.json

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

package/src/newModules/energyConsumption/component/NewBarChart.tsx

@@ -44,7 +44,7 @@ const BarChartWithTouch = (props: BarChartProps) => {
     }, [dataKwhY]);
     const gridRight = useMemo(() => {
         const max = Math.max(...dataPriceY.map(it => Number(it)))
-        return max > 999 ? '12%' : '10%'
+        return max > 999 ? '15%' : '10%'
     }, [dataPriceY])
     const option = {
         tooltip: {

package/src/newModules/timeSchedule/Interface.ts

@@ -25,7 +25,7 @@ export interface HSV {
   v: number;
 }
 
-export type Category = 'light' | 'socket' | 'fan' | 'mainLight' | 'secondaryLight'
+export type Category = 'light' | 'socket' | 'fan' | 'mainLight' | 'secondaryLight' | 'shutter'
 
 export interface ApplyForItem {
   name?: string
@@ -54,7 +54,7 @@ export interface ManualSettingProps extends judgmentSupport {
   applyForList: ApplyForItem[];
   dps: Record<string, any>;
   manualData: ComponentConfig;
-  onManualChange?: (manualData: PlugData | DeviceData | MixLightData | StripLightData) => void
+  onManualChange?: (manualData: PlugData | DeviceData | MixLightData | StripLightData | ShutterData) => void
   onApplyChange?: (applyForList: ApplyForItem[]) => void
 }
 
@@ -67,6 +67,7 @@ export enum DeviceType {
   CeilingLight = 'ceilingLight',
   FanLight = 'fanLight',
   MoodStrip = 'moodStrip',
+  Shutter = 'shutter',
 }
 // export type DeviceType = 'LightSource' | 'CeilingLight' | 'StringLight' | 'StripLight' | 'MixLight';
 
@@ -106,6 +107,10 @@ export interface MoodStripData extends DeviceData {
   adjustType: AdjustType
 }
 
+export interface ShutterData extends DeviceData {
+  percentControl: number
+}
+
 export type ComponentConfig =
   | { type: DeviceType.LightSource; deviceData: DeviceData }
   | { type: DeviceType.MixLight; deviceData: MixLightData }
@@ -114,7 +119,7 @@ export type ComponentConfig =
   | { type: DeviceType.FanLight; deviceData: FanLightData }
   | { type: DeviceType.PowerStrip; deviceData: DeviceData}
   | { type: DeviceType.MoodStrip; deviceData: MoodStripData}
-
+  | { type: DeviceType.Shutter; deviceData: ShutterData}
 export interface TimeScheduleDetailState {
   timeSchedule: Timer;
   dps: Record<string, any>;

package/src/newModules/timeSchedule/TimeScheduleActions.ts

@@ -38,6 +38,10 @@ export const defMoodStripDeviceData = {
   adjustType: AdjustType.COLOUR
 };
 
+export const defShutterDeviceData = {
+  percentControl: 100
+};
+
 export const getTimeSchedule = async (deviceId: string): Promise<Timer[]> => {
   const res = await NativeApi.getAllTaskTimer(deviceId);
   if (res.success && Array.isArray(res.data)) {

package/src/newModules/timeSchedule/TimeScheduleDetailPage.tsx

@@ -25,7 +25,8 @@ import {
   defFanLightDeviceData,
   defMixDeviceData,
   defMoodStripDeviceData,
-  defStripDeviceData
+  defStripDeviceData,
+  defShutterDeviceData
 } from './TimeScheduleActions';
 import MoodItem from '../mood/MoodItem';
 import {getRemoteMoodList} from '../mood/MoodActions';
@@ -228,6 +229,31 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
     return params.isCeilingLight ? ((item.mainLamp.id === (state.mood as MoodInfo)?.mainLamp?.id) && (item.secondaryLamp.id === (state.mood as MoodInfo)?.secondaryLamp?.id)) : item.id === state.mood?.id
   }, [state.mood, params.isCeilingLight])
 
+  const renderSkillGroup = (skills: ApplyForItem[], i18nString: string) => {
+    if (!skills.length) return null;
+    
+    return (
+      <>
+        <Text style={{ fontSize: cx(14), color: props.theme?.global.fontColor }}>
+          {i18nString}
+        </Text>
+        <View style={{ flexDirection: 'row', flexWrap: 'wrap' }}>
+          {skills.map(item => (
+            <View
+              style={[
+                styles.summaryRight,
+                { marginRight: cx(5), marginBottom: cx(5) },
+              ]}
+              key={item.dp}
+            >
+              <Text style={styles.rightItem}>{item.key}</Text>
+            </View>
+          ))}
+        </View>
+      </>
+    );
+  };
+
   const styles = StyleSheet.create({
     cardContainer: {
       marginHorizontal: cx(24),
@@ -589,65 +615,26 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
           time={is24HourClock
             ? state.timeSchedule.time
             : convertTo12HourFormat(state.timeSchedule.time)}
-          actions={<View style={{ flex: 1 }}>
-            {state.isManual
-              ? !!state.selectedSkill.length && (
-              <>
-                {!!state.selectedSkill.filter(skill => skill.enable).length && (
+          actions={
+            <View style={{ flex: 1 }}>
+              {state.isManual ? (
+                state.selectedSkill.length ? (
                   <>
-                    <Text style={{ fontSize: cx(14), color: props.theme?.global.fontColor }}>
-                      {I18n.getLang('feature_summary_action_txt_1')}
-                    </Text>
-                    <View style={{ flexDirection: 'row', flexWrap: 'wrap' }}>
-                      {state.selectedSkill
-                        .filter(skill => skill.enable)
-                        .map(item => (
-                          <View
-                            style={[
-                              styles.summaryRight,
-                              { marginRight: cx(5), marginBottom: cx(5) },
-                            ]}
-                            key={item.dp}
-                          >
-                            <Text style={[styles.rightItem]}>{item.key}</Text>
-                          </View>
-                        ))}
-                    </View>
+                    {renderSkillGroup(state.selectedSkill.filter(skill => skill.enable), I18n.getLang(params.isShutter ? 'curtain_summary_action_txt_1' : 'feature_summary_action_txt_1'))}
+                    {renderSkillGroup(state.selectedSkill.filter(skill => !skill.enable), I18n.getLang(params.isShutter ? 'curtain_summary_action_txt_2' : 'feature_summary_action_txt_2'))}
                   </>
-                )}
-
-                {!!state.selectedSkill.filter(skill => !skill.enable).length && (
-                  <>
-                    <Text style={{ fontSize: cx(14), color: props.theme?.global.fontColor }}>
-                      {I18n.getLang('feature_summary_action_txt_2')}
-                    </Text>
-                    <View style={{ flexDirection: 'row', flexWrap: 'wrap' }}>
-                      {state.selectedSkill
-                        .filter(skill => !skill.enable)
-                        .map((item) => (
-                          <View
-                            style={[
-                              styles.summaryRight,
-                              { marginRight: cx(5), marginBottom: cx(5) },
-                            ]}
-                            key={item.dp}
-                          >
-                            <Text style={[styles.rightItem]}>{item.key}</Text>
-                          </View>
-                        ))}
+                ) : null
+              ) : (
+                state.moodName ? (
+                  <View style={{ flexDirection: 'row', flexWrap: 'wrap' }}>
+                    <View style={[styles.summaryRight, { marginLeft: cx(5) }]}>
+                      <Text style={styles.rightItem}>{state.moodName}</Text>
                     </View>
-                  </>
-                )}
-              </>
-            )
-              : !!state.moodName && (
-              <View style={{ flexDirection: 'row', flexWrap: 'wrap' }}>
-                <View style={[styles.summaryRight, { marginLeft: cx(5) }]}>
-                  <Text style={styles.rightItem}>{state.moodName}</Text>
-                </View>
-              </View>
-            )}
-          </View>}
+                  </View>
+                ) : null
+              )}
+            </View>
+          }
         />
         <Spacer height={cx(30)} />
 
@@ -694,38 +681,39 @@ const newTimeSchedule = () => {
 };
 
 const getDefaultManual = (props: TimeScheduleDetailPageParams): ComponentConfig => {
-  const deviceType =
-    props.isStripLight
-      ? DeviceType.StripLight
-      : props.isMixLight
-        ? DeviceType.MixLight
-        : props.isPowerStrip
-          ? DeviceType.PowerStrip
-          : props.isFanLight
-            ? DeviceType.FanLight
-            : props.isCeilingLight
-              ? DeviceType.CeilingLight
-              : props.isMoodStrip
-                ? DeviceType.MoodStrip
-                : DeviceType.LightSource
-  const deviceData =
-    (deviceType === DeviceType.StripLight || deviceType === DeviceType.CeilingLight)
-      ? defStripDeviceData
-      : deviceType === DeviceType.MixLight
-        ? defMixDeviceData
-        : deviceType === DeviceType.FanLight
-          ? defFanLightDeviceData
-          : deviceType === DeviceType.MoodStrip
-            ? defMoodStripDeviceData
-            : defDeviceData;
+  const deviceTypeMap: Record<string, DeviceType> = {
+    isStripLight: DeviceType.StripLight,
+    isMixLight: DeviceType.MixLight,
+    isPowerStrip: DeviceType.PowerStrip,
+    isFanLight: DeviceType.FanLight,
+    isCeilingLight: DeviceType.CeilingLight,
+    isMoodStrip: DeviceType.MoodStrip,
+    isShutter: DeviceType.Shutter
+  };
+
+  const deviceType = Object.entries(deviceTypeMap)
+    .find(([key]) => props[key as keyof TimeScheduleDetailPageParams])
+    ?.[1] || DeviceType.LightSource;
+
+  const deviceDataMap: Record<DeviceType, any> = {
+    [DeviceType.StripLight]: defStripDeviceData,
+    [DeviceType.CeilingLight]: defStripDeviceData,
+    [DeviceType.MixLight]: defMixDeviceData,
+    [DeviceType.FanLight]: defFanLightDeviceData,
+    [DeviceType.MoodStrip]: defMoodStripDeviceData,
+    [DeviceType.Shutter]: defShutterDeviceData,
+    [DeviceType.PowerStrip]: defDeviceData,
+    [DeviceType.LightSource]: defDeviceData,
+    [DeviceType.Plug]: defDeviceData
+  };
 
   return {
     type: deviceType as any,
     deviceData: {
-      ...deviceData,
+      ...deviceDataMap[deviceType],
       isColorMode: props.isSupportColor,
     },
   };
 };
 
-export default withTheme(TimeScheduleDetailPage)
+export default withTheme(TimeScheduleDetailPage) as React.ComponentType<any>

package/src/newModules/timeSchedule/TimeSchedulePage.tsx

@@ -42,6 +42,7 @@ export interface TimeSchedulePageParams {
   isUVCFan?: boolean;
   isPowerStrip?: boolean
   isMoodStrip?: boolean
+  isShutter?: boolean
   featureId?: string
   applyForList: ApplyForItem[];
   applyForDisabled?: boolean; // 是否可以选择apply for

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

@@ -1,29 +1,31 @@
-import React, {memo, useMemo} from 'react';
+import React, { memo, useMemo } from 'react';
 import {
   DeviceType,
   directOptions,
   FanLightData,
   ManualSettingProps,
   modeOptions,
+  ShutterData,
   StripLightData
 } from '../Interface';
-import {View} from 'react-native';
+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, ApplyForItem} from "@ledvance/base/src/utils/interface";
+import { hsv2Hex, mapFloatToRange } from '@ledvance/base/src/utils';
+import { AdjustType, ApplyForItem } from "@ledvance/base/src/utils/interface";
+import LdvSlider from '@ledvance/base/src/components/ldvSlider';
 
 const { convertX: cx } = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
@@ -94,7 +96,7 @@ function ManualSettings(props: ManualSettingProps) {
             <Card style={{ marginHorizontal: cx(24) }}>
               <LdvSwitch
                 title={item.name || item.key}
-                color={getBlockColor(item)}
+                color={getBlockColor(item as any)}
                 colorAlpha={1}
                 enable={item.enable}
                 setEnable={(enable: boolean) => {
@@ -212,7 +214,7 @@ function ManualSettings(props: ManualSettingProps) {
   }, [state.deviceData, state.applyForList, props.theme?.type]);
 
   const mixLightCard = useMemo(() => {
-    const {deviceData} = state;
+    const { deviceData } = state;
     const getBlockColor = ((type: string) => {
       if (type === 'mainLight') return cctToColor(deviceData.temperature);
       if (type === 'secondaryLight') {
@@ -489,7 +491,32 @@ function ManualSettings(props: ManualSettingProps) {
         ))}
       </View>
     )
-  }, [state.deviceData, state.applyForList])
+  }, [state.deviceData, state.applyForList, props.theme?.type])
+
+  const shutterCard = useMemo(() => {
+    return (
+      <Card style={{ marginHorizontal: cx(24) }}>
+        <Spacer height={cx(16)} />
+        <LdvSlider
+          title={'Curtain'}
+          value={(state.deviceData as ShutterData).percentControl}
+          min={0}
+          max={100}
+          onSlidingComplete={async (value) => {
+            (state.deviceData as ShutterData).percentControl = value
+            state.applyForList = state.applyForList.map((apply) => {
+              return {
+                ...apply,
+                enable: value > 0
+              }
+            })
+            state.applyFlag = Symbol()
+          }}
+        />
+        <Spacer />
+      </Card>
+    )
+  }, [state.deviceData, state.applyForList, props.theme?.type])
 
   const componentRender = useMemo(() => {
     const component =
@@ -501,7 +528,9 @@ function ManualSettings(props: ManualSettingProps) {
             ? ceilingLightCard
             : props.manualData.type === DeviceType.PowerStrip
               ? powerStripCard
-              : lightSourceCard;
+              : props.manualData.type === DeviceType.Shutter
+                ? shutterCard
+                : lightSourceCard;
     return component;
   }, [props.manualData, state.applyForList, state.deviceData, props.theme?.type]);
 
@@ -509,4 +538,4 @@ function ManualSettings(props: ManualSettingProps) {
   return <View>{componentRender}</View>;
 }
 
-export default memo(withTheme(ManualSettings))
+export default memo(withTheme(ManualSettings)) as React.ComponentType<ManualSettingProps>

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

@@ -40,6 +40,7 @@ const ScheduleCard = (props: ScheduleCardProps) => {
     infoContainer: {
       flex: 1,
       marginTop: cx(16),
+      marginBottom: cx(16),
       flexDirection: 'column',
       marginLeft: cx(16),
     },
@@ -64,22 +65,20 @@ const ScheduleCard = (props: ScheduleCardProps) => {
     },
     switchContainer: {
       marginRight: cx(16),
+      // backgroundColor: 'red',
       marginTop: cx(16),
     },
     switch: {},
     typeContainer: {
       flexDirection: 'row',
-      flexWrap: 'wrap',
-      marginVertical: cx(8),
-      marginHorizontal: cx(16),
+      marginTop: cx(8),
     },
     tag: {
       borderRadius: cx(16),
       height: cx(16),
       backgroundColor: '#E6E7E8',
       marginRight: cx(10),
-      marginBottom: cx(6),
-      paddingHorizontal: cx(10)
+      paddingHorizontal: cx(12)
     },
     tagTitle: {
       fontSize: cx(10),
@@ -91,7 +90,7 @@ const ScheduleCard = (props: ScheduleCardProps) => {
   return (
     <Card
       style={styles.card}
-      containerStyle={[style]}
+      containerStyle={[styles.container, style]}
       onPress={() => {
         onPress(item);
       }}
@@ -99,33 +98,31 @@ const ScheduleCard = (props: ScheduleCardProps) => {
         onLongPress && onLongPress(item)
       }}
     >
-      <View style={styles.container}>
-        <View style={styles.infoContainer}>
-          <Text style={styles.time}>{is24HourClock ? item.time : convertTo12HourFormat(item.time)}</Text>
-          <Text style={styles.loop}>
-            {loopText(item.loops.split('').map(loop => parseInt(loop)), item.time)}
-          </Text>
-          <Text style={styles.name}>{item.name}</Text>
-        </View>
-        <View style={styles.switchContainer}>
-          <SwitchButton
-            value={item.enable}
-            thumbStyle={{ elevation: 0 }}
-            onValueChange={() => {
-              onEnableChange(!item.enable);
-            }}
-          />
-        </View>
+      <View style={styles.infoContainer}>
+        <Text style={styles.time}>{is24HourClock ? item.time : convertTo12HourFormat(item.time)}</Text>
+        <Text style={styles.loop}>
+          {loopText(item.loops.split('').map(loop => parseInt(loop)), item.time)}
+        </Text>
+        <Text style={styles.name}>{item.name}</Text>
+        {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
+          value={item.enable}
+          thumbStyle={{ elevation: 0 }}
+          onValueChange={() => {
+            onEnableChange(!item.enable);
+          }}
+        />
       </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>}
     </Card>
   )