@ledvance/ui-biz-bundle 1.1.107 → 1.1.109

package/package.json

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

package/src/modules/music/MusicPage.tsx

@@ -26,6 +26,7 @@ const { withTheme } = Utils.ThemeUtils
 
 export interface MusicPageRouterParams extends JudgeTimeScheduleProps {
   switch_led: string
+  colour_switch?: string 
   work_mode: string
   mix_rgbcw: string
   mix_light_scene: string
@@ -116,6 +117,9 @@ const MusicPage = (props: { theme?: ThemeType }) => {
       const dps = {}
       if (workMode !== 'music') dps[params.work_mode] = WorkMode.Music
       if (!switchLed) dps[params.switch_led] = true 
+      if (params.colour_switch && params.isCeilingLight){
+        dps[params.colour_switch] = true 
+      }
       if (!isEmpty(dps)){
         await setDps(dps)
       }

package/src/newModules/energyConsumption/EnergyConsumptionPage.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useMemo } from "react";
 import { ScrollView, StyleSheet, View, Text, Image, TouchableOpacity } from "react-native";
-import { useNavigation } from '@react-navigation/core'
+import { useNavigation, useIsFocused } from '@react-navigation/core'
 import { useRoute } from '@react-navigation/core'
 import Page from "@ledvance/base/src/components/Page";
 import res from "@ledvance/base/src/res";
@@ -9,7 +9,7 @@ import { Utils } from "tuya-panel-kit";
 import Spacer from "@ledvance/base/src/components/Spacer";
 import Card from "@ledvance/base/src/components/Card";
 import OverView from "./component/Overview";
-import { useReactive, useUpdateEffect } from "ahooks";
+import { useInterval, useReactive, useUpdateEffect } from "ahooks";
 import { getDpResultByMonth } from "@ledvance/base/src/models/TuyaApi";
 import {useDeviceId, useEngergyGeneration, useTimeZoneCity} from "@ledvance/base/src/models/modules/NativePropsSlice";
 import { flattenDeep, isEmpty } from "lodash";
@@ -19,7 +19,7 @@ import {ui_biz_routerKey} from "../../navigation/Routers";
 import { EnergyConsumptionDetailProps } from "./EnergyConsumptionDetail";
 import { EnergyConsumptionChartProps } from "./EnergyConsumptionChart";
 import EnergyPopup, { EnergyData, UnitList } from "./component/EnergyModal";
-import { NativeApi } from "@ledvance/base/src/api/native";
+import { NativeApi, queryDpIds } from "@ledvance/base/src/api/native";
 import { carbonDioxideEmission, countryAndRegion } from "./co2Data";
 import ThemeType from '@ledvance/base/src/config/themeType'
 
@@ -55,6 +55,7 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
   const params = useRoute().params as EnergyConsumptionPageProps
   const devId = useDeviceId()
   const navigation = useNavigation()
+  const isFocused = useIsFocused()
   const timeZoneCity = useTimeZoneCity()
   const power = usePower(params.powerDpCode)
   const voltage = useVoltage(params.voltageDpCode)
@@ -75,6 +76,16 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
     return state.overviewList?.length ? `${state.overviewList[len - 1].key} - ${state.overviewList[0].key}` : ''
   }, [state.overviewList])
 
+  useInterval(() => {
+      if (isFocused) {
+        const jsonData = JSON.stringify([params.electricDpCode, params.powerDpCode, params.voltageDpCode])
+        queryDpIds(jsonData, devId).then()
+      }
+    },
+    3000,
+    {immediate: true}
+  )
+
   useEffect(() => {
     getElectricity().then()
     getInitPrice().then()

package/src/newModules/mood/MoodPage.tsx

@@ -43,8 +43,9 @@ const MoodPage = (props: { theme?: ThemeType }) => {
   const [moodInfo, setMoodInfo] = useMoodScene(params);
   const [moods, setMoods] = useMoods();
   const [mainWork, setMainWork] = useWorkMode(params.mainWorkMode);
-  const [secondaryWork, setSecondaryWork] = useWorkMode(params.secondaryWorkMode!);
+  const [secondaryWork] = useWorkMode(params.secondaryWorkMode!);
   const [switchLed] = useSwitchLed(params.switchLedDp)
+  const [, setSecondarySwitch] = useSwitchLed(params.secondarySwitch!)
   const [flagMode, setFlagMode] = useFlagMode();
   const [sceneStatusId, setSceneStatusId] = useSceneStatusId({
     isSupportSceneStatus: params.isSupportSceneStatus,
@@ -231,8 +232,8 @@ const MoodPage = (props: { theme?: ThemeType }) => {
             setMainWork(work).then();
           }
         }
-        if (params.isCeilingLight && params.secondaryWorkMode && secondaryWork === WorkMode.Scene) {
-          setSecondaryWork(WorkMode.Colour).then();
+        if (params.isCeilingLight && params.secondaryWorkMode) {
+          setSecondarySwitch(false)
         }
       }
       return {

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

@@ -1,5 +1,12 @@
 import React, {memo, useMemo} from 'react';
-import {DeviceType, directOptions, FanLightData, ManualSettingProps, modeOptions, StripLightData} from '../Interface';
+import {
+  DeviceType,
+  directOptions,
+  FanLightData,
+  ManualSettingProps,
+  modeOptions,
+  StripLightData
+} from '../Interface';
 import {View} from 'react-native';
 import Card from '@ledvance/base/src/components/Card';
 import LampAdjustView from '@ledvance/base/src/components/LampAdjustView';
@@ -16,7 +23,7 @@ import SocketItem from '@ledvance/base/src/components/SocketItem'
 import res from '@ledvance/base/src/res';
 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
@@ -70,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
     };
@@ -85,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) => {
@@ -274,12 +283,22 @@ function ManualSettings(props: ManualSettingProps) {
 
   const stripLightCard = useMemo(() => {
     const deviceData = state.deviceData as StripLightData
+    const getBlockColor = () => {
+      if (deviceData.activeKey === 1) {
+        const s = Math.round(mapFloatToRange(state.deviceData.s / 100, 30, 100))
+        return hsv2Hex(state.deviceData.h, s, 100)
+      }
+      if (deviceData.activeKey === 0) {
+        return cctToColor(state.deviceData.temperature)
+      }
+      return props.theme?.card.background
+    }
     return (
       <View>
         <Card style={{ marginHorizontal: cx(24) }}>
           <LdvSwitch
             title={I18n.getLang('light_sources_tile_tw_lighting_headline')}
-            color={props.theme?.card.background}
+            color={getBlockColor()}
             colorAlpha={1}
             enable={state.applyForList[0]?.enable}
             setEnable={(enable: boolean) => {