@ledvance/ui-biz-bundle 1.1.172 → 1.1.174

package/package.json

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

package/src/modules/timer/TimerPage.tsx

@@ -232,7 +232,7 @@ const TimerPage = (props: {theme?: ThemeType}) => {
                   minute={state.minute}
                   setHour={h => state.hour = h}
                   setMinute={m => state.minute = m}
-                  unit={['h', 'min']}
+                  unit={[I18n.getLang('time_unit_h'), I18n.getLang('socket_settings_switch_off_min')]}
               />
             {/* Apply for */}
               <View>

package/src/newModules/energyConsumption/EditPriceSegmentContract.tsx

@@ -90,6 +90,7 @@ export const useEditPriceSegment = (segment: PriceSegment | undefined,
             marginEnd: cx(6),
             fontSize: cx(16),
             color: theme?.textInput.fontColor,
+            flex:1,
         },
         textInputSpacer: {
             height: 1,

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

@@ -51,6 +51,12 @@ export const useEnergyData = (params: EnergyConsumptionChartProps, devId: string
     }
   }, 5000, { immediate: true })
 
+  // 同步外部传入的价格和单位
+  useEffect(() => {
+    state.price = isNaN(Number(params.price)) ? 0 : Number(params.price)
+    state.unit = params.unit
+  }, [params.price, params.unit])
+
   // 副作用：获取数据
   useEffect(() => {
     state.loading = true

package/src/newModules/energyConsumption/EnergyConsumptionPage.tsx

@@ -488,6 +488,46 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
             </View>
           </Card>
           <Spacer />
+          {/* pricing radio button*/}
+          <Segmented
+              style={{ marginHorizontal: cx(24) }}
+              options={[
+                { label: I18n.getLang('consumption_energy_type_fixed'), value: 'fixed' },
+                { label: I18n.getLang('consumption_energy_type_dynamic'), value: 'dynamic' },
+              ]}
+              value={state.energyType}
+              onChange={(value)=>{
+                const fixedModel = state.network_fixed_data ?? {
+                  price: '0',
+                  unit: '$',
+                  energyType: 'fixed',
+                  generatePrice: '0',
+                }
+                state.loading = true
+                updatePrice(devId, {...fixedModel, energyType: value,}).then((res)=>{
+                  state.loading = false
+                  if(res && res.success) {
+                    state.energyType = value
+                    if(value === 'fixed'){
+                      state.price = fixedModel.price
+                    } else {
+                      const segments = isGeneration ? (dynamicData?.generatePrices ??[]) : (dynamicData?.intervalPrices??[])
+                      state.price = String(calculateAveragePrice(segments))
+                    }
+                  }else{
+                    showDialog({
+                      method: 'confirm',
+                      title: I18n.getLang('title_tips'),
+                      subTitle: I18n.getLang('common_server_api_error'),
+                      onConfirm: (_, { close }) => {
+                        close()
+                      }
+                    })
+                  }
+                })
+              }}
+          />
+          <Spacer style={{height: cx(10)}}/>
           {/* 365 day */}
           <Card
             style={styles.cardContainer}
@@ -512,9 +552,6 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
                     />
                   </TouchableOpacity>}
                 </View>
-                <View style={{ height: cx(35), justifyContent: 'center' }}>
-                  <Text style={[styles.cardTitle]}>{I18n.getLang('consumption_energy_type_title')}</Text>
-                </View>
               </View>
               <View>
                 <View style={{ flexDirection: 'row', alignItems: 'flex-end', marginLeft: cx(10) }}>
@@ -525,9 +562,6 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
                   <Text style={[styles.consumptionNum, { fontSize: cx(30), marginRight: cx(8) }]}>{localeNumber(totalElectricity)}</Text>
                   <Text style={[styles.consumptionNum, { fontSize: cx(20), marginBottom: cx(4) }]}>kWh</Text>
                 </View>
-                <View style={{ flexDirection: 'row', alignItems: 'flex-end', marginLeft: cx(10) }}>
-                  <Text style={[styles.consumptionNum, { fontSize: cx(16), marginRight: cx(8) }]}>{I18n.getLang(state.energyType === 'fixed' ? 'consumption_energy_type_fixed' : 'consumption_energy_type_dynamic')}</Text>
-                </View>
               </View>
             </View>
             <Spacer />
@@ -577,7 +611,7 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
                   <Text style={{ color: props.theme?.global.fontColor, fontWeight: 'bold' }}>{state.price ? `${localeNumber(Number(state.price) * totalElectricity, 2)} ${state.unit}` : '-'}</Text>
                 </View>
                 <View style={{ flexDirection: 'row', alignItems: 'center' }}>
-                  <TouchableOpacity onPress={() => {
+                  {state.energyType === 'fixed' && <TouchableOpacity onPress={() => {
                     state.showPopup = true
                     state.popupType = 'money'
                   }}>
@@ -585,7 +619,8 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
                       <Text style={{ color: props.theme?.button.fontColor }}>{I18n.getLang('consumption_data_field3_button_text')}</Text>
                     </View>
                   </TouchableOpacity>
-                  <TouchableOpacity onPress={() => {
+                  }
+                  {state.energyType === 'dynamic' &&                   <TouchableOpacity onPress={() => {
                     navigation.navigate(ui_biz_routerKey.ui_biz_set_segmented_prices, {
                       backTitle: backTitle,
                       dynamicData: dynamicData ?? {
@@ -607,8 +642,8 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
                           [isGeneration ? 'generatePrices' : 'intervalPrices']: segments
                         }
                         const[fixedRes, dynamicRes] = await Promise.all([
-                            updatePrice(devId, {...fixedModel, energyType: 'dynamic', unit: currency}),
-                            updateDynamicPrice(devId, dynamicMdel)
+                          updatePrice(devId, {...fixedModel, energyType: 'dynamic', unit: currency}),
+                          updateDynamicPrice(devId, dynamicMdel)
                         ])
                         const isDynamicSuccess = dynamicRes && dynamicRes.success
                         const isRegularSuccess = fixedRes && fixedRes.success
@@ -633,6 +668,7 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
                       <Text style={{ color: props.theme?.button.fontColor }}>{I18n.getLang('consumption_data_field_dynamic_money')}</Text>
                     </View>
                   </TouchableOpacity>
+                  }
                 </View>
 
               </View>

package/src/newModules/energyConsumption/SetSegmentPricesContract.tsx

@@ -55,7 +55,8 @@ export const useSetSegmentPrice = (params: SetSegmentedPricesParams, theme?: The
             }
             ptr = segment.endMinute;
         }
-        if(ptr < TOTAL_MINUTES) {
+        //优化项：如果指针是0，表示没有设置过时间段，这个时候不需要帮用户自动填充成00:00 - 23:59增加用户的麻烦，因为至少要两段才可以保存，
+        if(ptr > 0 && ptr < TOTAL_MINUTES) {
             return {
                 startMinute: ptr,
                 endMinute: TOTAL_MINUTES,