@ledvance/ui-biz-bundle 1.1.83 → 1.1.85

package/package.json

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

package/src/newModules/energyConsumption/EnergyConsumptionChart.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { Platform, View, StyleSheet, Image, Text } from "react-native";
+import { Platform, View, StyleSheet, Image } from "react-native";
 import { useRoute } from '@react-navigation/core'
 import Page from "@ledvance/base/src/components/Page";
 import res from "@ledvance/base/src/res";
@@ -9,6 +9,7 @@ import BarChart from "./component/BarChart";
 import { exportFile } from "@ledvance/base/src/utils/common";
 import { OverviewItem } from "./EnergyConsumptionPage";
 import Spacer from "@ledvance/base/src/components/Spacer";
+import InfoText from "@ledvance/base/src/components/InfoText";
 
 const { convertX: cx, height, width } = Utils.RatioUtils
 
@@ -23,12 +24,11 @@ export interface EnergyConsumptionChartProps {
 const EnergyConsumptionChart = () => {
   const props = useRoute().params as EnergyConsumptionChartProps
   const computeNum = Platform.OS === 'ios' && 180 || 130
-
   return (
     <Page
       backText={I18n.getLang('consumption_data_annual_bar_chart_system_back_text')}
       headlineText={props.headlineText}
-      headlineIcon={props.chartData?.length && res.download_icon}
+      headlineIcon={props.chartData?.length ? res.download_icon : undefined}
       onHeadlineIconClick={() => {
         exportFile(props.chartData)
       }}
@@ -44,13 +44,11 @@ const EnergyConsumptionChart = () => {
                 style={styles.listEmptyImage}
                 source={{ uri: res.ldv_timer_empty }} />
               <Spacer height={cx(14)} />
-              <View style={{ flexDirection: 'row', alignItems: 'center' }}>
-                <Image style={styles.listEmptyTextIcon} source={{ uri: res.ic_info }} />
-                <Spacer width={cx(4)} height={0} />
-                <Text style={styles.listEmptyText}>
-                  {I18n.getLang('energyconsumption_hourlylimit')}
-                </Text>
-              </View>
+              <InfoText 
+                text={I18n.getLang('energyconsumption_hourlylimit')}
+                icon={res.ic_info}
+                contentColor='#000'
+              />
             </View>
           ) : (
             <BarChart height={height - cx(computeNum)} data={props.chartData} width={width - cx(80)} />

package/src/newModules/energyConsumption/EnergyConsumptionDetail.tsx

@@ -13,7 +13,7 @@ import {getDataWithSpecified, getDpResultByHour} from "@ledvance/base/src/models
 import {useDeviceId, useEngergyGeneration, useTimeZoneCity} from "@ledvance/base/src/models/modules/NativePropsSlice";
 import {cloneDeep, isEmpty} from "lodash";
 import {OverviewItem, PopupType} from "./EnergyConsumptionPage";
-import {exchangeNumber, localeNumber, loopsText} from '@ledvance/base/src/utils/common'
+import {exchangeNumber, exportFile, localeNumber, loopsText} from '@ledvance/base/src/utils/common'
 import dayjs from "dayjs";
 import {ui_biz_routerKey} from "../../navigation/Routers";
 import {EnergyConsumptionChartProps} from "./EnergyConsumptionChart";
@@ -188,8 +188,10 @@ const EnergyConsumptionDetail = (props: {theme?: any}) => {
     <Page
       backText={I18n.getLang('consumption_data_annual_bar_chart_system_back_text')}
       headlineText={params.curMonth.key}
-      headlineIcon={res.download_icon}
-      onHeadlineIconClick={() => { }}
+      headlineIcon={state.overviewList.length ? res.download_icon : undefined}
+      onHeadlineIconClick={() => { 
+        exportFile(state.overviewList)
+      }}
       showGreenery={false}
       greeneryIcon={res.energy_consumption_greenery}
       loading={state.loading}

package/src/newModules/mood/MoodActions.ts

@@ -246,9 +246,11 @@ export function useSceneStatusId(params: MoodPageParams): [number, (moodId: numb
   const devId = useDeviceId();
   const [sceneStatusId, setSceneStatusId] = useState(-1);
   if (!params.isSupportSceneStatus) {
-    const setEmpty = useCallback(() => {
-      return new Promise<any>(() => {});
-    }, [])
+    const setEmpty = useCallback((moodId: number) => {
+      return new Promise<any>((resolve, _reject) => {
+        resolve(moodId)
+      });
+    }, []);
     return [sceneStatusId, setEmpty]
   }
   useEffect(() => {

package/src/newModules/mood/MoodPage.tsx

@@ -278,7 +278,7 @@ const MoodPage = () => {
               moodInfo.secondaryLamp.id === moodItem.secondaryLamp.id &&
               (mainWork === WorkMode.Scene || secondaryWork === WorkMode.Scene) && !flagMode.flagMode && switchLed
           );
-        } else if (params.isSupportSceneStatus) {
+        } else if (params.isSupportSceneStatus && sceneStatusId !== -1) {
           return sceneStatusId === moodItem.id && mainWork === WorkMode.Scene && !flagMode.flagMode && switchLed
         } else {
           return moodInfo.id === moodItem.id && mainWork === WorkMode.Scene && !flagMode.flagMode && switchLed