@ledvance/ui-biz-bundle 1.1.134 → 1.1.135

package/package.json

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

package/src/newModules/biorhythm/BiorhythmActions.ts

@@ -23,8 +23,8 @@ import { useUpdateEffect } from 'ahooks'
 
 type UseBiorhythmType = (dpKey: string, disabledFeature?: boolean) => [BiorhythmBean, SetBiorhythmType];
 type SetBiorhythmType = (biorhythmObj: BiorhythmBean, pushFeature?: boolean) => Promise<Result<any>>;
-let biorhythmTimer: undefined | number = undefined
 
+let biorhythmTimer: number | undefined = undefined
 export const useBiorhythm: UseBiorhythmType = (dpKey: string, disabledFeature?: boolean) => {
   const [dp, setDp] = useDp<string, (v: string) => any>(dpKey)
   const deviceId = useDeviceId()
@@ -32,7 +32,7 @@ export const useBiorhythm: UseBiorhythmType = (dpKey: string, disabledFeature?:
   const isInternalUpdateRef = useRef(false)
   const previousDpRef = useRef(dp)
 
-  const getBiorhythm = useCallback(() => {
+  const getBiorhythm = () => {
     const biorhythm = dp2Obj(dp)
     getRemoteBiorhythm(deviceId, biorhythm).then(res => {
       if (res.success && res.data) {
@@ -44,23 +44,32 @@ export const useBiorhythm: UseBiorhythmType = (dpKey: string, disabledFeature?:
         }))
       }
     })
-  }, [dp])
+  }
 
   useEffect(() => {
     if (disabledFeature) return
-    getBiorhythm()
+    biorhythmTimer = setTimeout(() => {
+      getBiorhythm()
+    }, 150)
+    return () => {
+      if (biorhythmTimer) {
+        clearTimeout(biorhythmTimer)
+        biorhythmTimer = undefined
+      }
+    }
   }, [])
 
   useUpdateEffect(() => {
     if (isInternalUpdateRef.current || disabledFeature) {
+      if (disabledFeature) {
+        setBiorhythmState(dp2Obj(dp))
+      }
       if (isInternalUpdateRef.current) {
         previousDpRef.current = dp
       }
-      console.log('跳过更新', isInternalUpdateRef.current, disabledFeature)
       isInternalUpdateRef.current = false
       return
     }
-    console.log('dp updateEffect', dp, previousDpRef.current, dp === previousDpRef.current)
     if (dp?.toLocaleLowerCase() === previousDpRef.current?.toLocaleLowerCase()) {
       return
     }
@@ -70,9 +79,10 @@ export const useBiorhythm: UseBiorhythmType = (dpKey: string, disabledFeature?:
   const setBiorhythmFn = async (biorhythmObj: BiorhythmBean, pushFeature: boolean = true) => {
     const dpValue = obj2Dp(biorhythmObj)
     isInternalUpdateRef.current = true
-    
+
     if (pushFeature) {
       const putFeatureRes = await putFeature(deviceId, biorhythmFeatureId, vo2Dto(biorhythmObj))
+      console.log(vo2Dto(biorhythmObj), '< --- biorhythmObj --- >')
       if (putFeatureRes.result) {
         setBiorhythmState(biorhythmObj)
         return setDp(dpValue)
@@ -196,6 +206,7 @@ export function dp2Obj(dp: string): BiorhythmBean {
         enabled: p === '1',
       }
     })
+  repeatPeriod.sort((a, b) => a.index - b.index)
   dpCopy = dpCopy.slice(2)
   // 节点个数 (每个节点长度18)，最多8个节点
   hex2Int(dpCopy.slice(0, 2))
@@ -360,8 +371,9 @@ function obj2Dp(obj: BiorhythmBean): string {
   const versionHex = '00'
   const enableHex = obj.enable ? '01' : '00'
   const gradientHex = obj.gradient === BiorhythmGradientType.EntireGradient ? '00' : '0F'
+  const newRepeatPeriod = [obj.repeatPeriod[obj.repeatPeriod.length - 1], ...obj.repeatPeriod.slice(0, -1)]
   const repeatPeriodHex = parseInt(
-    obj.repeatPeriod
+    newRepeatPeriod
       .map(p => (p.enabled ? '1' : '0'))
       .reverse()
       .join(''),

package/src/newModules/biorhythm/BiorhythmPage.tsx

@@ -21,7 +21,6 @@ import I18n from '@ledvance/base/src/i18n'
 import res from '@ledvance/base/src/res'
 import { ui_biz_routerKey } from "../../navigation/Routers";
 import { cctToColor } from '@ledvance/base/src/utils/cctUtils'
-import { setDataSource } from '@ledvance/base/src/components/weekSelect'
 import { BiorhythmEditPageParams } from './BiorhythmEditPage'
 import { useBiorhythm } from './BiorhythmActions'
 import { convertMinutesTo12HourFormat, showDialog as showCommonDialog } from '@ledvance/base/src/utils/common'
@@ -190,11 +189,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
   }
 
   useEffect(() => {
-    const weeks: string[] = setDataSource(
-      biorhythm.repeatPeriod.map(item => {
-        return item?.enabled ? 1 : 0
-      })).filter(item => item.enabled)
-      .map(item => item.title)
+    const weeks = biorhythm.repeatPeriod.filter(it => it.enabled).map(it => it.title)
 
     if (weeks.length > 0) {
       if (weeks.length === 7) {
@@ -237,20 +232,21 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
   const sunHomeText = string => {
     const text = string.split('SUN@HOME')
     return text?.length === 1 && <Text style={{ fontSize: cx(14), color: props.theme?.global.fontColor }}>{text[0]}</Text> ||
-      <Text style={{
-        fontSize: cx(14),
-        flexDirection: 'row',
-      }}>
-        <Text style={{ color: props.theme?.global.fontColor }}>{text[0]}</Text>
-        <Text onPress={openLink}
-          style={{
-            fontFamily: 'helvetica_neue_lt_std_roman',
-            color: props.theme?.button.primary,
-            textDecorationLine: 'underline',
-            flexWrap: 'wrap',
-          }}>SUN@HOME</Text>
-        <Text style={{ color: props.theme?.global.fontColor }}>{text[1]}</Text>
-      </Text>
+        <Text style={{
+          fontSize: cx(14),
+          flexDirection: 'row',
+        }}>
+            <Text style={{ color: props.theme?.global.fontColor }}>{text[0]}</Text>
+            <Text
+                onPress={openLink}
+                style={{
+                  fontFamily: 'helvetica_neue_lt_std_roman',
+                  color: props.theme?.button.primary,
+                  textDecorationLine: 'underline',
+                  flexWrap: 'wrap',
+                }}>SUN@HOME</Text>
+            <Text style={{ color: props.theme?.global.fontColor }}>{text[1]}</Text>
+        </Text>
   }
 
   const randomIcon = () => {
@@ -452,66 +448,66 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
               marginTop: cx(26),
             }}>
             {state.planList.length === 8 && <View
-              style={{ marginVertical: cx(10), flexDirection: 'row', alignItems: 'center', width: width - cx(48) }}>
-              <Image style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.warning }} source={{ uri: res.ic_warning_amber }} />
-              <Text
-                style={{
-                  flexWrap: 'wrap',
-                  fontSize: cx(12),
-                  color: props.theme?.global.fontColor
-                }}>{I18n.getLang('add_new_trigger_time_warning_max_number_text')}</Text>
+                style={{ marginVertical: cx(10), flexDirection: 'row', alignItems: 'center', width: width - cx(48) }}>
+                <Image style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.warning }} source={{ uri: res.ic_warning_amber }} />
+                <Text
+                    style={{
+                      flexWrap: 'wrap',
+                      fontSize: cx(12),
+                      color: props.theme?.global.fontColor
+                    }}>{I18n.getLang('add_new_trigger_time_warning_max_number_text')}</Text>
             </View>}
             {state.planList.length < 8 &&
-              <>
-                <Text
-                  style={{
-                    fontSize: cx(16),
-                    fontWeight: 'bold',
-                    color: props.theme?.global.fontColor,
-                  }}>{I18n.getLang('bio_ryhthm_default_subheadline_text')}</Text>
-                <TouchableOpacity
-                  onPress={() => {
-                    const ids: number[] = state.planList.map(p => p.index)
-                    const newPlan: Plan = {
-                      index: Math.max(...ids) + 1,
-                      icon: res.rhythm_icon1,
-                      time: 0,
-                      name: '',
-                      colorTemperature: 0,
-                      brightness: 100,
-                      action: [
-                        {
-                          uri: 'model/attribute/set/LightCtrl/ColorTemperature',
-                          startValue: `${colorTemperatureValue(0)}`,
-                        },
-                        {
-                          uri: 'model/attribute/set/LightCtrl/Brightness',
-                          startValue: '100',
-                        },
-                      ],
-                      enable: true,
-                      iconId: randomIcon(),
-                    }
-                    const editPageParams: BiorhythmEditPageParams = {
-                      planData: newPlan,
-                      isAdd: true,
-                      onPlanEdited,
-                      onPlanDelete,
-                      minimumEnable,
-                      nameRepeat,
-                      iconIdList: state.planList?.map(item => {
-                        return item.iconId
-                      }),
-                      isMixRGBWLamp: !!params.isMixLight,
-                      isSupportTemperature: params.isSupportTemperature,
-                      isSupportBrightness: params.isSupportBrightness,
-                      showDeleteBtn
-                    }
-                    navigation.navigate(ui_biz_routerKey.bi_biz_biological_edit, editPageParams)
-                  }}>
-                  <Image source={{ uri: res.biorhythom_add }} style={{ height: cx(24), width: cx(24), tintColor: props.theme?.icon.primary }} />
-                </TouchableOpacity>
-              </>
+                <>
+                    <Text
+                        style={{
+                          fontSize: cx(16),
+                          fontWeight: 'bold',
+                          color: props.theme?.global.fontColor,
+                        }}>{I18n.getLang('bio_ryhthm_default_subheadline_text')}</Text>
+                    <TouchableOpacity
+                        onPress={() => {
+                          const ids: number[] = state.planList.map(p => p.index)
+                          const newPlan: Plan = {
+                            index: Math.max(...ids) + 1,
+                            icon: res.rhythm_icon1,
+                            time: 0,
+                            name: '',
+                            colorTemperature: 0,
+                            brightness: 100,
+                            action: [
+                              {
+                                uri: 'model/attribute/set/LightCtrl/ColorTemperature',
+                                startValue: `${colorTemperatureValue(0)}`,
+                              },
+                              {
+                                uri: 'model/attribute/set/LightCtrl/Brightness',
+                                startValue: '100',
+                              },
+                            ],
+                            enable: true,
+                            iconId: randomIcon(),
+                          }
+                          const editPageParams: BiorhythmEditPageParams = {
+                            planData: newPlan,
+                            isAdd: true,
+                            onPlanEdited,
+                            onPlanDelete,
+                            minimumEnable,
+                            nameRepeat,
+                            iconIdList: state.planList?.map(item => {
+                              return item.iconId
+                            }),
+                            isMixRGBWLamp: !!params.isMixLight,
+                            isSupportTemperature: params.isSupportTemperature,
+                            isSupportBrightness: params.isSupportBrightness,
+                            showDeleteBtn
+                          }
+                          navigation.navigate(ui_biz_routerKey.bi_biz_biological_edit, editPageParams)
+                        }}>
+                        <Image source={{ uri: res.biorhythom_add }} style={{ height: cx(24), width: cx(24), tintColor: props.theme?.icon.primary }} />
+                    </TouchableOpacity>
+                </>
             }
           </View>
           <FlatList

package/src/newModules/biorhythm/circular/RhythmsCircle.tsx

@@ -94,6 +94,11 @@ const RhythmsCircle: React.FC<RhythmsCircleProps & { gradientMode?: boolean }> =
   const getRingColors = (data: IData[]) => {
     type ColorStop = { color: string; angle: number };
 
+    // 防止数据为空时崩溃
+    if (!data || !data.length) {
+      return [{ color: '#000', angle: 0 }, { color: '#000', angle: fullDeg }]
+    }
+
     // 角度规范化函数：确保角度在0到2π范围内
     const normalizeAngle = (angle: number) => {
       while (angle < 0) {

package/src/newModules/swithInching/SwithInching.tsx

@@ -23,7 +23,7 @@ const SwitchInching = (props: { theme?: ThemeType }) => {
   const navigation = useNavigation()
   const [switchInching, setSwitchInching] = useSwitchInching(params.switchIngCode)
   const [checkConflict, resolveConflict] = useConflictTask(params.conflictDps, true)
-  const [countdowns, setCountdowns] = useCountdowns(params.countdownCode || params.channelConfig.map(item => item.countdownCode))
+  const [countdowns, setCountdowns] = useCountdowns(params.countdownCode || params.channelConfig?.map(item => item.countdownCode) || [])
   const timeRef = useRef({
     minute: '00',
     second: '00',
@@ -41,23 +41,23 @@ const SwitchInching = (props: { theme?: ThemeType }) => {
   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(timeRef.current.minute) === 60) {
       timeRef.current.second = '00';
     }
-    
+
     const time = Number(timeRef.current.minute) * 60 + Number(timeRef.current.second);
     const newSwitchInchingItem = {
       ...state.switchInchingItem,
       time
     };
-    
+
     updateState({ switchInchingItem: newSwitchInchingItem });
-    
+
   };
 
   const switchInchingItem = useMemo(() => {
@@ -73,8 +73,11 @@ const SwitchInching = (props: { theme?: ThemeType }) => {
   const saveInchingConfig = async (item: SwitchInchingItem) => {
     const updatedSwitchInching = [...switchInching];
     const existingItemIndex = updatedSwitchInching.findIndex(item => item.channel === state.channel);
-    updatedSwitchInching[existingItemIndex] = item;
-    console.log('updatedSwitchInching', updatedSwitchInching)
+    if (existingItemIndex === -1) {
+      updatedSwitchInching.push(item);
+    } else {
+      updatedSwitchInching[existingItemIndex] = item;
+    }
     await setSwitchInching(updatedSwitchInching)
   }
 
@@ -143,18 +146,18 @@ const SwitchInching = (props: { theme?: ThemeType }) => {
     >
       <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 />
+            <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}>

package/src/newModules/swithInching/SwithInchingAction.ts

@@ -3,14 +3,15 @@ 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'
+import {useEffect, useState} from "react";
 
 const { to16 } = Utils
 export interface SwitchInchingPageParams {
   switchIngCode: string
   countdownCode?: string
   channelConfig?: {
-    countdownCode: string 
-    channelTitle: string 
+    countdownCode: string
+    channelTitle: string
     channel: number
   }[]
   conflictDps: {
@@ -31,20 +32,20 @@ export function useCountdowns(countdownCodes: string | string[]): [Record<string
   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];
 }
 
@@ -56,15 +57,19 @@ export const defSwitchInching = [{ enable: false, channel: 0, time: 1 }]
 
 export const useSwitchInching = (switchInchingCode: string) => {
   const [hex, setHex] = useSwitchInchingHex(switchInchingCode)
-  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 [value, setValue] = useState(defSwitchInching)
+  useEffect(() => {
+    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
+    setValue(switching)
+  }, [hex]);
 
   const setSwitchInching = (switching: SwitchInchingItem[]) => {
     const inchingString = switching.map(item => {
@@ -75,8 +80,9 @@ export const useSwitchInching = (switchInchingCode: string) => {
       return powerChannelStr + timeHex
     }).join('')
     const inchingHex = Buffer.from(inchingString, 'hex').toString('base64')
+    setValue(switching)
     return setHex(inchingHex)
   }
-  return [switching, setSwitchInching] as const
+  return [value, setSwitchInching] as const
 }