@ledvance/group-ui-biz-bundle 1.0.54 → 1.0.56

package/package.json

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

package/src/modules/flags/FlagActions.ts

@@ -8,15 +8,9 @@ import { Utils } from '@tuya/tuya-panel-lamp-sdk'
 import { useEffect, useState } from "react";
 import { getGlobalParamsDp } from "@ledvance/base/src/utils/common";
 import { Result } from "@ledvance/base/src/models/modules/Result";
+import { FlagPageProps } from "@ledvance/group-ui-biz-bundle/src/modules/flags/FlagPage";
 const { nToHS, toFixed } = Utils
 
-interface  LightType {
-  isStringLight?: boolean
-  isStripLight?: boolean
-  isMixLight?: boolean
-  isCeilingLight?: boolean
-}
-
 interface FlagMode {
   flagMode: boolean
   flagId?: number 
@@ -28,6 +22,7 @@ interface FlagDataType {
 
 export interface FlagConfigType {
   switch_led: boolean
+  switch: boolean
   colour_switch: boolean
   white_switch: boolean
   work_mode: WorkMode
@@ -67,15 +62,21 @@ export function useRgbicWorkMode(): [WorkMode, (value: WorkMode) => Promise<Resu
 
 const featureId = 'Flag_data'
 
-type UseFlagType = (params: LightType) => [FlagDataType | undefined, (flagData: FlagDataType) => Promise<any>]
+type UseFlagType = (params: FlagPageProps) => [FlagDataType | undefined, (flagData: FlagDataType) => Promise<any>]
 
 export const useFlag: UseFlagType = (params) => {
   return useFeatureHook<FlagConfigType, FlagDataType | undefined>('flagSceneConfig', undefined, undefined, (flagData) =>{
     if(flagData?.flag){
       const dps = {}
       const { flag } = flagData
-      if (!(params.isStringLight || params.isCeilingLight)){
-        dps[getGlobalParamsDp('scene_data')] = obj2Dp(flag, params)
+      if (!(params.isStripLight || params.isCeilingLight)){
+        const moodDp = obj2Dp(flag, params)
+        if (params.isStringLight){
+          dps[getGlobalParamsDp('rgbic_linerlight_scene')] = moodDp
+        }else{
+          dps[getGlobalParamsDp('scene_data')] = moodDp
+        }
+        dps[getGlobalParamsDp('work_mode')] = WorkMode.Scene
       }else{
         const paintHex = drawToolFormat({
           adjustCode: 3,
@@ -101,7 +102,7 @@ export const useFlag: UseFlagType = (params) => {
         dps[getGlobalParamsDp('work_mode')] = WorkMode.White
         dps[getGlobalParamsDp('rgbic_work_mode')] = WorkMode.Colour
       }
-      dps[getGlobalParamsDp('switch_led')] = true 
+      dps[params.switchLedCode] = true 
       return dps
     }
   }, 
@@ -109,7 +110,7 @@ export const useFlag: UseFlagType = (params) => {
     if (flagData?.flag){
       const config = {}
       config['work_mode'] = params.isStripLight ? WorkMode.Colour : WorkMode.Scene
-      config['switch_led'] = true 
+      config[params.isMatterLight ? 'switch' : 'switch_led'] = true 
       if (params.isCeilingLight){
         config['white_switch'] = true 
         config['colour_switch'] = true 

package/src/modules/flags/FlagPage.tsx

@@ -26,6 +26,7 @@ export interface FlagPageProps {
   isStripLight?: boolean
   isStringLight?: boolean
   isCeilingLight?: boolean
+  isMatterLight?: boolean
   isSupportTemperature?: boolean
   isSupportBrightness?: boolean
   switchLedCode: string  

package/src/modules/randomTimeForPlug/Router.ts

@@ -5,7 +5,7 @@ import {ui_biz_routerKey} from "../../navigation/Routers";
 
 const RandomTimeForPlugRouters: NavigationRoute[] = [
   {
-    name: ui_biz_routerKey.group_ui_biz_fixed_time_plug,
+    name: ui_biz_routerKey.group_ui_biz_random_time_plug,
     component: RandomTimeForPlugPage,
     options:{
       hideTopbar: true,
@@ -13,7 +13,7 @@ const RandomTimeForPlugRouters: NavigationRoute[] = [
     }
   },
   {
-    name: ui_biz_routerKey.group_ui_biz_fixed_time_plug_detail,
+    name: ui_biz_routerKey.group_ui_biz_random_time_plug_detail,
     component: RandomTimeForPlugDetailPage,
     options:{
       hideTopbar: true,

package/src/modules/timeSchedule/Interface.ts

@@ -41,7 +41,8 @@ export enum UVCFanMode {
 }
 
 
-import { MoodInfo, MoodUIInfo } from "@ledvance/group-ui-biz-bundle/src/modules/mood/Interface";
+import I18n from "@ledvance/base/src/i18n";
+import { MoodInfo, MoodUIInfo } from "../mood_new/Interface";
 
 export interface Timer {
   status: number;
@@ -80,6 +81,8 @@ interface judgmentSupport {
   isStripLight?: boolean;
   isStringLight?: boolean;
   isMixLight?: boolean;
+  isFanLight?: boolean;
+  isUVCFan?: boolean;
 }
 
 export interface ManualSettingProps extends judgmentSupport {
@@ -94,7 +97,8 @@ export enum DeviceType {
   LightSource = 'lightSource',
   MixLight = 'mixLight',
   StripLight = 'stripLight',
-  CeilingLight = 'ceilingLight'
+  CeilingLight = 'ceilingLight',
+  FanLight = 'fanLight'
 }
 // export type DeviceType = 'LightSource' | 'CeilingLight' | 'StringLight' | 'StripLight' | 'MixLight';
 
@@ -122,11 +126,19 @@ export interface StripLightData extends DeviceData {
 export interface CeilingLightData extends DeviceData, StripLightData, MixLightData {
 }
 
+export interface FanLightData extends DeviceData {
+  fanSpeed: number 
+  direction: 'forward' | 'reverse'
+  mode: 'nature' | 'normal'
+  disinfect: boolean
+}
+
 export type ComponentConfig =
   | { type: DeviceType.LightSource; deviceData: DeviceData }
   | { type: DeviceType.MixLight; deviceData: MixLightData }
   | { type: DeviceType.StripLight; deviceData: StripLightData }
   | { type: DeviceType.CeilingLight; deviceData: CeilingLightData }
+  | { type: DeviceType.FanLight; deviceData: FanLightData }
 
 export interface TimeScheduleDetailState {
   timeSchedule: Timer;
@@ -148,3 +160,13 @@ export interface DeviceStateType {
   mood?: MoodInfo
   isManual: boolean
 }
+
+export const directOptions = [
+  {label: I18n.getLang('ceiling_fan_tile_uvc_fan_direction_opt_1'), value: 'forward'},
+  {label: I18n.getLang('ceiling_fan_tile_uvc_fan_direction_opt_2'), value: 'reverse'}
+]
+
+export const modeOptions = [
+  {label: I18n.getLang('ceiling_fan_tile_uvc_fan_mode_opt_1'), value: 'normal'},
+  {label: I18n.getLang('ceiling_fan_tile_uvc_fan_mode_opt_2'), value: 'nature'},
+]

package/src/modules/timeSchedule/TimeScheduleActions.ts

@@ -32,6 +32,14 @@ export const defCeilingLihtDeviceData = {
   activeKey: 1
 }
 
+export const defFanLightDeviceData = {
+  ...defDeviceData,
+  fanSpeed: 1,
+  direction: 'forward',
+  mode: 'normal',
+  disinfect: false
+}
+
 export const addTimeSchedule = async (props: IAddSingleTime) => {
   try {
     const res = await commonApi.timerApi.addSingleTimer({

package/src/modules/timeSchedule/TimeScheduleDetailPage.tsx

@@ -37,7 +37,7 @@ import DeleteButton from '@ledvance/base/src/components/DeleteButton';
 import SegmentControl from '@ledvance/base/src/components/segmentControl';
 import { useParams } from '@ledvance/base/src/hooks/Hooks';
 import ManualSettings from './components/ManuaSettings';
-import { defCeilingLihtDeviceData, defDeviceData, defMixDeviceData, defStripDeviceData } from './TimeScheduleActions';
+import { defCeilingLihtDeviceData, defDeviceData, defMixDeviceData, defStripDeviceData, defFanLightDeviceData } from './TimeScheduleActions';
 import MoodItem from '../mood_new/MoodItem';
 import Summary from './components/Summary'
 import { getRemoteMoodList } from '../mood_new/MoodActions'
@@ -106,10 +106,10 @@ const TimeScheduleDetailPage = () => {
       state.unSelectedSkill = [];
     } else {
       const selectedList = cloneApplyList.filter(item =>
-        Object.keys(timeSchedule.dps).includes(item.dp)
+        Object.keys(timeSchedule?.dps || {}).includes(item.dp)
       );
       const unSelectedList = cloneApplyList.filter(
-        item => !Object.keys(timeSchedule.dps).includes(item.dp)
+        item => !Object.keys(timeSchedule?.dps || {}).includes(item.dp)
       );
       state.selectedSkill = mode === 'add' ? [] : selectedList;
       state.unSelectedSkill = mode === 'add' ? cloneApplyList : unSelectedList;
@@ -122,8 +122,10 @@ const TimeScheduleDetailPage = () => {
 
     if (!(Array.isArray(moods) && moods.length)) {
       state.timerId = setTimeout(() => {
+        console.log(props, '< --- timeSchedule props')
         getRemoteMoodList(uaGroupInfo.tyGroupId.toString(), props).then(res => {
           if (res.success && Array.isArray(res.data)) {
+            console.log(res.data, '< --- timeSchedule mood')
             state.moods = cloneDeep(res.data);
             setMoods(cloneDeep(res.data));
             if (!state.mood) state.mood = cloneDeep(res.data[0]);
@@ -196,8 +198,8 @@ const TimeScheduleDetailPage = () => {
   }, [state.timeSchedule.aliasName, state.selectedSkill, isModify, state.isManual, state.mood]);
 
   const showSelectedIcon = useMemo(() => {
-    return state.selectedSkill.length !== 1 && !props.applyForDisabled;
-  }, [state.selectedSkill.length, props.applyForDisabled]);
+    return props.applyForList.length !== 1 && !props.applyForDisabled;
+  }, [props.applyForList.length, props.applyForDisabled]);
 
   const getMoodItemEnable = useCallback((item: MoodUIInfo ) =>{
     return props.isCeilingLight ? ((item.mainLamp.id === state.mood?.mainLamp?.id) && (item.secondaryLamp.id === state.mood?.secondaryLamp?.id)) : item.id === state.mood?.id 
@@ -286,8 +288,8 @@ const TimeScheduleDetailPage = () => {
             {I18n.getLang('timeschedule_add_schedule_subheadline_text')}
           </Text>
           <Spacer height={cx(10)} />
-          <View style={styles.applyContent}>
-            {props.applyForList.length === 0 ? (
+          <View style={[styles.applyContent, {paddingTop: state.selectedSkill.length ? cx(10) : 0}]}>
+            {state.selectedSkill.length === 0 ? (
               <Text>{I18n.getLang('timer_ceiling_fan_selectionfield_no_components_text')}</Text>
             ) : (
               state.selectedSkill.map(skill => (
@@ -529,6 +531,8 @@ const getDefaultManual = (props: TimeScheduleDetailPageParams): ComponentConfig
         ? DeviceType.MixLight
         : props.isCeilingLight
         ? DeviceType.CeilingLight
+        : props.isFanLight ?
+        DeviceType.FanLight
         : DeviceType.LightSource;
   const deviceData =
     deviceType === DeviceType.StripLight
@@ -537,6 +541,8 @@ const getDefaultManual = (props: TimeScheduleDetailPageParams): ComponentConfig
         ? defMixDeviceData
         : deviceType === DeviceType.CeilingLight
         ? defCeilingLihtDeviceData
+        : deviceType === DeviceType.FanLight
+        ? defFanLightDeviceData
         : defDeviceData;
   // @ts-ignore
   return {
@@ -565,7 +571,6 @@ const styles = StyleSheet.create({
     flex: 1,
     justifyContent: 'center',
     paddingHorizontal: cx(10),
-    paddingTop: cx(10),
   },
   applyItem: {
     paddingLeft: cx(5),

package/src/modules/timeSchedule/TimeSchedulePage.tsx

@@ -33,8 +33,8 @@ export interface TimeSchedulePageParams {
   isMatterLight?: boolean;
   isCeilingLight?: boolean;
   isMixLight?: boolean;
-  isSupportFan?: boolean;
-  isSupportUVC?: boolean;
+  isFanLight?: boolean
+  isUVCFan?: boolean;
   applyForList: ApplyForItem[];
   applyForDisabled: boolean; // 是否可以选择apply for
   manualDataDp2Obj: (dps: Record<string, any>) => DeviceStateType;

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

@@ -1,5 +1,5 @@
 import React, { memo, useMemo } from 'react';
-import { CeilingLightData, DeviceType, ManualSettingProps, StripLightData } from '../Interface';
+import { CeilingLightData, DeviceType, 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';
@@ -14,6 +14,7 @@ import Spacer from '@ledvance/base/src/components/Spacer';
 import { useGroupDevices } from '@ledvance/base/src/models/modules/NativePropsSlice';
 import ApplyForDeviceList from '@ledvance/base/src/components/ApplyForDeviceList';
 import { cloneDeep } from 'lodash';
+import { FanAdjustViewContent } from '@ledvance/base/src/components/FanAdjustView';
 const { convertX: cx } = Utils.RatioUtils;
 
 function ManualSettings(props: ManualSettingProps) {
@@ -50,7 +51,7 @@ function ManualSettings(props: ManualSettingProps) {
         ),
       },
     ];
-    if(props.isCeilingLight){
+    if (props.isCeilingLight) {
       return tabs.filter(tab => tab.key !== 0)
     }
     if (!isSupportWhite) {
@@ -87,7 +88,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}
@@ -131,6 +132,54 @@ 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()
+                  }}
+                />
+              )}
+
               <ApplyForDeviceList
                 devices={cloneDeep(groupDevices)}
               />