@ledvance/ui-biz-bundle 1.1.124 → 1.1.126

package/package.json

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

package/src/hooks/DeviceDpStateHooks.ts

@@ -153,10 +153,12 @@ export const useConflictTask = (conflictDps: ConflictDps, isPlug?: boolean): [(v
         newState[conflictDps.wakeUpDpCode] = newItems
       }
     }
-    if (conflictDps.switchIngCode && switchInching.enable){
-      newState[conflictDps.switchIngCode] = {
-        ...switchInching,
-        enable: false 
+    if (conflictDps.switchIngCode) {
+      const targetItem = switchInching.find(item => item.channel === conflictItem.channel && item.enable);
+      if (targetItem) {
+        newState[conflictDps.switchIngCode] = switchInching.map(item => 
+          item.channel === conflictItem.channel && item.enable ? { ...item, enable: false } : item
+        );
       }
     }
     state.conflictTask = cloneDeep(newState)

package/src/modules/flags/FlagEditPage.tsx

@@ -213,7 +213,7 @@ const FlagEditPage = (props: { theme?: ThemeType }) => {
             maxLength={33}
             showError={state.mood.name.length > 32 || nameRepeat}
             tipColor={nameRepeat ? props.theme?.global.error : undefined}
-            tipIcon={nameRepeat ? res.ic_text_field_input_error : undefined}
+            tipIcon={nameRepeat ? { uri: res.ic_text_field_input_error } : undefined}
             errorText={I18n.getLang(nameRepeat ? 'string_light_pp_field_sm_add_error1' : 'add_new_dynamic_mood_alert_text')} />
           {(params.moduleParams.isSupportMixScene || params.moduleParams.isCeilingLight) && <><Card style={styles.adjustCard}>
               <Spacer height={cx(16)} />
@@ -387,11 +387,10 @@ const FlagEditPage = (props: { theme?: ThemeType }) => {
                   state.mood.colors = state.mood.colors.map(() => (
                     { h, s, v }
                   ))
-                } else {
-                  state.currentNode.h = h
-                  state.currentNode.s = s
-                  state.currentNode.v = v
                 }
+                state.currentNode.h = h
+                state.currentNode.s = s
+                state.currentNode.v = v
               }}
               onHSVChangeComplete={(h, s, v) => {
                 if (state.colorPaintBucketSelected) {
@@ -399,9 +398,6 @@ const FlagEditPage = (props: { theme?: ThemeType }) => {
                     { h, s, v }
                   ))
                 } else {
-                  state.currentNode.h = h
-                  state.currentNode.s = s
-                  state.currentNode.v = v
                   state.mood.colors = state.mood.colors.map((item, idx) => {
                     if (idx === state.colorPaintBucketIdx) {
                       return { h, s, v }
@@ -409,6 +405,9 @@ const FlagEditPage = (props: { theme?: ThemeType }) => {
                     return item
                   })
                 }
+                state.currentNode.h = h
+                state.currentNode.s = s
+                state.currentNode.v = v
               }}
             />
             <Spacer height={cx(16)} />

package/src/modules/history/HistoryPage.tsx

@@ -82,11 +82,17 @@ const SwitchHistoryPage = (props: { theme?: ThemeType }) => {
   }, [state.onRefresh, state.filterTags])
 
   const downFile = () => {
-    const headers = [I18n.getLang('date'), 'Time', 'Status', I18n.getLang('manual_search_button_socket')]
+    const headers = [I18n.getLang('date'), 'Time', 'Status']
+    if (!!tags) {
+      headers.push(I18n.getLang('manual_search_button_socket'))
+    }
     const values = state.data.reduce((acc, item) => {
       const actions = item.actions.map(action => {
-        const name = tags ? tags[action.dpId] : action.dpId
-        return [action.date, action.time, action.action, name]
+        const data = [action.date, action.time, action.action];
+        if (!!tags) {
+          data.push(tags[action.dpId])
+        }
+        return data
       });
       return acc.concat(actions);
     }, [] as string[][]);

package/src/newModules/energyConsumption/EnergyConsumptionActions.ts

@@ -139,7 +139,7 @@ const getDpResultByDate = async (devId: string, addEleDpCode: string, date: stri
 
 export const exportEnergyCsv = (values: any[][], unit: string) => {
   const headers = [I18n.getLang('date'), `${I18n.getLang('consumption_data_annual_bar_chart_system_back_text')} (kWh)`, `Price(${unit})`]
-  const functionName = `${I18n.getLang('consumption_data_annual_bar_chart_system_back_text')}`
+  const functionName = 'EnergyConsumption'
   exportCsvFile(headers, values, functionName)
 }
 

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

@@ -42,6 +42,10 @@ const BarChartWithTouch = (props: BarChartProps) => {
         }
         return max
     }, [dataKwhY]);
+    const gridRight = useMemo(() => {
+        const max = Math.max(...dataPriceY.map(it => Number(it)))
+        return max > 999 ? '12%' : '10%'
+    }, [dataPriceY])
     const option = {
         tooltip: {
             show: true,
@@ -55,6 +59,9 @@ const BarChartWithTouch = (props: BarChartProps) => {
                 color: theme?.global.fontColor,
             }
         },
+        grid: {
+            right: gridRight,
+        },
         xAxis: {
             data: dataX,
             axisTick: {

package/src/newModules/swithInching/SwithInching.tsx

@@ -1,17 +1,18 @@
-import React, { useEffect } from "react";
-import { StyleSheet, Text, View } from "react-native";
+import React, { useEffect, useMemo, useRef, useState } from "react";
+import { ScrollView, StyleSheet, Text, View } from "react-native";
 import Page from "@ledvance/base/src/components/Page";
 import { useDeviceInfo } from "@ledvance/base/src/models/modules/NativePropsSlice";
 import { useNavigation } from '@react-navigation/native'
 import { SwitchButton, Utils, Dialog } from "tuya-panel-kit";
 import LdvPickerView from "@ledvance/base/src/components/ldvPickerView";
 import I18n from '@ledvance/base/src/i18n'
-import { useReactive, useUpdateEffect } from "ahooks";
-import { SwitchInchingPageParams, useCountdown1, useSwitchInching } from "./SwithInchingAction";
+import { SwitchInchingItem, SwitchInchingPageParams, useSwitchInching, defSwitchInching, useCountdowns } from "./SwithInchingAction";
 import { useParams } from "@ledvance/base/src/hooks/Hooks";
 import ThemeType from '@ledvance/base/src/config/themeType'
 import { useConflictTask } from "../../hooks/DeviceDpStateHooks";
 import { showDialog } from "@ledvance/base/src/utils/common";
+import Segmented from "@ledvance/base/src/components/Segmented";
+import Spacer from "@ledvance/base/src/components/Spacer";
 
 const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
@@ -21,48 +22,66 @@ const SwitchInching = (props: { theme?: ThemeType }) => {
   const deviceInfo = useDeviceInfo()
   const navigation = useNavigation()
   const [switchInching, setSwitchInching] = useSwitchInching(params.switchIngCode)
-  const [countdown1, setCountDown1] = useCountdown1(params.countdownCode)
   const [checkConflict, resolveConflict] = useConflictTask(params.conflictDps, true)
-  const state = useReactive({
-    enable: false,
+  const [countdowns, setCountdowns] = useCountdowns(params.countdownCode || params.channelConfig.map(item => item.countdownCode))
+  const timeRef = useRef({
     minute: '00',
     second: '00',
-    loading: false
+  })
+  const [state, setState] = useState({
+    loading: false,
+    channel: 0,
+    switchInchingItem: defSwitchInching[0]
   })
 
-  useEffect(() => {
-    state.enable = switchInching.enable
-    state.minute = formateValue('minute')
-    state.second = formateValue('second')
-  }, [JSON.stringify(switchInching)])
-
-  const requestSwitchInching = async () => {
-    const enable = state.enable
-    const time = Number(state.minute) * 60 + Number(state.second)
-    if (enable && countdown1){
-      setCountDown1(0)
-    }
-    await setSwitchInching({ enable, time })
-  }
+  const updateState = (newState: Partial<typeof state>) => {
+    setState(prev => ({ ...prev, ...newState }));
+  };
 
-  useUpdateEffect(() => {
-    if (!!!Number(state.minute) && Number(state.second) < 2) {
-      state.second = '02'
+  const updateTime = (minute?: string, second?: string) => {
+    if (minute !== undefined) timeRef.current.minute = minute;
+    if (second !== undefined) timeRef.current.second = second;
+    
+    if (!Number(timeRef.current.minute) && Number(timeRef.current.second) < 1) {
+      timeRef.current.second = '01';
     }
-    if (Number(state.minute) === 60) {
-      state.second = '00'
+    
+    if (Number(timeRef.current.minute) === 60) {
+      timeRef.current.second = '00';
     }
-  }, [state.minute, state.second])
+    
+    const time = Number(timeRef.current.minute) * 60 + Number(timeRef.current.second);
+    const newSwitchInchingItem = {
+      ...state.switchInchingItem,
+      time
+    };
+    
+    updateState({ switchInchingItem: newSwitchInchingItem });
+    
+  };
 
-  const formateValue = (type: string) => {
-    const m = parseInt(String((switchInching?.time || 0) / 60))
-    if (type === 'minute') {
-      return m.toString().padStart(2, '0')
-    } else {
-      const s = switchInching.time - 60 * m
-      const v: string = s === 0 ? '00' : s < 10 ? '0' + s : String(s)
-      return v
-    }
+  const switchInchingItem = useMemo(() => {
+    return switchInching.find(item => item.channel === state.channel) ?? { ...defSwitchInching[0], channel: state.channel }
+  }, [state.channel, JSON.stringify(switchInching)])
+
+  useEffect(() => {
+    const { minute, second } = formateValue(switchInchingItem)
+    timeRef.current = { minute, second }
+    updateState({ switchInchingItem })
+  }, [switchInchingItem])
+
+  const saveInchingConfig = async (item: SwitchInchingItem) => {
+    const updatedSwitchInching = [...switchInching];
+    const existingItemIndex = updatedSwitchInching.findIndex(item => item.channel === state.channel);
+    updatedSwitchInching[existingItemIndex] = item;
+    console.log('updatedSwitchInching', updatedSwitchInching)
+    await setSwitchInching(updatedSwitchInching)
+  }
+
+  const formateValue = (switchInchingItem: SwitchInchingItem) => {
+    const minute = Math.floor((switchInchingItem.time || 0) / 60).toString().padStart(2, '0')
+    const second = ((switchInchingItem.time || 0) % 60).toString().padStart(2, '0')
+    return { minute, second }
   }
 
   const styles = StyleSheet.create({
@@ -120,71 +139,95 @@ const SwitchInching = (props: { theme?: ThemeType }) => {
     <Page
       backText={deviceInfo.name}
       onBackClick={navigation.goBack}
-      headlineText={I18n.getLang('socket_settings_switch_off_firstbox_text')}
+      headlineText={I18n.getLang('sockets_specific_settings_switch_inching')}
     >
-      <View style={styles.switchContainer}>
-        <View style={styles.switchCardContainer}>
-          <Text style={styles.switchCardTitle}>
-            {I18n.getLang('socket_settings_switch_off_firstbox_text')}
-          </Text>
-          <SwitchButton
-            value={switchInching.enable}
-            onValueChange={async v => {
-              if (v) {
-                const switchingTask = {
+      <ScrollView nestedScrollEnabled={true}>
+        {params.channelConfig && params.channelConfig.length > 1 && <>
+          <Segmented
+            style={{ marginHorizontal: cx(24) }}
+            options={params.channelConfig.map(item => ({
+              label: item.channelTitle,
+              value: item.channel
+            }))}
+            value={state.channel}
+            onChange={v => {
+              updateState({ channel: Number(v) })
+            }}
+          />
+          <Spacer />
+        </>}
+        <View style={styles.switchContainer}>
+          <View style={styles.switchCardContainer}>
+            <Text style={styles.switchCardTitle}>
+              {I18n.getLang('socket_settings_switch_off_firstbox_text')}
+            </Text>
+            <SwitchButton
+              value={state.switchInchingItem.enable}
+              onValueChange={async v => {
+                const time = Number(timeRef.current.minute) * 60 + Number(timeRef.current.second)
+                const newSwitchInchingItem = {
+                  ...state.switchInchingItem,
                   enable: v,
-                  startTime: 0,
-                  endTime: 1440,
-                  weeks: [1, 1, 1, 1, 1, 1, 1],
+                  time
                 }
-                if (checkConflict(switchingTask)) {
-                  return showDialog({
-                    method: 'confirm',
-                    title: I18n.getLang('conflict_dialog_save_item_inching_titel'),
-                    subTitle: I18n.getLang('conflict_dialog_save_item_inching_description'),
-                    onConfirm: async (_, { close }) => {
-                      resolveConflict()
-                      close()
-                      state.loading = true
-                      state.enable = v;
-                      await requestSwitchInching()
-                    },
-                    onCancel: () => {
-                      Dialog.close()
-                    }
-                  })
+                if (v) {
+                  const switchingTask = {
+                    enable: v,
+                    startTime: 0,
+                    endTime: 1440,
+                    weeks: [1, 1, 1, 1, 1, 1, 1],
+                  }
+                  const countdown = params.countdownCode ? countdowns[params.countdownCode] : countdowns[params.channelConfig[state.channel].countdownCode]
+                  if (countdown) {
+                    setCountdowns(params.countdownCode || params.channelConfig[state.channel].countdownCode, 0).then()
+                  }
+                  if (checkConflict(switchingTask)) {
+                    return showDialog({
+                      method: 'confirm',
+                      title: I18n.getLang('conflict_dialog_save_item_inching_titel'),
+                      subTitle: I18n.getLang('conflict_dialog_save_item_inching_description'),
+                      onConfirm: async (_, { close }) => {
+                        resolveConflict()
+                        close()
+                        state.loading = true
+                        updateState({ switchInchingItem: newSwitchInchingItem })
+                        setTimeout(async () => {
+                          await saveInchingConfig(newSwitchInchingItem)
+                        }, 0)
+                      },
+                      onCancel: () => {
+                        Dialog.close()
+                      }
+                    })
+                  }
                 }
-              }
-              state.enable = v;
-              await requestSwitchInching()
-            }}
-          />
+                updateState({ switchInchingItem: newSwitchInchingItem })
+                await saveInchingConfig(newSwitchInchingItem)
+              }}
+            />
+          </View>
+          <Text style={styles.switchDescription}>
+            {I18n.getLang('switchinching_overview_description_text')}
+          </Text>
         </View>
-        <Text style={styles.switchDescription}>
-          {I18n.getLang('switchinching_overview_description_text')}
+        <Text style={styles.secondTopic}>
+          {I18n.getLang('socket_settings_switch_off_secondtopic')}
         </Text>
-      </View>
-      <Text style={styles.secondTopic}>
-        {I18n.getLang('socket_settings_switch_off_secondtopic')}
-      </Text>
-      <View style={styles.pickContainer}>
-        {switchInching.enable && <View style={styles.disabledCover} />}
-        <LdvPickerView
-          hour={state.minute}
-          minute={state.second}
-          unit={[
-            I18n.getLang('socket_settings_switch_off_min'),
-            I18n.getLang('socket_settings_switch_off_s'),
-          ]}
-          setHour={m => {
-            state.minute = m;
-          }}
-          setMinute={s => {
-            state.second = s;
-          }}
-          maxHour={61}
-        />
-      </View>
+        <View style={styles.pickContainer}>
+          {state.switchInchingItem.enable && <View style={styles.disabledCover} />}
+          <LdvPickerView
+            hour={timeRef.current.minute}
+            minute={timeRef.current.second}
+            unit={[
+              I18n.getLang('socket_settings_switch_off_min'),
+              I18n.getLang('socket_settings_switch_off_s'),
+            ]}
+            setHour={m => updateTime(m, undefined)}
+            setMinute={s => updateTime(undefined, s)}
+            maxHour={61}
+          />
+        </View>
+      </ScrollView>
     </Page>
   );
 };

package/src/newModules/swithInching/SwithInchingAction.ts

@@ -1,61 +1,82 @@
-import {Buffer} from 'buffer'
-import {Result} from "@ledvance/base/src/models/modules/Result"
-import {useDp} from "@ledvance/base/src/models/modules/NativePropsSlice";
+import { Buffer } from 'buffer'
+import { Result } from "@ledvance/base/src/models/modules/Result"
+import { useDp } from "@ledvance/base/src/models/modules/NativePropsSlice";
+import { spliceByStep } from '@ledvance/base/src/utils/common';
+import { Utils } from '@tuya/tuya-panel-lamp-sdk'
 
+const { to16 } = Utils
 export interface SwitchInchingPageParams {
   switchIngCode: string
-  countdownCode: string
+  countdownCode?: string
+  channelConfig: {
+    countdownCode: string 
+    channelTitle: string 
+    channel: number
+  }[]
   conflictDps: {
     randomTimeDpCode?: string
     fixedTimeDpCode?: string
   }
 }
 
-interface SwitchInchingModel {
+export interface SwitchInchingItem {
+  channel: number,
   enable: boolean,
   time: number
 }
 
-function format(number: string, code: number) {
-  const l = number.length;    //获取要格式化数字的长度，如二进制1的话长度为1
-  if (l < code) {     //补全位数 0000，这里我要显示4位
-    for (let i = 0; i < code - l; i++) {
-      number = "0" + number;     //不够的就在前面补0
-    }
-  }
-  return number;
-}
 
-type SwitchInchingResult = (switchInchingCode: string) => [SwitchInchingModel, (v: SwitchInchingModel) => Promise<Result<any>>]
 
-export function useCountdown1(countdownCode: string): [number, (countdown1: number) => Promise<Result<any>>] {
-  return useDp(countdownCode);
+export function useCountdowns(countdownCodes: string | string[]): [Record<string, number>, (countdownCode: string, value: number) => Promise<Result<any>>] {
+  const codes = Array.isArray(countdownCodes) ? countdownCodes : [countdownCodes];
+  const countdownValues: Record<string, number> = {};
+  const dpSetters: Record<string, (value: number) => Promise<Result<any>>> = {};
+  
+  for (const code of codes) {
+    const [value, setDp] = useDp<number, any>(code);
+    countdownValues[code] = value;
+    dpSetters[code] = setDp;
+  }
+  
+  const setCountdown = async (countdownCode: string, value: number) => {
+    if (dpSetters[countdownCode]) {
+      return await dpSetters[countdownCode](value);
+    }
+    return { success: false, msg: 'Countdown code not found' } as Result<any>;
+  };
+  
+  return [countdownValues, setCountdown];
 }
 
 export function useSwitchInchingHex(switchInchingCode: string): [string, (switchInching: string) => Promise<Result<any>>] {
   return useDp(switchInchingCode)
 }
 
-export const useSwitchInching: SwitchInchingResult = (switchInchingCode: string) => {
+export const defSwitchInching = [{ enable: false, channel: 0, time: 1 }]
+
+export const useSwitchInching = (switchInchingCode: string) => {
   const [hex, setHex] = useSwitchInchingHex(switchInchingCode)
-  let enable = false 
-  let time = 0
-  if (switchInchingCode && hex){
-    const inching = Buffer.from(hex, 'base64')
-    enable = !!inching[0]
-    time = inching[1] * 256 + inching[2]
-  }
-  const setSwitchInching = ({enable, time}) => {
-    const enableHex = enable ? '01' : '00'
-    const timeHex = format(time?.toString(16), 4)
-    const inchingString = enableHex + timeHex
-    const inchingHex = hexToBase64(inchingString)
+  const switching = hex ? spliceByStep(Buffer.from(hex, 'base64').toString('hex'), 6).map(item => {
+    const powerInfo = parseInt(`${item.slice(0, 2)}`, 16).toString(2).padStart(8, '0');
+    const powerBits = powerInfo.split('');
+    const enable = !!Number(powerBits[powerBits.length - 1]);
+    // 通道号
+    const channel = parseInt(powerBits.slice(1, powerBits.length - 1).join(''), 2);
+    const time = parseInt(item.slice(2, 6), 16)
+    return { enable, channel, time }
+  }) : defSwitchInching
+
+  const setSwitchInching = (switching: SwitchInchingItem[]) => {
+    const inchingString = switching.map(item => {
+      const channelStr = item.channel.toString(2).padStart(7, '0')
+      const powerChannel = parseInt(`${channelStr}${item.enable ? 1 : 0}`, 2);
+      const powerChannelStr = to16(powerChannel, 2);
+      const timeHex = item.time?.toString(16).padStart(4, '0')
+      return powerChannelStr + timeHex
+    }).join('')
+    const inchingHex = Buffer.from(inchingString, 'hex').toString('base64')
     return setHex(inchingHex)
   }
-  return [{enable, time}, setSwitchInching]
+  return [switching, setSwitchInching] as const
 }
 
-const hexToBase64 = (hex: string) => {
-  const buffer = Buffer.from(hex, 'hex');
-  return buffer.toString('base64');
-}

package/src/newModules/timeSchedule/components/ScheduleCard.tsx

@@ -40,7 +40,6 @@ const ScheduleCard = (props: ScheduleCardProps) => {
     infoContainer: {
       flex: 1,
       marginTop: cx(16),
-      marginBottom: cx(16),
       flexDirection: 'column',
       marginLeft: cx(16),
     },
@@ -65,20 +64,22 @@ const ScheduleCard = (props: ScheduleCardProps) => {
     },
     switchContainer: {
       marginRight: cx(16),
-      // backgroundColor: 'red',
       marginTop: cx(16),
     },
     switch: {},
     typeContainer: {
       flexDirection: 'row',
-      marginTop: cx(8),
+      flexWrap: 'wrap',
+      marginVertical: cx(8),
+      marginHorizontal: cx(16),
     },
     tag: {
       borderRadius: cx(16),
       height: cx(16),
       backgroundColor: '#E6E7E8',
       marginRight: cx(10),
-      paddingHorizontal: cx(12)
+      marginBottom: cx(6),
+      paddingHorizontal: cx(10)
     },
     tagTitle: {
       fontSize: cx(10),
@@ -90,7 +91,7 @@ const ScheduleCard = (props: ScheduleCardProps) => {
   return (
     <Card
       style={styles.card}
-      containerStyle={[styles.container, style]}
+      containerStyle={[style]}
       onPress={() => {
         onPress(item);
       }}
@@ -98,31 +99,33 @@ const ScheduleCard = (props: ScheduleCardProps) => {
         onLongPress && onLongPress(item)
       }}
     >
-      <View style={styles.infoContainer}>
-        <Text style={styles.time}>{is24HourClock ? item.time : convertTo12HourFormat(item.time)}</Text>
-        <Text style={styles.loop}>
-          {loopText(item.loops.split('').map(loop => parseInt(loop)), item.time)}
-        </Text>
-        <Text style={styles.name}>{item.name}</Text>
-        {showTag && <View style={styles.typeContainer}>
-          {showTags.map(tag => (
-            <View style={styles.tag} key={tag.dp}>
-              <Text style={styles.tagTitle}>
-                {tag.key}
-              </Text>
-            </View>
-          ))}
-        </View>}
-      </View>
-      <View style={styles.switchContainer}>
-        <SwitchButton
-          value={item.enable}
-          thumbStyle={{ elevation: 0 }}
-          onValueChange={() => {
-            onEnableChange(!item.enable);
-          }}
-        />
+      <View style={styles.container}>
+        <View style={styles.infoContainer}>
+          <Text style={styles.time}>{is24HourClock ? item.time : convertTo12HourFormat(item.time)}</Text>
+          <Text style={styles.loop}>
+            {loopText(item.loops.split('').map(loop => parseInt(loop)), item.time)}
+          </Text>
+          <Text style={styles.name}>{item.name}</Text>
+        </View>
+        <View style={styles.switchContainer}>
+          <SwitchButton
+            value={item.enable}
+            thumbStyle={{ elevation: 0 }}
+            onValueChange={() => {
+              onEnableChange(!item.enable);
+            }}
+          />
+        </View>
       </View>
+      {showTag && <View style={styles.typeContainer}>
+        {showTags.map(tag => (
+          <View style={styles.tag} key={tag.dp}>
+            <Text style={styles.tagTitle}>
+              {tag.key}
+            </Text>
+          </View>
+        ))}
+      </View>}
     </Card>
   )