@ledvance/group-ui-biz-bundle 1.0.66 → 1.0.68

package/package.json

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

package/src/modules/flags/FlagEditPage.tsx

@@ -56,11 +56,15 @@ const FlagEditPage = () => {
   }, [state.currentNode, state.currentWhiteNode])
 
   useUpdateEffect(() =>{
-    state.currentNode = state.mood.colors[state.colorPaintBucketIdx]
+    if (state.colorPaintBucketIdx < state.mood.colors.length){
+      state.currentNode = state.mood.colors[state.colorPaintBucketIdx]
+    }
   }, [JSON.stringify(state.mood.colors), state.colorPaintBucketIdx])
 
   useUpdateEffect(() =>{
-    state.currentWhiteNode = state.mood.whiteColors[state.whitePaintBucketIdx]
+    if (state.whitePaintBucketIdx < state.mood.whiteColors.length ){
+      state.currentWhiteNode = state.mood.whiteColors[state.whitePaintBucketIdx]
+    }
   }, [JSON.stringify(state.mood.whiteColors), state.whitePaintBucketIdx])
 
   const checkMoodDataChanged = useMemo(() =>{

package/src/modules/mood_new/AddMoodPage.tsx

@@ -66,7 +66,7 @@ const AddMoodPage = () => {
           ? ui_biz_routerKey.group_ui_biz_dynamic_mix_mood_edit
           : ui_biz_routerKey.group_ui_biz_dynamic_mood_edit;
       const currentMood = moodItem.mainLamp
-        ? { ...moodItem, id: mainId, mainLamp: { ...moodItem.mainLamp, id: mainId }, secondaryLamp: { ...moodItem.secondaryLamp, id: secondaryId } }
+        ? { ...moodItem, id: mainId, mainLamp: { ...moodItem.mainLamp, id: mainId }, secondaryLamp: { ...moodItem.secondaryLamp, id: moodItem.secondaryLamp?.nodes?.length ? secondaryId : -1} }
         : newMood(mainId, secondaryId, moduleParams.isSupportColor, routeParams.isStatic, moduleParams);
       navigation.navigate(url, {
         ...routeParams,
@@ -182,7 +182,7 @@ function newMood(
       nodes: isStatic ? [node] : [node, { ...node }],
     },
     secondaryLamp: {
-      id: secondaryId,
+      id: isStatic ? -1 : secondaryId,
       enable: true,
       mode: MoodJumpGradientMode.StripJump,
       speed: 75,

package/src/modules/mood_new/Interface.ts

@@ -95,6 +95,7 @@ export interface DefMoodOption extends LightCategory{
 }
 
 export interface MoodDps {
+  switchLedDp: string 
   mainDp: string;
   mainWorkMode: string;
   mainSwitch: string;

package/src/modules/mood_new/MoodActions.ts

@@ -66,6 +66,7 @@ export function useMoodScene(params: MoodPageParams): [SceneDataType, (value: Sc
       const dps = {}
       if (moodInfo?.scene) {
         const { mainLamp, secondaryLamp } = moodInfo.scene
+        dps[params.switchLedDp] = true 
         if (mainLamp?.nodes?.length) {
           const mainDp = getMoodDp(params.isCeilingLight ? ({...moodInfo.scene, id: mainLamp.id!}) : moodInfo.scene, params)
           if (mainDp && params.mainDp) {
@@ -109,6 +110,7 @@ export function useMoodScene(params: MoodPageParams): [SceneDataType, (value: Sc
       const config = {} as SceneDataConfigType
       if (moodInfo?.scene) {
         const { mainLamp, secondaryLamp } = moodInfo.scene
+        config.switch_led = true 
         if (mainLamp?.nodes?.length) {
           config.work_mode = WorkMode.Scene
           config.workMode = WorkMode.Scene

package/src/modules/mood_new/MoodPage.tsx

@@ -53,7 +53,8 @@ const MoodPage = () => {
   });
 
   const moodIds = useMemo(() => {
-    const mainIds = map(state.originMoods, 'id').filter(v => v !== undefined)
+    // @ts-ignore
+    const mainIds = map(params.isCeilingLight ? (state.originMoods.map(m => m.mainLamp) || []) : state.originMoods, 'id').filter(v => v !== undefined)
     const secondaryIds = map(state.originMoods.map(m => m.secondaryLamp) || [], 'id')
     return filter([...mainIds, ...secondaryIds], v => v !== undefined) as number[]
   }, [JSON.stringify(state.originMoods)])

package/src/modules/timeSchedule/TimeScheduleDetailPage.tsx

@@ -381,6 +381,7 @@ const TimeScheduleDetailPage = () => {
             isSupportBrightness={props.isSupportBrightness}
             isSupportTemperature={props.isSupportTemperature}
             isCeilingLight={props.isCeilingLight}
+            isUVCFan={props.isUVCFan}
             manualData={state.manualData}
             onManualChange={manual => {
               // @ts-ignore
@@ -552,14 +553,14 @@ const getDefaultManual = (props: TimeScheduleDetailPageParams): ComponentConfig
         ? DeviceType.CeilingLight
         : props.isFanLight ?
         DeviceType.FanLight
+        : props.isCeilingLight 
+        ? DeviceType.CeilingLight
         : DeviceType.LightSource;
   const deviceData =
-    deviceType === DeviceType.StripLight
+    (deviceType === DeviceType.StripLight || deviceType === DeviceType.CeilingLight)
       ? defStripDeviceData
       : deviceType === DeviceType.MixLight
         ? defMixDeviceData
-        : deviceType === DeviceType.CeilingLight
-        ? defCeilingLihtDeviceData
         : deviceType === DeviceType.FanLight
         ? defFanLightDeviceData
         : defDeviceData;

package/src/modules/timeSchedule/TimeSchedulePage.tsx

@@ -14,11 +14,12 @@ import Spacer from '@ledvance/base/src/components/Spacer';
 import InfoText from '@ledvance/base/src/components/InfoText';
 import DeleteButton from '@ledvance/base/src/components/DeleteButton';
 import { useReactive, useUpdateEffect } from 'ahooks';
-import { addTimeSchedule, modDelTimeSchedule, getTimeSchedule, modifyTimeSchedule } from "@ledvance/group-ui-biz-bundle/src/modules/timeSchedule/TimeScheduleActions";
-import { ApplyForItem, DeviceStateType, Timer } from '@ledvance/group-ui-biz-bundle/src/modules/timeSchedule/Interface';
+import { addTimeSchedule, modDelTimeSchedule, getTimeSchedule, modifyTimeSchedule } from "./TimeScheduleActions";
+import { DeviceStateType, Timer } from './Interface';
 import { useParams } from '@ledvance/base/src/hooks/Hooks';
-import ScheduleCard from '@ledvance/group-ui-biz-bundle/src/modules/timeSchedule/components/ScheduleCard';
-import { ui_biz_routerKey } from "@ledvance/group-ui-biz-bundle/src/navigation/Routers";
+import ScheduleCard from './components/ScheduleCard';
+import { ui_biz_routerKey } from "../../navigation/Routers";
+import { ApplyForItem } from '@ledvance/base/src/utils/interface';
 
 const { convertX: cx } = Utils.RatioUtils;
 const MAX_NUM = 30;
@@ -36,7 +37,7 @@ export interface TimeSchedulePageParams {
   isFanLight?: boolean
   isUVCFan?: boolean;
   applyForList: ApplyForItem[];
-  applyForDisabled: boolean; // 是否可以选择apply for
+  applyForDisabled?: boolean; // 是否可以选择apply for
   manualDataDp2Obj: (dps: Record<string, any>) => DeviceStateType;
   manualDataObj2Dp: (deviceState: DeviceStateType, applyForList: ApplyForItem[]) => Record<string, any>;
 }
@@ -141,6 +142,7 @@ const TimeSchedulePage = () => {
             iconStyle={{ tintColor: '#ff9500' }}
           />
         )}
+        { state.timeScheduleList.length > 0 ?
         <FlatList
           data={state.timeScheduleList}
           renderItem={({ item }) => (
@@ -161,36 +163,36 @@ const TimeSchedulePage = () => {
             />
           )}
           keyExtractor={item => item.id.toString()}
-          ListEmptyComponent={() => (
-            <View style={styles.emptyContainer}>
-              <Spacer height={cx(60)} />
-              <Image
-                style={styles.emptyImage}
-                source={{ uri: res.ldv_timer_empty }}
-                resizeMode="contain"
-              />
-              <InfoText
-                icon={res.device_panel_schedule_alert}
-                text={I18n.getLang('timeschedule_overview_empty_information_text')}
-                style={{ width: 'auto', alignItems: 'center' }}
-                textStyle={{ color: '#000', fontSize: cx(12), flex: undefined }}
-                iconStyle={{ tintColor: '#000' }}
-              />
-              <Spacer height={cx(16)} />
-              <DeleteButton
-                style={styles.addBtn}
-                text={`${I18n.getLang('timeschedule_overview_empty_button_add_text')}`}
-                textStyle={{ fontSize: cx(12) }}
-                onPress={() => {
-                  navigateToEdit('add');
-                }}
-              />
-            </View>
-          )}
+          ListEmptyComponent={<Spacer />}
           ListHeaderComponent={() => <Spacer height={cx(10)} />}
           ItemSeparatorComponent={() => <Spacer />}
           ListFooterComponent={() => <Spacer height={cx(30)} />}
-        />
+        /> :
+          <View style={styles.emptyContainer}>
+            <Spacer height={cx(60)}/>
+            <Image
+              style={styles.emptyImage}
+              source={{uri: res.ldv_timer_empty}}
+              resizeMode="contain"
+            />
+            <InfoText
+              icon={res.device_panel_schedule_alert}
+              text={I18n.getLang('timeschedule_overview_empty_information_text')}
+              style={{width: 'auto', alignItems: 'center'}}
+              textStyle={{color: '#000', fontSize: cx(12), flex: undefined}}
+              iconStyle={{tintColor: '#000'}}
+            />
+            <Spacer height={cx(16)}/>
+            <DeleteButton
+              style={styles.addBtn}
+              text={`${I18n.getLang('timeschedule_overview_empty_button_add_text')}`}
+              textStyle={{fontSize: cx(12)}}
+              onPress={() => {
+                navigateToEdit('add');
+              }}
+            />
+          </View>
+        }
       </ScrollView>
     </Page>
   );

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

@@ -1,5 +1,5 @@
 import React, { memo, useMemo } from 'react';
-import { CeilingLightData, DeviceType, 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';
@@ -71,7 +71,7 @@ function ManualSettings(props: ManualSettingProps) {
           <View key={item.dp}>
             <Card style={{ marginHorizontal: cx(24) }}>
               <LdvSwitch
-                title={item.key}
+                title={item.name || item.key}
                 color={'#fff'}
                 colorAlpha={1}
                 enable={item.enable}
@@ -141,9 +141,9 @@ function ManualSettings(props: ManualSettingProps) {
                   isSupportDirection={props.isUVCFan}
                   isSupportDisinfect={props.isUVCFan}
                   isSupportMode={props.isUVCFan}
-                  directValue={''}
-                  disinfect={true}
-                  modeValue={''}
+                  directValue={(state.deviceData as FanLightData).direction}
+                  disinfect={(state.deviceData as FanLightData).disinfect}
+                  modeValue={(state.deviceData as FanLightData).mode}
                   directOptions={directOptions}
                   modeOptions={modeOptions}
                   directChange={(direction: any) => {
@@ -170,7 +170,7 @@ function ManualSettings(props: ManualSettingProps) {
                   // @ts-ignore
                   fanSpeed={deviceData.fanSpeed}
                   onFanSwitch={() => {}}
-                  onFanSpeedChangeComplete={(fanSpeed) => { 
+                  onFanSpeedChangeComplete={(fanSpeed) => {
                     state.deviceData = {
                       ...state.deviceData,
                       fanSpeed