@ledvance/ui-biz-bundle 1.1.84 → 1.1.86

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/ui-biz-bundle",
   "pid": [],
   "uiid": "",
-  "version": "1.1.84",
+  "version": "1.1.86",
   "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/MixDynamicMoodEditor.tsx

@@ -9,7 +9,7 @@ import {
   View,
 } from 'react-native';
 import { Utils } from 'tuya-panel-kit';
-import { useReactive } from 'ahooks';
+import { useReactive, useUpdateEffect } from 'ahooks';
 import { cloneDeep, isEqual } from 'lodash';
 import Page from '@ledvance/base/src/components/Page';
 import Strings from '@ledvance/base/src/i18n';
@@ -122,6 +122,18 @@ const MixDynamicMoodEditorPage = () => {
     return currentOther.label;
   }, []);
 
+  useUpdateEffect(() =>{
+    if (state.mainNodeIdx < state.mood.mainLamp.nodes?.length){
+      state.mainNode = state.mood.mainLamp.nodes[state.mainNodeIdx]
+    }
+  }, [JSON.stringify(state.mood.mainLamp.nodes), state.mainNodeIdx])
+
+  useUpdateEffect(() =>{
+    if (state.secondaryIdx < state.mood.secondaryLamp.nodes?.length ){
+      state.secondaryNode = state.mood.secondaryLamp.nodes[state.secondaryIdx]
+    }
+  }, [JSON.stringify(state.mood.secondaryLamp.nodes), state.secondaryIdx])
+
   const nameRepeat = useMemo(() => {
     return params.nameRepeat(state.mood)
   }, [state.mood.name]);

package/src/newModules/mood/MoodPage.tsx

@@ -61,16 +61,16 @@ const MoodPage = () => {
     const secondaryIds = map(state.originMoods.map(m => m.secondaryLamp) || [], 'id')
     return filter([...mainIds, ...secondaryIds], v => v !== undefined) as number[]
   }, [JSON.stringify(state.originMoods)])
-  
+
   useEffect(() => {
-    state.loading = true 
+    state.loading = true
     state.timerId = setTimeout(() => {
       getRemoteMoodList(
         devId,
         params,
         params.featureId
       ).then(res => {
-        state.loading = false 
+        state.loading = false
         if (res.success && Array.isArray(res.data)) {
           state.originMoods = cloneDeep(res.data);
         }
@@ -403,6 +403,7 @@ const styles = StyleSheet.create({
   popoverItem: {
     padding: cx(5),
     alignItems: 'flex-start',
+    alignSelf: 'flex-start'
   },
 });
 

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

@@ -398,7 +398,6 @@ function ManualSettings(props: ManualSettingProps) {
                     <Spacer />
                   </View>
                 ))}
-              <Spacer height={cx(16)} />
             </Card>
             <Spacer />
           </View>