@ledvance/group-ui-biz-bundle 1.0.160 → 1.0.163

package/package.json

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

package/src/modules/energyConsumption/EditPriceSegmentContract.tsx

@@ -0,0 +1,108 @@
+import React, { useState } from "react";
+import ThemeType from "@ledvance/base/src/config/themeType";
+import { parseMinutes, PriceSegment } from "./component/EnergyModal";
+import { Utils } from 'tuya-panel-kit'
+import { StyleSheet } from "react-native";
+import {exchangeNumber} from "@ledvance/base/src/utils/common";
+
+export const useEditPriceSegment = (segment: PriceSegment | undefined,
+    onSegmentSet: (s: PriceSegment) => void, theme?: ThemeType,) => {
+    const cx = Utils.RatioUtils.convertX
+    const startMin = segment?.startMinute ?? 0;
+    const endMin = segment?.endMinute ?? 0;
+
+    const startTime = parseMinutes(startMin);
+    const endTime = parseMinutes(endMin);
+
+    const [priceStr, setPriceStr] = useState<string>(() => {
+        if (segment?.price === undefined) {
+            return '0';
+        }
+        return segment.price.toString();
+    });
+
+    const handleTimeChange = (type: 'startHour' | 'startMinute' | 'endHour' | 'endMinute', value: string) => {
+        let startH = Math.floor(startMin / 60);
+        let startM = startMin % 60;
+        let endH = Math.floor(endMin / 60);
+        let endM = endMin % 60;
+
+        const intVal = parseInt(value, 10) || 0;
+        if (type === 'startHour') startH = intVal;
+        if (type === 'startMinute') startM = intVal;
+        if (type === 'endHour') endH = intVal;
+        if (type === 'endMinute') endM = intVal;
+
+        const updatedSegment: PriceSegment = {
+            ...(segment ?? {}),
+            startMinute: startH * 60 + startM,
+            endMinute: endH * 60 + endM,
+        } as PriceSegment;
+
+        onSegmentSet(updatedSegment);
+    };
+
+    const handlePriceChange = (t: string) => {
+        const cleaned = exchangeNumber(t)
+        const parsed = parseFloat(cleaned);
+        let numericVal = isNaN(parsed) ? 0 : parsed;
+        if (numericVal > 999999) {
+            numericVal = 999999;
+            setPriceStr('999999');
+        } else {
+            setPriceStr(t);
+        }
+
+        onSegmentSet({
+            ...(segment ?? {}),
+            price: numericVal
+        } as PriceSegment);
+    };
+
+    const style = StyleSheet.create({
+        timerHeader: {
+            fontSize: cx(16),
+            fontWeight: 'bold',
+            color: theme?.global.fontColor,
+        },
+        timerDivider: {
+            fontSize: cx(20),
+            fontWeight: 'bold',
+            color: theme?.global.fontColor, paddingTop: cx(16),
+        },
+        inputCardViewContainer: {
+            flexDirection: 'row',
+            paddingHorizontal: cx(16),
+            paddingVertical: cx(8),
+            alignItems: 'center',
+            justifyContent: 'space-between',
+        },
+        inputSecondaryContainer: {
+            flexDirection: 'row',
+            borderRadius: cx(4),
+            backgroundColor: theme?.textInput.background,
+            alignItems: 'center',
+            flex: 0.4,
+        },
+        textInput: {
+            height: cx(44),
+            marginStart: cx(16),
+            marginEnd: cx(6),
+            fontSize: cx(16),
+            color: theme?.textInput.fontColor,
+            flex:1,
+        },
+        textInputSpacer: {
+            height: 1,
+            position: 'absolute',
+            start: cx(4),
+            end: cx(4),
+            bottom: 0,
+            backgroundColor: theme?.textInput.line,
+        }
+
+    })
+    return {
+        style, startTime, endTime, currentPrice: priceStr, handleTimeChange, handlePriceChange,
+    }
+}

package/src/modules/energyConsumption/EditPriceSegmentScreen.tsx

