@ledvance/ui-biz-bundle 1.1.135 → 1.1.136

package/package.json

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

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,11 +73,8 @@ const SwitchInching = (props: { theme?: ThemeType }) => {
   const saveInchingConfig = async (item: SwitchInchingItem) => {
     const updatedSwitchInching = [...switchInching];
     const existingItemIndex = updatedSwitchInching.findIndex(item => item.channel === state.channel);
-    if (existingItemIndex === -1) {
-      updatedSwitchInching.push(item);
-    } else {
-      updatedSwitchInching[existingItemIndex] = item;
-    }
+    updatedSwitchInching[existingItemIndex] = item;
+    console.log('updatedSwitchInching', updatedSwitchInching)
     await setSwitchInching(updatedSwitchInching)
   }
 
@@ -146,18 +143,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,15 +3,14 @@ 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: {
@@ -32,20 +31,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];
 }
 
@@ -57,19 +56,15 @@ export const defSwitchInching = [{ enable: false, channel: 0, time: 1 }]
 
 export const useSwitchInching = (switchInchingCode: string) => {
   const [hex, setHex] = useSwitchInchingHex(switchInchingCode)
-  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 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 => {
@@ -80,9 +75,8 @@ export const useSwitchInching = (switchInchingCode: string) => {
       return powerChannelStr + timeHex
     }).join('')
     const inchingHex = Buffer.from(inchingString, 'hex').toString('base64')
-    setValue(switching)
     return setHex(inchingHex)
   }
-  return [value, setSwitchInching] as const
+  return [switching, setSwitchInching] as const
 }