@ledvance/ui-biz-bundle 1.1.167 → 1.1.169

package/package.json

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

package/src/navigation/Routers.ts

@@ -49,4 +49,5 @@ export const ui_biz_routerKey = {
   'ui_biz_switch_gradient': 'ui_biz_switch_gradient',
   'ui_biz_diy_scene_page': 'ui_biz_diy_scene_page',
   'ui_biz_diy_scene_edit_page': 'ui_biz_diy_scene_edit_page',
+  'ui_biz_set_segmented_prices': 'ui_biz_set_segmented_prices',
 }

package/src/newModules/biorhythm/BiorhythmPage.tsx

@@ -250,6 +250,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
                   title: I18n.getLang('biorhythm_save_title'),
                   placeholder: I18n.getLang('biorhythm_save_placeholder'),
                   defaultValue: `${deviceInfo.name}`,
+                  maxLength: 32,
                   cancelText: I18n.getLang('auto_scan_system_cancel'),
                   confirmText: I18n.getLang('auto_scan_system_wifi_confirm'),
                   inputWrapperStyle: {backgroundColor: props.theme?.textInput.background, borderRadius: cx(10)},

package/src/newModules/energyConsumption/EditPriceSegmentContract.tsx

@@ -0,0 +1,89 @@
+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";
+
+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 currentPrice = segment?.price ?? 0
+    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 value = t.replace(/[^0-9.,]/g, '')
+        const tempPrice = Number(value)
+        const resultPrice = tempPrice > 999999 ? 999999 : tempPrice
+        onSegmentSet({
+            ...(segment ?? {}),
+            price: resultPrice
+        } 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,
+        },
+        textInputSpacer: {
+            height: 1,
+            position: 'absolute',
+            start: cx(4),
+            end: cx(4),
+            bottom: 0,
+            backgroundColor: theme?.textInput.line,
+        }
+
+    })
+    return {
+        style, startTime, endTime, currentPrice, handleTimeChange, handlePriceChange,
+    }
+}

package/src/newModules/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/newModules/energyConsumption/EnergyConsumptionActions.ts

@@ -15,7 +15,7 @@ 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 { DynamicEnergyData, EnergyData } from './component/EnergyModal'
 import { OverviewItem } from './EnergyConsumptionPage'
 
 dayjs.extend(CustomParseFormat)
@@ -39,6 +39,10 @@ export async function updatePrice(devId: string, energyData: EnergyData) {
   return await NativeApi.putJson(devId, 'energiepreise', JSON.stringify(energyData))
 }
 
+export async function updateDynamicPrice(devId: string, dynamicEnergyData: DynamicEnergyData) {
+    return await NativeApi.putJson(devId, 'dynamicenergyprice', JSON.stringify(dynamicEnergyData))
+}
+
 export async function resetElectricity(devId) {
   const res = await TYSdk.apiRequest('tuya.m.dp.statistics.reset', {devId}, '1.0')
   xLog('resetElectricity res', res)

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

@@ -6,9 +6,10 @@ import { Utils } from 'tuya-panel-kit'
 import DateSwitch from '../component/DateSwitch'
 import { DateType } from '../co2Data'
 import DateTypeItem from '../component/DateTypeItem'
-import NewBarChart from '../component/NewBarChart'
+import NewBarChart, { calculateIntervalAveragePrice } from '../component/NewBarChart'
 import { EmptyDataView } from './EmptyDataView'
 import { exportEnergyCsv } from '../EnergyConsumptionActions'
+import { calculateAveragePrice } from '../component/EnergyModal'
 
 const { convertX: cx } = Utils.RatioUtils
 
@@ -26,9 +27,27 @@ export const EnergyChartSection = ({ isLandscape, state, actions, params, styles
   const isDataEmpty = state.chartData.length <= 0
 
   const handleExportCsv = useCallback(() => {
-    const values = state.chartData.map(item => [item.key, item.value, (Number(params.price) * Number(item.value)).toFixed(2)])
+    const values = state.chartData.map(item => {
+      let itemPrice = Number(params.price);
+      if (params.energyType === 'dynamic' && params.dynamicData) {
+        const intervals = params.isGeneration ? params.dynamicData.generatePrices : params.dynamicData.intervalPrices;
+        if (intervals && intervals.length > 0) {
+          if (state.dateType === DateType.Day) {
+            const hour = parseInt(item.headlineText.split(':')[0]);
+            if (!isNaN(hour)) {
+              itemPrice = calculateIntervalAveragePrice(intervals, hour * 60, (hour + 1) * 60);
+            } else {
+              itemPrice = calculateAveragePrice(intervals);
+            }
+          } else {
+            itemPrice = calculateAveragePrice(intervals);
+          }
+        }
+      }
+      return [item.key, item.value, (itemPrice * Number(item.value)).toFixed(2)];
+    });
     exportEnergyCsv(values, params.unit)
-  }, [state.chartData, params.price, params.unit])
+  }, [state.chartData, params.price, params.unit, params.energyType, params.dynamicData, params.isGeneration, state.dateType])
 
   return (
     <>
@@ -51,7 +70,7 @@ export const EnergyChartSection = ({ isLandscape, state, actions, params, styles
       ) : (
         !state.loading && <>
           {!isLandscape && <View style={styles.downloadContainer}>
-              <TouchableOpacity
+               <TouchableOpacity
                   style={{ width: cx(30) }}
                   onPress={handleExportCsv}>
                   <Image
@@ -59,7 +78,16 @@ export const EnergyChartSection = ({ isLandscape, state, actions, params, styles
                       source={{ uri: res.download_icon }}/>
               </TouchableOpacity>
           </View>}
-            <NewBarChart height={chartHeight} data={state.chartData} price={state.price} unit={params.unit}/>
+            <NewBarChart
+              height={chartHeight}
+              data={state.chartData}
+              price={state.price}
+              unit={params.unit}
+              energyType={params.energyType}
+              dynamicData={params.dynamicData}
+              isGeneration={params.isGeneration}
+              dateType={state.dateType}
+            />
         </>
       )}
     </>