@ledvance/group-ui-biz-bundle 1.0.130 → 1.0.131

package/package.json

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

package/src/modules/mood/RecommendMoodItem.tsx

@@ -30,7 +30,7 @@ export default function RecommendMoodItem(props: RecommendMoodItemProps) {
                 value={''}
                 style={styles.content}
                 titleStyle={styles.title}
-                iconStyle={{
+                arrowStyle={{
                     color: '#000',
                     size: cx(16),
                 }} />

package/src/modules/mood_new/RecommendMoodItem.tsx

@@ -63,7 +63,7 @@ const RecommendMixMoodItem = (props: RecommendMixMoodItemProps) => {
         value={''}
         style={styles.content}
         titleStyle={styles.title}
-        iconStyle={{
+        arrowStyle={{
           color: props.theme?.global.fontColor,
           size: cx(16),
         }}

package/src/modules/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_new/Interface";
 
 export interface IAddSingleTime {
@@ -62,16 +62,6 @@ export interface HSV {
   v: number;
 }
 
-export type Category = 'light' | 'socket' | 'fan' | 'mainLight' | 'secondaryLight'
-
-export interface ApplyForItem {
-  name?: string
-  key: string;
-  dp: string;
-  type: Category;
-  enable: boolean;
-}
-
 interface judgmentSupport {
   isSupportColor: boolean;
   isSupportBrightness: boolean;
@@ -102,6 +92,7 @@ export enum DeviceType {
   FanLight = 'fanLight',
   MoodStrip = 'moodStrip',
   Shutter = 'shutter',
+  OsramFanLight = 'osramFanLight',
 }
 // export type DeviceType = 'LightSource' | 'CeilingLight' | 'StringLight' | 'StripLight' | 'MixLight';
 
@@ -144,6 +135,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 }
@@ -152,6 +148,8 @@ export type ComponentConfig =
   | { type: DeviceType.FanLight; deviceData: FanLightData }
   | { 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/modules/timeSchedule/TimeScheduleActions.ts

@@ -47,7 +47,13 @@ export const defMoodStripDeviceData = {
 
 export const defShutterDeviceData = {
   percentControl: 100
-};
+}
+
+export const defOsramFanLightDeviceData = {
+  ...defDeviceData,
+  fanSpeed: 1,
+  fanMode: 'fresh',
+}
 
 export const addTimeSchedule = async (props: IAddSingleTime) => {
   try {

package/src/modules/timeSchedule/TimeScheduleDetailPage.tsx

@@ -19,7 +19,6 @@ 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,
   TimeScheduleDetailState,
@@ -37,7 +36,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 { defDeviceData, defMixDeviceData, defStripDeviceData, defFanLightDeviceData, defMoodStripDeviceData, defShutterDeviceData } from './TimeScheduleActions';
+import { defDeviceData, defMixDeviceData, defStripDeviceData, defFanLightDeviceData, defMoodStripDeviceData, defShutterDeviceData, defOsramFanLightDeviceData } from './TimeScheduleActions';
 import MoodItem from '../mood_new/MoodItem';
 import Summary from './components/Summary'
 import { getRemoteMoodList } from '../mood_new/MoodActions'
@@ -45,7 +44,7 @@ import { MoodInfo, MoodUIInfo } from '../mood_new/Interface';
 import InfoText from '@ledvance/base/src/components/InfoText';
 import ThemeType from '@ledvance/base/src/config/themeType'
 import Tag from '@ledvance/base/src/components/Tag';
-import { DiySceneInfo } from '@ledvance/base/src/utils/interface';
+import { ApplyForItem, DiySceneInfo } from '@ledvance/base/src/utils/interface';
 import DiySceneItem from '@ledvance/base/src/components/DiySceneItem';
 
 const { convertX: cx } = Utils.RatioUtils;
@@ -679,7 +678,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)
@@ -693,6 +693,7 @@ const getDefaultManual = (props: TimeScheduleDetailPageParams): ComponentConfig
     [DeviceType.FanLight]: defFanLightDeviceData,
     [DeviceType.MoodStrip]: defMoodStripDeviceData,
     [DeviceType.Shutter]: defShutterDeviceData,
+    [DeviceType.OsramFanLight]: defOsramFanLightDeviceData,
     [DeviceType.LightSource]: defDeviceData,
   };
 

package/src/modules/timeSchedule/TimeSchedulePage.tsx

@@ -37,6 +37,7 @@ export interface TimeSchedulePageParams {
   isUVCFan?: boolean;
   isMoodStrip?: boolean
   isShutter?: boolean
+  isOsramFan?: boolean
   applyForList: ApplyForItem[];
   applyForDisabled?: boolean; // 是否可以选择apply for
   manualDataDp2Obj: (dps: Record<string, any>) => DeviceStateType;

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

@@ -8,6 +8,7 @@ import {
   directOptions,
   modeOptions,
   ShutterData,
+  OsramFanLightData,
 } from '../Interface';
 import { View } from 'react-native';
 import Card from '@ledvance/base/src/components/Card';
@@ -28,6 +29,8 @@ 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 +115,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}
@@ -206,6 +209,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()
+                  }}
+                />
+              )}
+
               <ApplyForDeviceList
                 devices={cloneDeep(groupDevices)}
               />

package/src/modules/timer/TimerAction.ts

@@ -22,6 +22,7 @@ export interface TimerTask {
   stringOnMin: I18nKey
   stringOffMin: I18nKey
   cloudKey: 'lightingInfo' | 'socketInfo' | 'fanInfo' | 'plugCountDownInfo'
+  displayToDpValue?: (value: number) => number
 }
 
 export enum TaskStatus {
@@ -65,6 +66,7 @@ export function useTimerTasks(timerSettableDps: TimerSettableDp[], devIdGroup: s
       stringOnMin: timerSettableDp.stringOnMin,
       stringOffMin: timerSettableDp.stringOffMin,
       cloudKey: timerSettableDp.cloudKey,
+      displayToDpValue: timerSettableDp.displayToDpValue,
     }))
   }, [JSON.stringify(timerSettableDps)])
 
@@ -75,7 +77,7 @@ export function useTimerTasks(timerSettableDps: TimerSettableDp[], devIdGroup: s
     timerTasks => {
       const dps = {}
       timerTasks.forEach(task => {
-        dps[task.dp.code] = task.duration
+        dps[task.dp.code] = task.displayToDpValue ? task.displayToDpValue(task.duration) : task.duration
         const featureKey = timerSettableDps.find(timerSettableDp => timerSettableDp.dp.code === task.dp.code)?.cloudKey
         devIdGroup.forEach(devId => {
           NativeApi.putJson(devId, task.cloudKey ?? featureKey, JSON.stringify({ [getKey('Status', task.dp.code)]: !!task.duration, [getKey('StartTime', task.dp.code)]: dayjs(task.startTime * 1000).format('YYYY-MM-DD HH:mm:ss'), progressAllNumber: task.duration }))
@@ -176,6 +178,7 @@ export interface TimerSettableDp {
   stringOnMin: I18nKey
   stringOffMin: I18nKey
   cloudKey: 'lightingInfo' | 'socketInfo' | 'fanInfo' | 'plugCountDownInfo'
+  displayToDpValue?: (value: number) => number
 }
 
 export interface TimerPageParams {