@ledvance/ui-biz-bundle 1.1.154 → 1.1.155

package/package.json

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

package/src/newModules/energyConsumption/EnergyConsumptionActions.ts

@@ -43,6 +43,7 @@ export async function updatePrice(devId: string, energyData: EnergyData) {
 export async function resetElectricity(devId) {
   const res = await TYSdk.apiRequest('tuya.m.dp.statistics.reset', {devId}, '1.0')
   xLog('resetElectricity res', res)
+  return res
 }
 
 export async function getElectricity(devId: string, addEleDpCode: string, date: string, dateType: DateType): Promise<OverviewItem[]> {

package/src/newModules/energyConsumption/EnergyConsumptionCard.tsx

@@ -148,7 +148,7 @@ const EnergyConsumptionCard = (props: EnergyConsumptionProp) => {
       addEleDpCode: props.addEleDpCode,
     } as EnergyConsumptionPageProps)}>
     <Spacer height={cx(16)}/>
-    <View style={styles.consumedEnergyHeadline}>
+    <View accessibilityLabel={'AdvanceCard'} accessibilityHint={I18n.getLang(state.isGeneration ? 'sockets_headline_power' : 'sockets_ce')} style={styles.consumedEnergyHeadline}>
       <Text
         style={styles.consumedEnergyCardTitle}>{I18n.getLang(state.isGeneration ? 'sockets_headline_power' : 'sockets_ce')}</Text>
       <Image source={Res.energyChart} style={{ width: cx(24), height: cx(24), tintColor: props.theme?.icon.normal }}/>

package/src/newModules/energyConsumption/EnergyConsumptionChart/EnergyChartSection.tsx

