@ledvance/group-ui-biz-bundle 1.0.95 → 1.0.96

package/package.json

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

package/src/modules/energyConsumption/EnergyConsumptionDetail.tsx

@@ -243,7 +243,7 @@ const EnergyConsumptionDetail = (props: { theme?: ThemeType }) => {
                   <Image
                     source={res.energy_consumption_cash}
                     resizeMode="contain"
-                    style={{ height: cx(20), width: cx(20), tintColor: props.theme?.button.active }}
+                    style={{ height: cx(20), width: cx(20), tintColor: props.theme?.button.primary }}
                   />
                 </View>
                 <View style={styles.priceNum}>
@@ -273,7 +273,7 @@ const EnergyConsumptionDetail = (props: { theme?: ThemeType }) => {
                 <Image
                   source={res.energy_consumption_cash}
                   resizeMode="contain"
-                  style={{ height: cx(20), width: cx(20), tintColor: props.theme?.button.active }}
+                  style={{ height: cx(20), width: cx(20), tintColor: props.theme?.button.primary }}
                 />
               </View>
               <View>

package/src/modules/energyConsumption/EnergyConsumptionPage.tsx

@@ -378,7 +378,7 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
                       style={{
                         height: cx(20),
                         width: cx(20),
-                        tintColor: props.theme?.button.active,
+                        tintColor: props.theme?.button.primary,
                       }}
                     />
                   </View>
@@ -401,7 +401,7 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
                           style={{
                             height: cx(20),
                             width: cx(20),
-                            tintColor: props.theme?.button.active,
+                            tintColor: props.theme?.button.primary,
                           }}
                         />
                       </TouchableOpacity>
@@ -420,7 +420,7 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
                 <Image
                   source={res.energy_consumption_cash}
                   resizeMode="contain"
-                  style={{ height: cx(20), width: cx(20), tintColor: props.theme?.button.active }}
+                  style={{ height: cx(20), width: cx(20), tintColor: props.theme?.button.primary }}
                 />
               </View>
               <View>

package/src/modules/energyConsumption/component/EnergyModal.tsx

@@ -59,7 +59,7 @@ const EnergyModal = (props: EnergyModalProps) => {
       <Text style={{ color: props.theme?.global.fontColor }}>{text[length - 4] + text[length - 3] + ':'}</Text>
       <Spacer />
       <Text
-        style={{ textDecorationLine: 'underline', color: props.theme?.button.active }}
+        style={{ textDecorationLine: 'underline', color: props.theme?.button.primary }}
         onPress={() => openLink(`${text[length - 2]}:${text[length - 1]}${text[length]}`)}
       >
         {`${text[length - 2]}:${text[length - 1]}${text[length]}`}

package/src/modules/music/MusicActions.ts

@@ -47,6 +47,9 @@ export const useDreamMusicData = (musicOption: MusicPageParams) => {
         }
         dps[musicOption.workModeDp] = WorkMode.Music
         dps[musicOption.switchLedDp] = true
+        if (musicOption.colourLedDp && musicOption.isCeilingLight){
+          dps[musicOption.colourLedDp] = true 
+        }
       }else{
         dps[musicOption.workModeDp] = v.lastWorkMode
       }

package/src/modules/music/MusicPage.tsx

@@ -30,6 +30,8 @@ export interface MusicPageParams {
   musicDataDp: string
   dreamMusicDp?: string
   isMixLight?: boolean
+  isCeilingLight?: boolean
+  colourLedDp?: string 
 }
 
 const MusicPage = (props: { theme?: ThemeType }) => {

package/src/modules/randomTimingForLight/ItemCard.tsx

@@ -24,10 +24,11 @@ export interface ItemCardProps<T> {
   is24Hour?: boolean,
   onSwitch: (enable: boolean) => void
   onPress: () => void
+  onLongPress: () => void
 }
 
 const ItemCard = <T, >(props: ItemCardProps<T>) => {
-  const {item, is24Hour, onSwitch, onPress} = props
+  const {item, is24Hour, onSwitch, onPress, onLongPress} = props
   // 判断是否关闭
   const closed = getIsClosed(item)
 
@@ -56,7 +57,7 @@ const ItemCard = <T, >(props: ItemCardProps<T>) => {
   })
 
   return (
-    <Card style={styles.itemCard} onPress={onPress}>
+    <Card style={styles.itemCard} onPress={onPress} onLongPress={onLongPress}>
       <Spacer height={cx(16)}/>
       <View style={styles.switchLine}>
         <Text style={styles.time}>

package/src/modules/sleepWakeUp/SleepWakeUpPage.tsx

@@ -49,7 +49,7 @@ const SleepWakeUpPage = (props: {theme?: ThemeType}) => {
     sleepScheduleList: cloneDeep(sleepList),
     wakeUpScheduleList: cloneDeep(wakeUpList),
     filteredScheduleList: [] as any[],
-    loading: false 
+    loading: false
   })
 
   const isMaxNum = useMemo(() => {
@@ -193,7 +193,7 @@ const SleepWakeUpPage = (props: {theme?: ThemeType}) => {
       alignItems: 'center'
     },
     emptyBtn: {
-      backgroundColor: props.theme?.button.active,
+      backgroundColor: props.theme?.button.primary,
       borderRadius: cx(5),
       paddingHorizontal: cx(15),
       paddingVertical: cx(10)

package/src/modules/timeSchedule/TimeSchedulePage.tsx

@@ -21,6 +21,7 @@ import ScheduleCard from './components/ScheduleCard';
 import { ui_biz_routerKey } from "../../navigation/Routers";
 import { ApplyForItem } from '@ledvance/base/src/utils/interface';
 import ThemeType from '@ledvance/base/src/config/themeType'
+import { showDialog } from '@ledvance/base/src/utils/common';
 
 const { convertX: cx } = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
@@ -186,6 +187,20 @@ const TimeSchedulePage = (props: { theme?: ThemeType }) => {
                 onPress={() => {
                   navigateToEdit('edit', item);
                 }}
+                onLongPress={() =>{
+                  showDialog({
+                    method: 'confirm',
+                    title: I18n.getLang('cancel_dialog_delete_item_timeschedule_titel'),
+                    subTitle: I18n.getLang('cancel_dialog_delete_item_timeschedule_description'),
+                    onConfirm: async (_, { close }) => {
+                      state.loading = true;
+                      close();
+                      await modDeleteTimeSchedule('del', {...item, status: 2}, item.id.toString());
+                      state.flag = Symbol()
+                      state.loading = false;
+                    },
+                  });
+                }}
               />
             )}
             keyExtractor={item => item.id.toString()}

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

@@ -1,5 +1,13 @@
 import React, { memo, useMemo } from 'react';
-import { CeilingLightData, DeviceType, FanLightData, 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';
@@ -17,7 +25,7 @@ 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';
+import { AdjustType, ApplyForItem } from '@ledvance/base/src/utils/interface';
 const { convertX: cx } = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
 
@@ -69,11 +77,13 @@ 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)
+    const getBlockColor = (item: ApplyForItem) => {
+      if (['light', 'mainLight', 'secondaryLight'].includes(item.type)) {
+        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
     };
@@ -84,7 +94,7 @@ function ManualSettings(props: ManualSettingProps) {
             <Card style={{ marginHorizontal: cx(24) }}>
               <LdvSwitch
                 title={item.name || item.key}
-                color={getBlockColor()}
+                color={getBlockColor(item)}
                 colorAlpha={1}
                 enable={item.enable}
                 setEnable={(enable: boolean) => {