@@ -0,0 +1,89 @@
+import React, { } from 'react';
+import ThemeType from "@ledvance/base/src/config/themeType";
+import { PriceSegment } from "./component/EnergyModal";
+import { Utils } from 'tuya-panel-kit'
+import { Text, TextInput, View } from "react-native";
+import Spacer from '@ledvance/base/src/components/Spacer';
+import Card from '@ledvance/base/src/components/Card';
+import LdvPickerView from '@ledvance/base/src/components/LdvPickerView';
+import I18n from '@ledvance/base/src/i18n';
+import { useEditPriceSegment } from './EditPriceSegmentContract';
+
+const { withTheme } = Utils.ThemeUtils
+const cx = Utils.RatioUtils.convertX
+
+const EditPriceSegmentScreen = (props: EditPriceProps) => {
+    const {style, startTime, endTime, currentPrice, handleTimeChange, handlePriceChange } = useEditPriceSegment(
+        props.segment,
+        props.onSegmentSet,
+        props.theme,
+    )
+    return (
+        <View >
+            <Spacer />
+            {/* Timer Picker */}
+            <View style={{ flexDirection: 'row' }}>
+                {/* Start Time */}
+                <View style={{ flex: 0.45, alignItems: 'center' }}>
+                    <Text style={style.timerHeader}>{I18n.getLang('add_randomtimecycle_timestart_topic')}</Text>
+                    <LdvPickerView
+                        hour={startTime.hour}
+                        minute={startTime.minute}
+                        setHour={(hour) => {
+                            handleTimeChange('startHour', hour)
+                        }}
+                        setMinute={(minute) => {
+                            handleTimeChange('startMinute', minute)
+                        }}
+                        minuteLoop={false}
+                        minutesStep={30}
+                    />
+                </View>
+                {/* Divider */}
+                <View style={{ flex: 0.1, justifyContent: 'center', alignItems: 'center' }}>
+                    <Text style={style.timerDivider}>-</Text>
+                </View>
+                {/* End Time */}
+                <View style={{ flex: 0.45, alignItems: 'center' }}>
+                    <Text style={style.timerHeader}>{I18n.getLang('add_randomtimecycle_timeend_topic')}</Text>
+                    <LdvPickerView
+                        hour={endTime.hour}
+                        minute={endTime.minute}
+                        setHour={(hour) => {
+                            handleTimeChange('endHour', hour)
+                        }}
+                        setMinute={(minute) => {
+                            handleTimeChange('endMinute', minute)
+                        }}
+                        minuteLoop={false}
+                        minutesStep={30}
+                        isAdd59MinsWhen23Clock={true}
+                    />
+                </View>
+            </View>
+            <Spacer />
+            {/* Price Input */}
+            <Card style={{ elevation: cx(1) }}
+                containerStyle={style.inputCardViewContainer}>
+                <Text style={style.timerHeader}>{I18n.getLang('consumption_data_price_per_kwh_headline_text')}</Text>
+                <View style={style.inputSecondaryContainer}>
+                    <TextInput
+                        value={currentPrice.toString()}
+                        onChangeText={handlePriceChange}
+                        style={style.textInput}
+                        keyboardType="numeric"
+                    />
+                    <View style={style.textInputSpacer} />
+                </View>
+            </Card>
+        </View>
+    )
+
+}
+
+export default withTheme(EditPriceSegmentScreen)
+export interface EditPriceProps {
+    segment?: PriceSegment,
+    theme?: ThemeType,
+    onSegmentSet: (segment: PriceSegment) => void,
+}

package/src/modules/energyConsumption/EnergyConsumptionActions.ts

@@ -11,16 +11,22 @@ import { DateType } from "./co2Data";
 import { OverviewItem } from "./EnergyConsumptionPage";
 import dayjs from "dayjs";
 import { isNumber } from "lodash";
