@ledvance/ui-biz-bundle 1.1.139 → 1.1.141

package/package.json

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

package/src/modules/timer/TimerPage.tsx

@@ -27,6 +27,8 @@ export type dpItem = {
   cloudKey: any
   stringOn: any
   stringOff: any
+  dpValueToDisplay?: (value: number) => number
+  displayToDpValue?: (value: number) => number
 }
 
 type TimerPageRouteParams = {
@@ -271,6 +273,7 @@ const TimerPage = (props: {theme?: ThemeType}) => {
               <Spacer />
               <DeleteButton
                   text={I18n.getLang('timer_sockets_button_text')}
+                  disabled={!state.selectedSkill.length}
                   onPress={onStartPress}
                   textStyle={{ fontSize: cx(14) }}
                   style={{ backgroundColor: !state.selectedSkill.length ? props.theme?.button.disabled : props.theme?.button.primary }}

package/src/modules/timer/TimerPageAction.ts

@@ -6,11 +6,34 @@ import { useCountDown as useCountDownAHook, useUpdateEffect } from 'ahooks'
 import dayjs from "dayjs"
 import { NativeApi } from "@ledvance/base/src/api/native"
 
+const useConvertCountdown = (item: dpItem): [number, (value: number) => Promise<Result<any>>] => {
+  const [dpValue, setDpValue] = useDp<number, (value: number) => Promise<Result<any>>>(item.dpId);
+  const [displayValue, setDisplayValue] = useState<number>(0);
+  
+  // 当设备值变化时，转换为显示值
+  useEffect(() => {
+    // 如果dpValue是undefined或null，不进行转换
+    if (dpValue == null) return;
+    
+    const value = item.dpValueToDisplay ? item.dpValueToDisplay(dpValue) : dpValue;
+    setDisplayValue(value);
+  }, [dpValue, item.dpValueToDisplay]);
+
+  // 将显示值转换为设备值并设置
+  const handleDisplayValueChange = useCallback((value: number) => {
+    if (value == null) return Promise.reject(new Error('Invalid value'));
+    
+    const newDpValue = item.displayToDpValue ? item.displayToDpValue(value) : value;
+    return setDpValue(newDpValue);
+  }, [setDpValue, item.displayToDpValue]);
+
+  return [displayValue, handleDisplayValueChange];
+}
 
 export const useCountdowns = (dps: dpItem[]) => {
   return dps.map(dp => {
     return ({
-      countdown: useDp<number, (value: number) => Promise<Result<any>>>(dp.dpId),
+      countdown: useConvertCountdown(dp),
       enable: useDp<boolean, (value: boolean) => Promise<Result<any>>>(dp.enableDp),
       ...dp
     })
@@ -24,7 +47,7 @@ type FormateProgressType = {
   endTimer: () => void
 }
 const useFormateProgress: (dp: dpItem) => FormateProgressType = (dp) => {
-  const [countdown, setCountdown] = useDp<number, (value: number) => Promise<Result<any>>>(dp.dpId)
+  const [countdown, setCountdown] = useConvertCountdown(dp)
   const [progress, setProgress] = useCountDownAHook({
     interval: 1000,
     onEnd: () => {

package/src/newModules/powerOnBehavior/LightBehaviorPage.tsx

@@ -82,7 +82,10 @@ const LightBehaviorPage = (props: { theme?: ThemeType }) => {
               content: I18n.getLang('groups_settings_power_on_behavior_secondbox_status_value1_description'),
               value: PowerMemoryMode.Default,
               onPress: (value) => {
-                state.powerMemory.type = value
+                state.powerMemory = {
+                  ...state.powerMemory,
+                  type: value
+                }
                 setPowerMemory(state.powerMemory).then()
               }
             }, {
@@ -90,7 +93,10 @@ const LightBehaviorPage = (props: { theme?: ThemeType }) => {
               content: I18n.getLang('groups_settings_power_on_behavior_secondbox_status_value2_description'),
               value: PowerMemoryMode.Last,
               onPress: (value) => {
-                state.powerMemory.type = value
+                state.powerMemory = {
+                  ...state.powerMemory,
+                  type: value
+                }
                 setPowerMemory(state.powerMemory).then()
               }
             }, {
@@ -98,7 +104,10 @@ const LightBehaviorPage = (props: { theme?: ThemeType }) => {
               content: I18n.getLang('groups_settings_power_on_behavior_secondbox_status_value3_description'),
               value: PowerMemoryMode.Custom,
               onPress: (value) => {
-                state.powerMemory.type = value
+                state.powerMemory = {
+                  ...state.powerMemory,
+                  type: value
+                }
                 setPowerMemory(state.powerMemory).then()
               }
             }]} />
@@ -114,34 +123,63 @@ const LightBehaviorPage = (props: { theme?: ThemeType }) => {
                           isColorMode={state.powerMemory.isColor}
                           reserveSV={true}
                           setIsColorMode={async isColorMode => {
-                            state.powerMemory.isColor = isColorMode
+                            state.powerMemory = {
+                              ...state.powerMemory,
+                              isColor: isColorMode,
+                            }
                           }}
                           h={state.powerMemory.hue} s={state.powerMemory.sat} v={state.powerMemory.val}
                           onHSVChange={(h, s, v) => {
-                            state.powerMemory.hue = h
-                            state.powerMemory.sat = s
-                            state.powerMemory.val = v
+                            state.powerMemory = {
+                              ...state.powerMemory,
+                              isColor: true,
+                              hue: h,
+                              sat: s,
+                              val: v,
+                            }
                           }}
                           onHSVChangeComplete={async (h, s, v) => {
-                            state.powerMemory.hue = h
-                            state.powerMemory.sat = s
-                            state.powerMemory.val = v
+                            state.powerMemory = {
+                              ...state.powerMemory,
+                              isColor: true,
+                              hue: h,
+                              sat: s,
+                              val: v,
+                            }
                             await setPowerMemory(state.powerMemory)
                           }}
                           colorTemp={state.powerMemory.temperature}
                           brightness={state.powerMemory.bright}
                           onCCTChange={cct => {
-                            state.powerMemory.temperature = cct
+                            state.powerMemory ={
+                              ...state.powerMemory,
+                              isColor: false,
+                              temperature: cct,
+                            }
                           }}
                           onCCTChangeComplete={async cct => {
-                            state.powerMemory.temperature = cct
+                            state.powerMemory = {
+                              ...state.powerMemory,
+                              isColor: false,
+                              temperature: cct,
+                            }
+                            console.log('cct', cct, state.powerMemory);
                             await setPowerMemory(state.powerMemory)
                           }}
                           onBrightnessChange={brightness => {
-                            state.powerMemory.bright = brightness
+                            state.powerMemory = {
+                              ...state.powerMemory,
+                              isColor: false,
+                              bright: brightness,
+                            }
                           }}
                           onBrightnessChangeComplete={async brightness => {
-                            state.powerMemory.bright = brightness
+                            state.powerMemory = {
+                              ...state.powerMemory,
+                              isColor: false,
+                              bright: brightness,
+                            }
+                            console.log('brightness', brightness, state.powerMemory);
                             await setPowerMemory(state.powerMemory)
                           }} />
                   </View>

package/src/newModules/sleepWakeUp/SleepWakeUpDetailPage.tsx

@@ -567,8 +567,8 @@ const SleepWakeUpDetailPage = (props: { theme?: ThemeType }) => {
         </View>
         {/* Summary */}
         <Summary
-          frequency={loopText(state.sleepWakeUp.weeks, parseTimer(state.sleepWakeUp.endTime * 60))}
-          time={`${convertMinutesTo12HourFormat(state.sleepWakeUp.startTime, is24HourClock)} - ${convertMinutesTo12HourFormat(state.sleepWakeUp.endTime, is24HourClock)}`}
+          frequency={loopText(state.sleepWakeUp.weeks, parseTimer(getEndTime(state.sleepWakeUp) * 60))}
+          time={`${convertMinutesTo12HourFormat(getStartTime(state.sleepWakeUp), is24HourClock)} - ${convertMinutesTo12HourFormat(getEndTime(state.sleepWakeUp), is24HourClock)}`}
           actions={(
             <View>
               <Text style={{ fontSize: cx(12), color: props.theme?.global.fontColor }}>
@@ -594,7 +594,7 @@ const SleepWakeUpDetailPage = (props: { theme?: ThemeType }) => {
               <View style={styles.filletCorner}>
                 <Text style={styles.rightTitle}>
                   {convertMinutesTo12HourFormat(
-                    state.sleepWakeUp.endTime,
+                    getEndTime(state.sleepWakeUp),
                     is24HourClock
                   )}
                 </Text>

package/src/newModules/timeSchedule/Interface.ts

@@ -1,5 +1,5 @@
 import I18n from "@ledvance/base/src/i18n";
-import { AdjustType, DiySceneInfo } from "@ledvance/base/src/utils/interface";
+import { AdjustType, ApplyForItem, DiySceneInfo } from "@ledvance/base/src/utils/interface";
 import { MoodInfo, MoodUIInfo } from "../mood/Interface";
 
 export interface Timer {
@@ -25,17 +25,6 @@ export interface HSV {
   v: number;
 }
 
-export type Category = 'light' | 'socket' | 'fan' | 'mainLight' | 'secondaryLight' | 'shutter'
-
-export interface ApplyForItem {
-  name?: string
-  index?: number
-  key: string;
-  dp: string;
-  type: Category;
-  enable: boolean;
-}
-
 interface judgmentSupport {
   isSupportColor: boolean;
   isSupportBrightness: boolean;
@@ -68,6 +57,7 @@ export enum DeviceType {
   FanLight = 'fanLight',
   MoodStrip = 'moodStrip',
   Shutter = 'shutter',
+  OsramFanLight = 'osramFanLight'
 }
 // export type DeviceType = 'LightSource' | 'CeilingLight' | 'StringLight' | 'StripLight' | 'MixLight';
 
@@ -111,6 +101,11 @@ export interface ShutterData extends DeviceData {
   percentControl: number
 }
 
+export interface OsramFanLightData extends DeviceData {
+  fanMode: 'fresh' | 'nature'
+  fanSpeed: number
+}
+
 export type ComponentConfig =
   | { type: DeviceType.LightSource; deviceData: DeviceData }
   | { type: DeviceType.MixLight; deviceData: MixLightData }
@@ -120,6 +115,8 @@ export type ComponentConfig =
   | { type: DeviceType.PowerStrip; deviceData: DeviceData}
   | { type: DeviceType.MoodStrip; deviceData: MoodStripData}
   | { type: DeviceType.Shutter; deviceData: ShutterData}
+  | { type: DeviceType.OsramFanLight; deviceData: OsramFanLightData}
+
 export interface TimeScheduleDetailState {
   timeSchedule: Timer;
   dps: Record<string, any>;

package/src/newModules/timeSchedule/TimeScheduleActions.ts

@@ -42,6 +42,12 @@ export const defShutterDeviceData = {
   percentControl: 100
 };
 
+export const defOsramFanLightDeviceData = {
+  ...defDeviceData,
+  fanSpeed: 1,
+  fanMode: 'fresh',
+}
+
 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

@@ -10,7 +10,7 @@ import {SwitchButton, TimerPicker, Utils} from 'tuya-panel-kit';
 import Spacer from '@ledvance/base/src/components/Spacer';
 import LdvWeekView from '@ledvance/base/src/components/weekSelect';
 import {convertTo12HourFormat, loopText, showDialog} from '@ledvance/base/src/utils/common';
-import {ApplyForItem, ComponentConfig, DeviceType, Timer, TimerActions, TimeScheduleDetailState,} from './Interface';
+import { ComponentConfig, DeviceType, Timer, TimerActions, TimeScheduleDetailState,} from './Interface';
 import res from '@ledvance/base/src/res';
 import {useDeviceId, useMoods, useSystemTimeFormate,} from '@ledvance/base/src/models/modules/NativePropsSlice';
 import {TimeSchedulePageParams} from './TimeSchedulePage';
@@ -26,7 +26,8 @@ import {
   defMixDeviceData,
   defMoodStripDeviceData,
   defStripDeviceData,
-  defShutterDeviceData
+  defShutterDeviceData,
+  defOsramFanLightDeviceData
 } from './TimeScheduleActions';
 import MoodItem from '../mood/MoodItem';
 import {getRemoteMoodList} from '../mood/MoodActions';
@@ -35,7 +36,7 @@ import Summary from '@ledvance/base/src/components/Summary'
 import ThemeType from '@ledvance/base/src/config/themeType'
 import Tag from "@ledvance/base/src/components/Tag";
 import DiySceneItem from '@ledvance/base/src/components/DiySceneItem';
-import {DiySceneInfo} from "@ledvance/base/src/utils/interface";
+import {ApplyForItem, DiySceneInfo} from "@ledvance/base/src/utils/interface";
 
 const { convertX: cx } = Utils.RatioUtils;
 const { toFixedString } = Utils.NumberUtils;
@@ -688,7 +689,8 @@ const getDefaultManual = (props: TimeScheduleDetailPageParams): ComponentConfig
     isFanLight: DeviceType.FanLight,
     isCeilingLight: DeviceType.CeilingLight,
     isMoodStrip: DeviceType.MoodStrip,
-    isShutter: DeviceType.Shutter
+    isShutter: DeviceType.Shutter,
+    isOsramFanLight: DeviceType.OsramFanLight
   };
 
   const deviceType = Object.entries(deviceTypeMap)
@@ -702,9 +704,10 @@ const getDefaultManual = (props: TimeScheduleDetailPageParams): ComponentConfig
     [DeviceType.FanLight]: defFanLightDeviceData,
     [DeviceType.MoodStrip]: defMoodStripDeviceData,
     [DeviceType.Shutter]: defShutterDeviceData,
+    [DeviceType.OsramFanLight]: defOsramFanLightDeviceData,
     [DeviceType.PowerStrip]: defDeviceData,
     [DeviceType.LightSource]: defDeviceData,
-    [DeviceType.Plug]: defDeviceData
+    [DeviceType.Plug]: defDeviceData,
   };
 
   return {

package/src/newModules/timeSchedule/TimeSchedulePage.tsx

@@ -14,7 +14,7 @@ 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 { ApplyForItem, DeviceStateType, Timer, TimerActions } from './Interface';
+import { DeviceStateType, Timer, TimerActions } from './Interface';
 import { getTimeSchedule, manageTimeSchedule } from './TimeScheduleActions';
 import { useParams } from '@ledvance/base/src/hooks/Hooks';
 import ScheduleCard from './components/ScheduleCard';
@@ -23,6 +23,7 @@ import Tag from '@ledvance/base/src/components/Tag';
 import { cloneDeep } from 'lodash';
 import ThemeType from '@ledvance/base/src/config/themeType'
 import { showDialog } from '@ledvance/base/src/utils/common';
+import { ApplyForItem } from '@ledvance/base/src/utils/interface';
 
 const { convertX: cx } = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
@@ -43,6 +44,7 @@ export interface TimeSchedulePageParams {
   isPowerStrip?: boolean
   isMoodStrip?: boolean
   isShutter?: boolean
+  isOsramFan?: boolean
   featureId?: string
   applyForList: ApplyForItem[];
   applyForDisabled?: boolean; // 是否可以选择apply for

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

@@ -5,10 +5,11 @@ import {
   FanLightData,
   ManualSettingProps,
   modeOptions,
+  OsramFanLightData,
   ShutterData,
   StripLightData
 } from '../Interface';
-import { View } from 'react-native';
+import { View, Text, } 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';
@@ -26,6 +27,7 @@ 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 LdvSlider from '@ledvance/base/src/components/ldvSlider';
+import OsramFanAdjustView from '@ledvance/base/src/components/OsramFanAdjustView'
 
 const { convertX: cx } = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
@@ -112,7 +114,7 @@ function ManualSettings(props: ManualSettingProps) {
                   state.applyFlag = Symbol()
                 }}
               />
-              {item.enable && (item.type !== 'socket' && item.type !== 'fan') && (
+              {item.enable && !['socket', 'fan', 'osramFan'].includes(item.type) && (
                 <LampAdjustView
                   isSupportColor={props.isSupportColor}
                   isSupportBrightness={props.isSupportBrightness}
@@ -205,6 +207,30 @@ function ManualSettings(props: ManualSettingProps) {
                   }}
                 />
               )}
+
+              {item.enable && item.type === 'osramFan' && (
+                <OsramFanAdjustView
+                  hideFanSwitch={true}
+                  fanSwitch={item.enable}
+                  setFanSwitch={() => {}}
+                  fanSpeed={(state.deviceData as OsramFanLightData).fanSpeed}
+                  setFanSpeed={(v: number) => {
+                    state.deviceData = {
+                      ...state.deviceData,
+                      fanSpeed: v
+                    }
+                    state.manualFlag = Symbol()
+                  }}
+                  fanMode={(state.deviceData as OsramFanLightData).fanMode}
+                  setFanMode={(v: 'fresh' | 'nature') => {
+                    state.deviceData = {
+                      ...state.deviceData,
+                      fanMode: v
+                    }
+                    state.manualFlag = Symbol()
+                  }}
+                />
+              )}
             </Card>
             <Spacer />
           </View>