@@ -34,7 +34,7 @@ export const EnergyChartSection = ({ isLandscape, state, actions, params, styles
     <>
       <View style={styles.dateTypeContainer}>
         <DateTypeItem
-          style={{ flex: 0.5 }}
+          style={{ flex: 1 }}
           dateType={state.dateType}
           onDateTypeChange={actions.setDateType}
         />

package/src/newModules/energyConsumption/EnergyConsumptionChart/useEnergyData.ts

@@ -121,6 +121,9 @@ export const useEnergyData = (params: EnergyConsumptionChartProps, devId: string
 
   // 封装所有修改状态的函数
   const actions = {
+    cleanChartData: useCallback(() => {
+      state.chartData = []
+    }, []),
     setChartType: useCallback((type: ChartType) => {
       state.chartType = type
     }, []),

package/src/newModules/energyConsumption/EnergyConsumptionPage.tsx

@@ -1,4 +1,5 @@
 import Segmented from '@ledvance/base/src/components/Segmented'
+import { resetElectricity } from './EnergyConsumptionActions'
 import { ChartType } from './co2Data'
 import { EnergyChartSection } from './EnergyConsumptionChart/EnergyChartSection'
 import { PowerChartSection } from './EnergyConsumptionChart/PowerChartSection'
@@ -21,8 +22,10 @@ import {useDeviceId, useSolarPlug, useTimeZoneCity} from "@ledvance/base/src/mod
 import { flattenDeep, isEmpty } from "lodash";
 import { exchangeNumber, localeNumber, monthFormat, monthFormatShort, showDialog } from "@ledvance/base/src/utils/common";
 import {
-  EnergyGeneration, EnergyHistory,
-  exportEnergyCsv, getEnergyGenerationValue, setEnergyGenerationValue,
+  EnergyGeneration,
+  EnergyHistory,
+  getEnergyGenerationValue,
+  setEnergyGenerationValue,
   updatePrice,
   useElectricCurrent,
   usePower,
@@ -136,8 +139,8 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
   }, [isSolarPlug, state.generationMode])
 
   const totalElectricity = useMemo(() => {
-    return Math.max(Number(state.totalElectricity) - (state.energyGeneration.totalElectricity || 0), 0)
-  }, [state.totalElectricity, state.energyGeneration.totalElectricity])
+    return Number(state.totalElectricity)
+  }, [state.totalElectricity])
 
   useUpdateEffect(() =>{
     if(totalElectricity >= 0 && timeZoneCity){
@@ -167,16 +170,17 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
     const item: EnergyHistory = {
       time,
       generationMode: value,
-      value: Number(state.totalElectricity) || 0,
+      value: 0,
       type: isSolarPlug ? (value ? 'Consumption' : 'Generation') : (value ? 'Generation' : 'Consumption')
     }
     const data: EnergyGeneration = {
       generationMode: value,
-      totalElectricity: Number(state.totalElectricity) || 0,
+      totalElectricity: 0,
       history: [item, ...state.energyGeneration.history]
     }
     const res = await setEnergyGenerationValue(devId, data)
     if (res) {
+      await cleanEnergyData()
       state.generationMode = value
       state.energyGeneration = data
     } else {
@@ -185,9 +189,15 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
     state.loading = false
   }
 
-  const onceByDay = () => {
-    const currentDay = dayjs().startOf('day').valueOf()
-    return !!state.energyGeneration.history.find(item => item.time === currentDay)
+  const cleanEnergyData = async () => {
+    const res = await resetElectricity(devId)
+    if (res) {
+      state.todayElectricity = 0
+      state.totalElectricity = 0
+      state.overviewList = []
+      actions.cleanChartData()
+    }
+    return res
   }
 
   const getElectricity = async () => {
@@ -212,6 +222,8 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
           return monthData
         })
         state.overviewList = flattenDeep(monthList)
+      } else {
+        state.overviewList = []
       }
     }
   }
@@ -344,10 +356,17 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
       style={{ position: 'relative' }}
       backText={backTitle}
       headlineText={backTitle}
-      headlineIcon={state.overviewList.length ? res.download_icon : undefined}
+      headlineIcon={res.ic_refresh}
       onHeadlineIconClick={() => {
-        const values = state.overviewList.map(item => [item.key, item.value, (Number(state.price) * Number(item.value)).toFixed(2)])
-        exportEnergyCsv(values, state.unit)
+        showDialog({
+          method: 'confirm',
+          title: I18n.getLang('reset_energy'),
+          subTitle: '',
+          onConfirm: (_, { close }) => {
+            close()
+            cleanEnergyData().then()
+          }
+        })
       }}
       showGreenery={isGeneration}
       greeneryIcon={res.energy_consumption_greenery}
@@ -508,17 +527,6 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
                 if (state.loading) {
                   return
                 }
-                if (onceByDay()) {
-                  showDialog({
-                    method: 'alert',
-                    title: I18n.getLang('switchonlyonce', 'Switching the mode is only allowed once a day.'),
-                    confirmText: I18n.getLang('home_screen_home_dialog_yes_con'),
-                    onConfirm: (_, {close}) => {
-                      close()
-                    }
-                  })
-                  return
-                }
                 showDialog({
                   method: 'confirm',
                   title: getEnergyModeTitle(value),

package/src/newModules/sleepWakeUp/SleepWakeUpPage.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useMemo } from "react";
-import { StyleSheet, View, Text, Image, FlatList } from 'react-native'
+import { StyleSheet, View, Text, Image, FlatList, Platform } from 'react-native'
 import Page from '@ledvance/base/src/components/Page'
 import Tag from '@ledvance/base/src/components/Tag'
 import Spacer from '@ledvance/base/src/components/Spacer'
@@ -256,8 +256,9 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
     addMoodPopover: {
       width: cx(210),
       height: cx(90.5),
-      marginStart: cx(115),
-      marginTop: cx(100),
+      position: 'absolute',
+      right: cx(60),
+      top: Platform.OS === 'android' ? cx(90) : cx(130),
       backgroundColor: props.theme?.card.background,
     },
     popoverItem: {