@ledvance/ui-biz-bundle 1.1.169 → 1.1.171

package/package.json

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

package/src/newModules/energyConsumption/EditPriceSegmentContract.tsx

@@ -1,7 +1,9 @@
+import React, { useState, useEffect } 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,) => {
@@ -11,7 +13,14 @@ export const useEditPriceSegment = (segment: PriceSegment | undefined,
 
     const startTime = parseMinutes(startMin);
     const endTime = parseMinutes(endMin);
-    const currentPrice = segment?.price ?? 0
+
+    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;
@@ -32,15 +41,24 @@ export const useEditPriceSegment = (segment: PriceSegment | undefined,
 
         onSegmentSet(updatedSegment);
     };
+
     const handlePriceChange = (t: string) => {
-        const value = t.replace(/[^0-9.,]/g, '')
-        const tempPrice = Number(value)
-        const resultPrice = tempPrice > 999999 ? 999999 : tempPrice
+        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: resultPrice
-        } as PriceSegment)
-    }
+            price: numericVal
+        } as PriceSegment);
+    };
+
     const style = StyleSheet.create({
         timerHeader: {
             fontSize: cx(16),
@@ -84,6 +102,6 @@ export const useEditPriceSegment = (segment: PriceSegment | undefined,
 
     })
     return {
-        style, startTime, endTime, currentPrice, handleTimeChange, handlePriceChange,
+        style, startTime, endTime, currentPrice: priceStr, handleTimeChange, handlePriceChange,
     }
 }

package/src/newModules/energyConsumption/EnergyConsumptionPage.tsx

@@ -303,6 +303,11 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
 
   const updateEnergyData = (data: EnergyData) => {
     updatePrice(devId, data).then()
+    state.network_fixed_data = {
+      unit: data.unit,
+      energyType: 'fixed',
+      [isGeneration ? 'generatePrice' : 'price']: data.price,
+    }
     state.price = data.price || '0'
     state.unit = data.unit
     state.energyType = 'fixed'
@@ -709,7 +714,7 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
             title={state.popupType === 'co2' ? I18n.getLang('consumption_data_field3_co2_topic_text') : state.popupType === 'history' ? I18n.getLang('group_energytotal') : ''}
             cancelText={['co2', 'history'].includes(state.popupType) ? '' : I18n.getLang("auto_scan_system_cancel")}
             confirmText={I18n.getLang(['co2', 'history'].includes(state.popupType) ? 'home_screen_home_dialog_yes_con' : 'auto_scan_system_wifi_confirm')}
-            energyData={{ price: state.price, unit: state.unit }}
+            energyData={{ price: state.popupType === 'money' ? (state.network_fixed_data?.price ?? '0'): state.price , unit: state.unit }}
             energyHistory={state.energyGeneration.history}
             onConfirm={(energyData) => {
               state.popupType = ''

package/src/newModules/energyConsumption/SetSegmentPricesContract.tsx

@@ -42,10 +42,32 @@ export const useSetSegmentPrice = (params: SetSegmentedPricesParams, theme?: The
         isLoading: false,
         isDataChanged: false,
     });
+    const findEmptySegment = useCallback(()=>{
+        let ptr = 0;
+        const TOTAL_MINUTES = 1439; // (0 ~ 1439)
+        for (const segment of uiState.segments) {
+            if(segment.startMinute > ptr) {
+                return {
+                    startMinute: ptr,
+                    endMinute: segment.startMinute,
+                    price: 0,
+                }
+            }
+            ptr = segment.endMinute;
+        }
+        if(ptr < TOTAL_MINUTES) {
+            return {
+                startMinute: ptr,
+                endMinute: TOTAL_MINUTES,
+                price:0,
+            }
+        }
+        return undefined
+    },[uiState.segments])
     const showAddPopup = useCallback(() => {
         uiState.editingSegmentPrice = {
             isShow: true,
-            editingSegmentPrice: undefined,
+            editingSegmentPrice: findEmptySegment(),
         }
     }, [uiState]);
     const showEditPopup = useCallback((item: PriceSegment) => {
@@ -389,6 +411,7 @@ export const useSetSegmentPrice = (params: SetSegmentedPricesParams, theme?: The
                 bottom: 0,
                 left: 0,
                 width: cx(40),
+                minHeight: cx(320),
             },
             segmentItem: {
                 position: 'relative',

package/src/newModules/energyConsumption/component/PowerLineChart.tsx

@@ -78,16 +78,25 @@ const PowerLineChart = (props: PowerLineChartProps) => {
       triggerOn: 'mousemove|click',
       trigger: 'axis',
       position: ['30%', '50%'],
-      formatter: function (params) {
-        if (!params || !params.length) return ''
-        var item = params[0]
-        var date = new Date(item.value[0])
-        function pad(num) {
-          return num < 10 ? '0' + num : num
+      axisPointer: {
+        label: {
+          backgroundColor: '#6a7985',
+          // 这个 formatter 只负责格式化时间
+          formatter: (params: { value: number }) => {
+            const date = new Date(params.value);
+
+            const month = (date.getMonth() + 1).toString().padStart(2, '0');
+            const day = date.getDate().toString().padStart(2, '0');
+            const year = date.getFullYear();
+
+            const hours = date.getHours().toString().padStart(2, '0');
+            const minutes = date.getMinutes().toString().padStart(2, '0');
+            const seconds = date.getSeconds().toString().padStart(2, '0');
+
+            // 返回你指定的 DD/MM/YYYY HH:mm:SS 格式
+            return day + '/' + month + '/' + year + ' ' + hours + ':' + minutes + ':' + seconds;
+          }
         }
-        var time = pad(date.getMonth() + 1) + '/' + pad(date.getDate()) + '/' + date.getFullYear() + ' ' +
-          pad(date.getHours()) + ':' + pad(date.getMinutes()) + ':' + pad(date.getSeconds())
-        return (time + '<br/>' + item.marker + item.seriesName + ': ' + item.value[1])
       }
     },
     grid: {

package/src/newModules/mood/MoodItem.tsx

@@ -78,7 +78,7 @@ const MoodItem = (props: MoodItemProps) => {
     <View style={styles.contentContainer}>
       {/* 顶部内容 */}
       <View style={styles.row}>
-        <Text style={styles.headText}>{mood.name}</Text>
+        <Text style={styles.headText} numberOfLines={2}>{mood.name}</Text>
         {/* checkbox 的 TouchableOpacity 现在也应用了阴影样式 */}
         <TouchableOpacity style={styles.checkbox} onPress={() => onSwitch(!enable)}>
           <Image