@ledvance/ui-biz-bundle 1.1.149 → 1.1.151

package/package.json

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

package/src/modules/history/HistoryPage.tsx

@@ -1,3 +1,4 @@
+import FeatureInfo from '@ledvance/base/src/components/FeatureInfo'
 import Page from '@ledvance/base/src/components/Page'
 import { useDeviceInfo } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import React, { useCallback, useEffect } from 'react'
@@ -187,6 +188,7 @@ const SwitchHistoryPage = (props: { theme?: ThemeType }) => {
       headlineText={headlineText || I18n.getLang('history_socket_headline_text')}
       headlineIcon={res.download_icon}
       onHeadlineIconClick={downFile}
+      info={<FeatureInfo title={I18n.getLang('history_socket_headline_text')} content={I18n.getLang('infobutton_history')} />}
     >
       <View style={styles.content}>
         <Text style={styles.titleText}>{I18n.getLang('history_contact_sensor_description_text')}</Text>

package/src/modules/timer/TimerPage.tsx

@@ -1,3 +1,4 @@
+import FeatureInfo from '@ledvance/base/src/components/FeatureInfo'
 import React, { useCallback, useEffect } from "react";
 import { View, Text, ScrollView, TouchableOpacity, StyleSheet, Image } from "react-native"
 import { useNavigation } from '@react-navigation/native'
@@ -216,6 +217,7 @@ const TimerPage = (props: {theme?: ThemeType}) => {
       backText={devInfo.name}
       headlineText={I18n.getLang('timer_nightplug_headline_text')}
       onBackClick={navigation.goBack}
+      info={<FeatureInfo title={I18n.getLang('timer_nightplug_headline_text')} content={I18n.getLang('infobutton_timer')} />}
     >
       <ScrollView
         nestedScrollEnabled={true}

package/src/newModules/energyConsumption/EnergyConsumptionActions.ts

@@ -10,10 +10,11 @@ import {
   getSpecifiedTimeDpReportLogs
 } from '@ledvance/base/src/models/TuyaApi'
 import { exportCsvFile, localeNumber, loopsText, monthFormat, monthFormatShort } from '@ledvance/base/src/utils/common'
-import { overDays } from '@ledvance/base/src/utils'
+import { overDays, xLog } from '@ledvance/base/src/utils'
 import dayjs from 'dayjs'
 import CustomParseFormat from 'dayjs/plugin/customParseFormat'
 import { isEmpty } from 'lodash'
+import { TYSdk } from 'tuya-panel-kit'
 import { DateType } from './co2Data'
 import { EnergyData } from './component/EnergyModal'
 import { OverviewItem } from './EnergyConsumptionPage'
@@ -39,6 +40,11 @@ export async function updatePrice(devId: string, energyData: EnergyData) {
   return await NativeApi.putJson(devId, 'energiepreise', JSON.stringify(energyData))
 }
 
+export async function resetElectricity(devId) {
+  const res = await TYSdk.apiRequest('tuya.m.dp.statistics.reset', {devId}, '1.0')
+  xLog('resetElectricity res', res)
+}
+
 export async function getElectricity(devId: string, addEleDpCode: string, date: string, dateType: DateType): Promise<OverviewItem[]> {
   let res: OverviewItem[] = []
   switch (dateType) {
@@ -175,83 +181,37 @@ function createZeroPaddingPoint(timePoint: dayjs.Dayjs): PowerDataItem {
 }
 
 /**
- * 获取设备功率数据（智能填充，高性能，避免在小间隔内插入0值）
+ * 获取设备功率数据
  * @param devId 设备ID
  * @param powerDpCode 功率数据点编码
  * @param interval 时间区间（分钟）
  * @returns 按时间排序的完整数据
  */
-export async function getPowerData(
-  devId: string,
-  powerDpCode: string,
-  interval: number
-): Promise<PowerDataItem[]> {
-  try {
-    const now = dayjs();
-    const endTime = now;
-    const startTime = now.add(-interval, TIME_UNIT);
-    const endTimeMs = endTime.valueOf();
-    const startTimeMs = startTime.valueOf();
-    const paddingIntervalMs = DATA_POINT_INTERVAL_SEC * 1000;
-    // 1. 请求已排序的实际数据
-    const dpResult = await getSpecifiedTimeDpReportLogs(
-      devId,
-      [powerDpCode],
-      'ASC',
-      startTimeMs.toString(),
-      endTimeMs.toString(),
-      RETRY_CONFIG
-    );
-    const validDpResult = Array.isArray(dpResult) ? (dpResult as DpReportSataData[]) : [];
-    const actualData: PowerDataItem[] = validDpResult
-      .map((dp) => {
-        const timeMs = dp.timeStamp * 1000;
-        if (timeMs < startTimeMs || timeMs > endTimeMs) return null;
-        return {
-          key: dayjs.unix(dp.timeStamp).format('HH:mm:ss'),
-          chartTitle: dayjs.unix(dp.timeStamp).format('MM/DD/YYYY HH:mm:ss'),
-          time: timeMs,
-          value: parseFloat(dp.value) / 10,
-        };
-      })
-      .filter((item): item is PowerDataItem => item !== null);
-    // 如果没有任何真实数据，则生成完整的预设0值数据作为兜底
-    if (actualData.length === 0) {
-      const finalData: PowerDataItem[] = [];
-      let currentTime = startTime;
-      while (currentTime.valueOf() < endTimeMs) {
-        finalData.push(createZeroPaddingPoint(currentTime));
-        currentTime = currentTime.add(DATA_POINT_INTERVAL_SEC, 'second');
-      }
-      return finalData;
+export async function getPowerData(devId: string, powerDpCode: string, interval: number): Promise<PowerDataItem[]> {
+  const now = dayjs()
+  const startTime = now.add(-1 * interval, 'minute').valueOf().toString()
+  const endTime = now.valueOf().toString()
+  const dpResult = await getSpecifiedTimeDpReportLogs(
+    devId,
+    [powerDpCode],
+    'ASC',
+    startTime,
+    endTime,
+    {
+      maxRetries: 5,
+      initialDelay: 1000,
+      maxDelay: 30000,
+      backoffFactor: 2
     }
-    // 2. 高性能线性填充
-    const finalData: PowerDataItem[] = [];
-    let lastTimeMs = startTimeMs; // 游标从查询区间的开始时间算起
-    // 遍历所有真实数据点
-    actualData.forEach((currentPoint) => {
-      // 从上一个点的时间开始，用 while 循环填充，直到下一个真实数据点之前
-      let paddingTimeMs = lastTimeMs + paddingIntervalMs;
-      while (paddingTimeMs < currentPoint.time) {
-        finalData.push(createZeroPaddingPoint(dayjs(paddingTimeMs)));
-        paddingTimeMs += paddingIntervalMs;
-      }
-
-      // 添加当前的真实数据点
-      finalData.push(currentPoint);
-      lastTimeMs = currentPoint.time; // 更新游标
-    });
-    // 3. 填充查询末尾的空白区域（从最后一个真实数据点到查询结束时间）
-    let paddingTimeMs = lastTimeMs + paddingIntervalMs;
-    while (paddingTimeMs < endTimeMs) {
-      finalData.push(createZeroPaddingPoint(dayjs(paddingTimeMs)));
-      paddingTimeMs += paddingIntervalMs;
+  ) as DpReportSataData[]
+  return dpResult.map(dp => {
+    return {
+      key: dp.timeStr,
+      chartTitle: dayjs.unix(dp.timeStamp).format('MM/DD/YYYY HH:mm:ss'),
+      time: dp.timeStamp * 1000,
+      value: parseFloat(dp.value) / 10
     }
-    return finalData;
-  } catch (error) {
-    console.error(`[getPowerData] 失败：devId=${devId}, powerDpCode=${powerDpCode}`, error);
-    return [];
-  }
+  })
 }
 
 export const exportEnergyCsv = (values: any[][], unit: string) => {

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

@@ -1,7 +1,7 @@
 import I18n from '@ledvance/base/src/i18n'
 import res from '@ledvance/base/src/res'
-import React from 'react'
-import { Image, Text, TouchableOpacity, View } from 'react-native'
+import React, { useEffect } from 'react'
+import { BackHandler, Image, Text, TouchableOpacity, View } from 'react-native'
 import { Utils } from 'tuya-panel-kit'
 import { ChartType } from '../co2Data'
 import { EnergyChartSection } from './EnergyChartSection'
@@ -9,38 +9,50 @@ import { PowerChartSection } from './PowerChartSection'
 
 const { convertX: cx, width } = Utils.RatioUtils
 
-export const LandscapeView = ({ state, actions, params, styles, theme, screenWidth, screenHeight }) => (
-  <View style={[styles.landscapeContainer, { width: screenWidth, height: screenHeight }]}>
-    <View style={styles.landscapeHeader}>
-      <Text style={styles.landscapeTitle}>
-        {I18n.getLang(state.chartType === ChartType.kWh ? 'chartdisplay_energy' : 'chartdisplay_power')}
-      </Text>
-      <TouchableOpacity onPress={actions.toggleLandscape}>
-        <Image source={{ uri: res.screen_normal }} style={styles.normalScreenIcon}/>
-      </TouchableOpacity>
-    </View>
+export const LandscapeView = ({ state, actions, params, styles, theme, screenWidth, screenHeight }) => {
+  useEffect(() => {
+    const onBack = () => {
+      actions.toggleLandscape()
+      return true
+    }
+    BackHandler.addEventListener('hardwareBackPress', onBack)
+    return () => {
+      BackHandler.removeEventListener('hardwareBackPress', onBack)
+    }
+  }, [])
+  return (
+    <View style={[styles.landscapeContainer, { width: screenWidth, height: screenHeight }]}>
+      <View style={styles.landscapeHeader}>
+        <Text style={styles.landscapeTitle}>
+          {I18n.getLang(state.chartType === ChartType.kWh ? 'chartdisplay_energy' : 'chartdisplay_power')}
+        </Text>
+        <TouchableOpacity onPress={actions.toggleLandscape}>
+          <Image source={{ uri: res.screen_normal }} style={styles.normalScreenIcon}/>
+        </TouchableOpacity>
+      </View>
 
-    <View style={styles.landscapeContent}>
-      {state.chartType === ChartType.kWh ? (
-        <EnergyChartSection
-          isLandscape={true}
-          state={state}
-          actions={actions}
-          params={params}
-          styles={styles}
-          theme={theme}
-          chartHeight={screenHeight - cx(110)}
-        />
-      ) : (
-        <PowerChartSection
-          isLandscape={true}
-          state={state}
-          actions={actions}
-          styles={styles}
-          theme={theme}
-          chartHeight={screenHeight - cx(110)}
-        />
-      )}
+      <View style={styles.landscapeContent}>
+        {state.chartType === ChartType.kWh ? (
+          <EnergyChartSection
+            isLandscape={true}
+            state={state}
+            actions={actions}
+            params={params}
+            styles={styles}
+            theme={theme}
+            chartHeight={screenHeight - cx(110)}
+          />
+        ) : (
+          <PowerChartSection
+            isLandscape={true}
+            state={state}
+            actions={actions}
+            styles={styles}
+            theme={theme}
+            chartHeight={screenHeight - cx(110)}
+          />
+        )}
+      </View>
     </View>
-  </View>
-)
+  )
+}

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

@@ -54,7 +54,7 @@ export const getStyles = (theme: ThemeType | undefined) => StyleSheet.create({
     // width: cx(height + 20), // In landscape, width is screen height
     // height: width, // In landscape, height is screen width
     paddingVertical: cx(30),
-    paddingHorizontal: cx(20),
+    paddingHorizontal: cx(50),
   },
   landscapeHeader: {
     flexDirection: 'row',

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

@@ -128,8 +128,10 @@ export const useEnergyData = (params: EnergyConsumptionChartProps, devId: string
       state.dateType = type
     }, []),
     setInterval: useCallback((newInterval: number) => {
-      state.interval = newInterval
-      state.powerData = []
+      if (newInterval !== state.interval) {
+        state.interval = newInterval
+        state.powerData = []
+      }
     }, []),
     toggleLandscape: useCallback(() => {
       if (!state.isSupportLandscape) return

package/src/newModules/fixedTime/FixedTimePage.tsx

@@ -1,3 +1,4 @@
+import FeatureInfo from '@ledvance/base/src/components/FeatureInfo'
 import React, { memo, useCallback, useMemo } from "react";
 import { FlatList, Image, ScrollView, StyleSheet, Text, View } from 'react-native'
 import Page from "@ledvance/base/src/components/Page";
@@ -210,6 +211,7 @@ const FixedTimePage = (props: { theme?: ThemeType }) => {
       onHeadlineIconClick={() => {
         navigateToEdit('add', newFixedTime(!!params.isPlug))
       }}
+      info={<FeatureInfo title={I18n.getLang('fixedTimeCycle_socket_headline')} content={I18n.getLang('infobutton_fixedtimecycle')} />}
     >
       <ScrollView nestedScrollEnabled={true}>
         <Text style={{

package/src/newModules/powerOnBehavior/LightBehaviorPage.tsx

@@ -1,3 +1,4 @@
+import FeatureInfo from '@ledvance/base/src/components/FeatureInfo'
 import React from 'react'
 import {ScrollView, StyleSheet, Text, View} from 'react-native'
 import {useReactive, useUpdateEffect} from 'ahooks'
@@ -67,6 +68,7 @@ const LightBehaviorPage = (props: { theme?: ThemeType }) => {
     <Page
       backText={deviceInfo.name}
       headlineText={I18n.getLang('light_sources_specific_settings_power_off')}
+      info={<FeatureInfo title={I18n.getLang('light_sources_specific_settings_power_off')} content={I18n.getLang('infobutton_poweronbehavior')} />}
       loading={state.loading}>
       <ScrollView style={styles.root} nestedScrollEnabled={true}>
         <View>

package/src/newModules/powerOnBehavior/PlugBehaviorPage.tsx

@@ -1,3 +1,4 @@
+import FeatureInfo from '@ledvance/base/src/components/FeatureInfo'
 import React from 'react'
 import {ScrollView, StyleSheet} from 'react-native'
 import Page from '@ledvance/base/src/components/Page'
@@ -44,6 +45,7 @@ const PlugBehaviorPage = () => {
     <Page
       backText={deviceInfo.name}
       headlineText={I18n.getLang('light_sources_specific_settings_power_off')}
+      info={<FeatureInfo title={I18n.getLang('light_sources_specific_settings_power_off')} content={I18n.getLang('infobutton_poweronbehavior')} />}
       loading={state.loading}>
       <ScrollView style={styles.root} nestedScrollEnabled={true}>
         {params.powerBehaviorKeys.length > 1 && <>

package/src/newModules/randomTime/RandomTimePage.tsx

@@ -1,3 +1,4 @@
+import FeatureInfo from '@ledvance/base/src/components/FeatureInfo'
 import React, { useCallback, useMemo } from 'react'
 import { FlatList, Image, ScrollView, StyleSheet, Text, View } from 'react-native'
 import Page from '@ledvance/base/src/components/Page'
@@ -213,6 +214,7 @@ const RandomTimePage = (props: { theme?: ThemeType }) => {
       onHeadlineIconClick={() => {
         navigateToEdit('add', newRandomTime(!!params.isPlug))
       }}
+      info={<FeatureInfo title={I18n.getLang('randomtimecycle_sockets_headline_text')} content={I18n.getLang('infobutton_randomtimecycle')} />}
     >
       <ScrollView nestedScrollEnabled={true}>
         <Text style={{

package/src/newModules/timeSchedule/TimeSchedulePage.tsx

@@ -24,6 +24,7 @@ import { cloneDeep } from 'lodash';
 import ThemeType from '@ledvance/base/src/config/themeType'
 import { showDialog } from '@ledvance/base/src/utils/common';
 import { ApplyForItem } from '@ledvance/base/src/utils/interface';
+import FeatureInfo from "@ledvance/base/src/components/FeatureInfo"
 
 const { convertX: cx } = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
@@ -187,6 +188,7 @@ const TimeSchedulePage = (props: { theme?: ThemeType }) => {
       onHeadlineIconClick={() => {
         navigateToEdit('add');
       }}
+      info={<FeatureInfo title={I18n.getLang('timeschedule_overview_headline_text')} content={I18n.getLang('infobutton_timeschedule')} />}
       loading={state.loading}
     >
       <ScrollView nestedScrollEnabled={true}>