-import { EnergyData, UnitList } from "./component/EnergyModal";
+import {DynamicEnergyData, EnergyData, PriceSegment, UnitList} from "./component/EnergyModal";
 import {NativeApi} from "@ledvance/base/src/api/native";
 import {xLog, retryWithBackoff} from "@ledvance/base/src/utils"
 
 interface LightConfig {
   energyConsumption?: EnergyData
+  dynamicenergyprice?: DynamicEnergyData
 }
 
 export const useEnergyConsumption = () => {
-  return useGroupEzvizConfig<LightConfig, EnergyData>('energyConsumption', { unit: UnitList[0], price: '' })
+  return useGroupEzvizConfig<LightConfig, EnergyData>('energyConsumption',
+      { unit: UnitList[0], price: '' , energyType: 'fixed', generatePrice:''})
+}
+export const useDynamicPrice = () => {
+  return useGroupEzvizConfig<LightConfig, DynamicEnergyData>('dynamicenergyprice',
+      {intervalPrices: [] as PriceSegment[], generatePrices: [] as PriceSegment[]})
 }
 
 export const unitDivision = (str: string) => {

package/src/modules/energyConsumption/EnergyConsumptionChart/ChartSection.tsx

@@ -4,11 +4,12 @@ import { Image, TouchableOpacity, View } from 'react-native'
 import { DateType } from '../co2Data'
 import DateTypeItem from '../component/DateTypeItem'
 import DateSwitch from '../component/DateSwitch'
-import NewBarChart from '../component/NewBarChart'
+import NewBarChart, { calculateIntervalAveragePrice } from '../component/NewBarChart'
 import { EmptyDataView } from './EmptyDataView'
 import { exportEnergyCsv } from '../EnergyConsumptionActions'
 import { Utils } from 'tuya-panel-kit'
 import res from '@ledvance/base/src/res'
+import { calculateAveragePrice } from '../component/EnergyModal'
 
 const { convertX: cx } = Utils.RatioUtils
 
@@ -42,6 +43,27 @@ export const ChartSection = ({ isLandscape, state, actions, params, styles, them
     const rows = []
     let i = 0 // 指向 consumedData 的指针
     let j = 0 // 指向 generatedData 的指针
+
+    const getDynamicPrice = (key: string, isGen: boolean) => {
+      let itemPrice = Number(price);
+      if (params.energyType === 'dynamic' && params.dynamicData) {
+        const intervals = isGen ? params.dynamicData.generatePrices : params.dynamicData.intervalPrices;
+        if (intervals && intervals.length > 0) {
+          if (state.dateType === DateType.Day) {
+            const hour = parseInt(key.split(':')[0]);
+            if (!isNaN(hour)) {
+              itemPrice = calculateIntervalAveragePrice(intervals, hour * 60, (hour + 1) * 60);
+            } else {
+              itemPrice = calculateAveragePrice(intervals);
+            }
+          } else {
+            itemPrice = calculateAveragePrice(intervals);
+          }
+        }
+      }
+      return itemPrice;
+    }
+
     // 2. 双指针合并算法
     while (i < consumedData.length || j < generatedData.length) {
       const consumedItem = consumedData[i]
@@ -55,10 +77,12 @@ export const ChartSection = ({ isLandscape, state, actions, params, styles, them
         const consumedValue = Number(consumedItem.value)
         const generatedValue = Number(generatedItem.value)
         if (displayMode === 'consumption' || displayMode === 'both') {
-          rowData.push(consumedValue.toFixed(2), (consumedValue * price).toFixed(2))
+          const itemPrice = getDynamicPrice(consumedKey, false)
+          rowData.push(consumedValue.toFixed(2), (consumedValue * itemPrice).toFixed(2))
         }
         if (displayMode === 'generation' || displayMode === 'both') {
-          rowData.push(generatedValue.toFixed(2), (generatedValue * price).toFixed(2))
+          const itemPrice = getDynamicPrice(generatedKey, true)
+          rowData.push(generatedValue.toFixed(2), (generatedValue * itemPrice).toFixed(2))
         }
         i++
         j++
@@ -66,7 +90,8 @@ export const ChartSection = ({ isLandscape, state, actions, params, styles, them
         dateKey = consumedItem.key
         const consumedValue = Number(consumedItem.value)
         if (displayMode === 'consumption' || displayMode === 'both') {
-          rowData.push(consumedValue.toFixed(2), (consumedValue * price).toFixed(2))
+          const itemPrice = getDynamicPrice(consumedKey, false)
+          rowData.push(consumedValue.toFixed(2), (consumedValue * itemPrice).toFixed(2))
         }
         if (displayMode === 'generation' || displayMode === 'both') {
           // 在 'generation' 或 'both' 模式下，为缺失的产生数据补0
@@ -81,7 +106,8 @@ export const ChartSection = ({ isLandscape, state, actions, params, styles, them
           rowData.push('0.00', '0.00')
         }
         if (displayMode === 'generation' || displayMode === 'both') {
-          rowData.push(generatedValue.toFixed(2), (generatedValue * price).toFixed(2))
+          const itemPrice = getDynamicPrice(generatedKey, true)
+          rowData.push(generatedValue.toFixed(2), (generatedValue * itemPrice).toFixed(2))
         }
         j++
       }
@@ -91,7 +117,7 @@ export const ChartSection = ({ isLandscape, state, actions, params, styles, them
     }
 
     exportEnergyCsv(header, rows)
-  }, [state.displayMode, state.consumptionChartData, state.generationChartData, params.price, params.unit])
+  }, [state.displayMode, state.consumptionChartData, state.generationChartData, params.price, params.unit, params.energyType, params.dynamicData, state.dateType])
 
   const isDataEmpty = state.consumptionChartData.length <= 0 && state.generationChartData.length <= 0
 
@@ -133,6 +159,9 @@ export const ChartSection = ({ isLandscape, state, actions, params, styles, them
                 generatedData={state.generationChartData}
                 price={state.price}
                 unit={params.unit}
+                energyType={params.energyType}
+                dynamicData={params.dynamicData}
+                dateType={state.dateType}
             />
         </>
       )}