@ledvance/group-ui-biz-bundle 1.0.91 → 1.0.93

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

@@ -15,6 +15,9 @@ import { useGroupDevices } from '@ledvance/base/src/models/modules/NativePropsSl
 import ApplyForDeviceList from '@ledvance/base/src/components/ApplyForDeviceList';
 import { cloneDeep } from 'lodash';
 import { FanAdjustViewContent } from '@ledvance/base/src/components/FanAdjustView';
+import { cctToColor } from '@ledvance/base/src/utils/cctUtils';
+import {hsv2Hex, mapFloatToRange } from '@ledvance/base/src/utils';
+import { AdjustType } from '@ledvance/base/src/utils/interface';
 const { convertX: cx } = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
 
@@ -66,6 +69,14 @@ function ManualSettings(props: ManualSettingProps) {
 
   const lightSourceCard = useMemo(() => {
     const { deviceData } = state;
+    const getBlockColor = () => {
+      if (!deviceData.isColorMode) return cctToColor(deviceData.temperature)
+      if (deviceData.isColorMode) {
+        const s = Math.round(mapFloatToRange(deviceData.s / 100, 30, 100))
+        return hsv2Hex(deviceData.h, s, 100)
+      }
+      return props.theme?.card?.background
+    };
     return (
       <View>
         {state.applyForList.map((item, idx) => (
@@ -73,7 +84,7 @@ function ManualSettings(props: ManualSettingProps) {
             <Card style={{ marginHorizontal: cx(24) }}>
               <LdvSwitch
                 title={item.name || item.key}
-                color={props.theme?.card.background}
+                color={getBlockColor()}
                 colorAlpha={1}
                 enable={item.enable}
                 setEnable={(enable: boolean) => {
@@ -99,6 +110,7 @@ function ManualSettings(props: ManualSettingProps) {
                     state.deviceData = {
                       ...state.deviceData,
                       isColorMode: mode,
+                      adjustType: mode ? AdjustType.COLOUR : AdjustType.WHITE
                     };
                     state.manualFlag = Symbol()
                   }}
@@ -195,6 +207,15 @@ function ManualSettings(props: ManualSettingProps) {
   }, [state.deviceData, state.applyForList, props.theme?.card.background]);
 
   const mixLightCard = useMemo(() => {
+    const {deviceData} = state;
+    const getBlockColor = ((type: string) => {
+      if (type === 'mainLight') return cctToColor(deviceData.temperature);
+      if (type === 'secondaryLight') {
+        const s = Math.round(mapFloatToRange(deviceData.s / 100, 30, 100));
+        return hsv2Hex(deviceData.h, s, 100);
+      }
+      return props.theme?.card?.background;
+    });
     return (
       <View>
         {state.applyForList.map((item, idx) => (
@@ -202,7 +223,7 @@ function ManualSettings(props: ManualSettingProps) {
             <Card style={{ marginHorizontal: cx(24) }}>
               <LdvSwitch
                 title={item.key}
-                color={props.theme?.card.background}
+                color={getBlockColor(item.type)}
                 colorAlpha={1}
                 enable={item.enable}
                 setEnable={(enable: boolean) => {
@@ -331,6 +352,17 @@ function ManualSettings(props: ManualSettingProps) {
 
   const ceilingLightCard = useMemo(() => {
     const deviceData = state.deviceData as CeilingLightData
+    const getBlockColor = (type: string) => {
+      if (type === 'mainLight') {
+        return cctToColor(deviceData.temperature);
+      }
+      // deviceData.activeKey === 3为combination
+      if (type === 'secondaryLight' && deviceData.activeKey !== 3) {
+        const s = Math.round(mapFloatToRange(deviceData.s / 100, 30, 100));
+        return hsv2Hex(deviceData.h, s, 100);
+      }
+      return props.theme?.card.background;
+    }
     return (
       <View>
         {state.applyForList.map((item, idx) => (
@@ -338,7 +370,7 @@ function ManualSettings(props: ManualSettingProps) {
             <Card style={{ marginHorizontal: cx(24) }}>
               <LdvSwitch
                 title={item.key}
-                color={props.theme?.card.background}
+                color={getBlockColor(item.type)}
                 colorAlpha={1}
                 enable={item.enable}
                 setEnable={(enable: boolean) => {

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

@@ -15,11 +15,12 @@ interface ScheduleCardProps {
   item: Timer
   style?: ViewStyle
   onEnableChange: (enable: boolean) => void
-  onPress: (item: any) => void
+  onPress: () => void
+  onLongPress: () => void
 }
 
 const ScheduleCard = (props: ScheduleCardProps) => {
-  const { item, style, onEnableChange, onPress } = props;
+  const { item, style, onEnableChange, onPress, onLongPress } = props;
   const is24HourClock = useSystemTimeFormate()
 
   const styles = StyleSheet.create({
@@ -67,10 +68,8 @@ const ScheduleCard = (props: ScheduleCardProps) => {
     <Card
       style={styles.card}
       containerStyle={[styles.container, style]}
-      onPress={() => {
-        onPress(item);
-      }}
-    >
+      onPress={onPress}
+      onLongPress={onLongPress}>
       <View style={styles.infoContainer}>
         <Text style={styles.time}>{is24HourClock ? item.time : convertTo12HourFormat(item.time)}</Text>
         <Text style={styles.loop}>

package/src/modules/timer/TimerAction.ts

@@ -78,7 +78,7 @@ export function useTimerTasks(timerSettableDps: TimerSettableDp[], devIdGroup: s
         dps[task.dp.code] = 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)]: task.startTime, progressAllNumber: task.duration }))
+          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 }))
         })
       })
       return dps

package/src/navigation/Routers.ts

@@ -32,5 +32,7 @@ export const ui_biz_routerKey = {
   'group_ui_biz_switch_inching': 'group_ui_biz_switch_inching',
   'group_ui_biz_energy_consumption': 'group_ui_biz_energy_consumption',
   'group_ui_biz_energy_consumption_detail': 'group_ui_biz_energy_consumption_detail',
-  'group_ui_biz_energy_consumption_chart': 'group_ui_biz_energy_consumption_chart'
+  'group_ui_biz_energy_consumption_chart': 'group_ui_biz_energy_consumption_chart',
+  'group_ui_biz_diy_scene_page': 'group_ui_biz_diy_scene_page',
+  'group_ui_biz_diy_scene_edit_page': 'group_ui_biz_diy_scene_edit_page'
 }