@ledvance/ui-biz-bundle 1.1.62 → 1.1.64

package/package.json

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

package/src/modules/timer/TimerPage.tsx

@@ -235,7 +235,7 @@ const TimerPage = (props: {theme?: any}) => {
                   <Text style={styles.itemTitle}>{I18n.getLang('timeschedule_add_schedule_subheadline_text')}</Text>
                   <View
                       style={{
-                        backgroundColor: props.theme.card.background,
+                        backgroundColor: props.theme.card.board,
                         borderRadius: 4,
                         minHeight: cx(50),
                         flex: 1,

package/src/newModules/fixedTime/FixedTimeActions.ts

@@ -7,13 +7,13 @@ import { padStart } from "lodash";
 import I18n from "@ledvance/base/src/i18n";
 import { hex2Int, spliceByStep } from "@ledvance/base/src/utils/common";
 import { parseJSON } from "@tuya/tuya-panel-lamp-sdk/lib/utils";
-import { Buffer } from "buffer";
-import { useUpdateEffect } from "ahooks";
+import { Buffer } from 'buffer'
 
 const { to16 } = Utils
 
 const fixedFeatureId = 'cycle_timing'
 const plug_fixedFeatureId = 'cycle_time'
+
 export interface FixedTimerData {
   version: number
   length: number
@@ -22,6 +22,7 @@ export interface FixedTimerData {
 
 export interface FixedTimer {
   enable: boolean;
+  channel?: number;
   weeks: number[];
   startTime: number;
   endTime: number;
@@ -52,9 +53,9 @@ export interface PlugFixedTimer {
   closeTime: number;
 }
 let fixedTimer
-type UseFixedTimeType = (dpKey: string, isPlug?: boolean) => [FixedTimerUiItem[], (fixedTimeList: FixedTimerUiItem[]) => Promise<{ success: boolean }>]
+type UseFixedTimeType = (dpKey: string, isPlug?: boolean, disableFeature?: boolean) => [FixedTimerUiItem[], (fixedTimeList: FixedTimerUiItem[], manualEdit?: boolean) => Promise<{ success: boolean }>]
 
-export const useFixedTime: UseFixedTimeType = (dpKey, isPlug) => {
+export const useFixedTime: UseFixedTimeType = (dpKey, isPlug, disableFeature) => {
   const deviceId = useDeviceId()
   const [fixedTimeDp, setFixedTimeDp]: [string, (v: string) => Promise<Result<any>>] = useDp(dpKey)
   const [fixedTimeUiList, setFixedTimeUiList] = useState<FixedTimerUiItem[]>([])
@@ -66,54 +67,54 @@ export const useFixedTime: UseFixedTimeType = (dpKey, isPlug) => {
       name: `${I18n.getLang('fixedTimeCycle_socket_headline')} ${idx + 1}`
     }))
   }, [fixedTimeList])
-
   // 获取云端数据
   useEffect(() => {
+    // 不获取名称
+    if(disableFeature) {
+      setFixedTimeUiList(formatterFn())
+      return 
+    }
     fixedTimer = setTimeout(() => {
-      getFeatureFn()
-    }, 300)
-    return () => clearTimeout(fixedTimer)
-  }, [])
-
-  useUpdateEffect(() =>{
-    fixedTimer = setTimeout(() =>{
-      getFeatureFn()
-    }, 100)
-    return () => clearTimeout(fixedTimer)
-  }, [fixedTimeDp])
-
-  const getFeatureFn = () =>{
-    getFeature(deviceId, isPlug ? plug_fixedFeatureId : fixedFeatureId).then(res => {
-      if (res?.result) {
-        // 首次进入同步云端数据 （云端无数据）
-        if (!res.data) {
-          const cloudData = formatterFn()
-          setFixedTimeFn(cloudData).then()
-        } else {
-          const featureData = parseJSON(res.data)
+      getFeature(deviceId, isPlug ? plug_fixedFeatureId : fixedFeatureId).then(res => {
+        if (res?.result) {
+          // 首次进入同步云端数据 （云端无数据）
+          if (!res.data) {
+            const cloudData = formatterFn()
+            setFixedTimeFn(cloudData).then()
+          } else {
+            const featureData = parseJSON(res.data)
           if (fixedTimeList.length) {
             const uiPlan = fixedTimeList?.map((item, idx: number) => {
-              const featureItem = featureData.find(feature => (isPlug ? parseJSON(feature?.v)?.dp : feature?.v) === fixedTimeToHex(item, isPlug))
+              const dp = fixedTimeToHex(item, isPlug, true)
+              const fixed = featureData[idx]
+              const featureItem = fixed?.v && (isPlug ? parseJSON(fixed?.v)?.dp : fixed?.v)?.includes(dp) ? (isPlug ? parseJSON(fixed) : fixed) : featureData.find(feature => (isPlug ? parseJSON(feature?.v)?.dp : feature?.v).includes(dp))
               return {
                 ...item,
                 index: idx,
-                name: featureItem ? featureItem?.n : `${I18n.getLang('fixedTimeCycle_socket_headline')} ${idx + 1}`
+                name: featureItem ? featureItem?.n : `${I18n.getLang('randomtimecycle_sockets_headline_text')} ${idx + 1}`
               }
             })
             setFixedTimeUiList(uiPlan)
           } else {
             setFixedTimeUiList([])
           }
+          }
         }
-      }
-    })
-  }
+      })
+    }, 250)
+
+    return () => clearTimeout(fixedTimer)
+  }, [fixedTimeDp])
+
 
   const setFixedTimeFn = async (fixedTimeList: FixedTimerUiItem[]) => {
-    const fixedData = fixedTimeList.map(item => ({
-      n: item?.name || '',
-      v: isPlug ? JSON.stringify({dp: fixedTimeToHex(item, isPlug)}) : fixedTimeToHex(item, isPlug)
-    }))
+    const fixedData = fixedTimeList.map(item => {
+      const fixedHex = fixedTimeToHex(item, isPlug)
+      return {
+        n: item?.name || '',
+        v: isPlug ? JSON.stringify({dp: fixedHex}) : fixedHex
+      }
+    })
     const cloudStatus = await putFeatureFn(deviceId, isPlug ? plug_fixedFeatureId : fixedFeatureId, JSON.stringify(fixedData))
     if (cloudStatus) {
       const fixedTimerData = {
@@ -121,8 +122,7 @@ export const useFixedTime: UseFixedTimeType = (dpKey, isPlug) => {
         length: isPlug ? 10 : 16,
         nodes: fixedTimeList
       }
-      let hex = fixedTimeObj2Dp(fixedTimerData, isPlug)
-      if(isPlug) hex = Buffer.from(hex, 'hex').toString('base64')
+      const hex = fixedTimeObj2Dp(fixedTimerData, isPlug)
       const res = await setFixedTimeDp(hex)
       if (res.success) {
         return {
@@ -156,7 +156,7 @@ const putFeatureFn = async (devId, featureId, data) => {
 }
 
 const fixedTimeDp2Obj = (fixedDp: string, isPlug?: boolean) => {
-  if (fixedDp?.length <= 4) return
+  if (!fixedDp || fixedDp?.length <= 8) return
   if(isPlug){
     fixedDp = Buffer.from(fixedDp, 'base64').toString('hex')
   }
@@ -165,7 +165,11 @@ const fixedTimeDp2Obj = (fixedDp: string, isPlug?: boolean) => {
   const s = isPlug ? 0 : 4
   const n = isPlug ? 20 : 32
   const nodes = spliceByStep(fixedDp.slice(s), n).map(plan => {
-    const enable = plan.slice(0, 2) === '01'
+    const powerInfo = padStart(parseInt(`${plan.slice(0, 2)}`, 16).toString(2), 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 weeks = parseInt(plan.slice(2, 4), 16).toString(2).padStart(8, '0')
       .split('')
       .reverse()
@@ -175,7 +179,7 @@ const fixedTimeDp2Obj = (fixedDp: string, isPlug?: boolean) => {
     const openTime = hex2Int(plan.slice(12, 16))
     const closeTime = hex2Int(plan.slice(16, 20))
     const common = {
-      enable, weeks, startTime, endTime, openTime, closeTime
+      enable, channel, weeks, startTime, endTime, openTime, closeTime
     }
     if (isPlug) {
       return common
@@ -211,9 +215,11 @@ const fixedTimeObj2Dp = (randomTimerData: FixedTimerData, isPlug?: boolean) => {
 }
 
 
-const fixedTimeToHex = (fixedTime: FixedTimer, isPlug?: boolean) => {
-  const { weeks, startTime, endTime, openTime, closeTime, enable } = fixedTime
-  const enableStr = enable ? '01' : '00'
+const fixedTimeToHex = (fixedTime: FixedTimer, isPlug?: boolean, isFeatureData?: boolean) => {
+  const { weeks, startTime, endTime, openTime, closeTime, channel, enable } = fixedTime
+  const channelStr = padStart((channel ?? 0).toString(2), 7, '0');
+  const powerChannel = parseInt(`${channelStr}${enable ? 1 : 0}`, 2);
+  const powerChannelStr = to16(powerChannel, 2);
   const weeksValue: string = padStart([...weeks].reverse().join(''), 8, '0');
   const weeksStr = to16(parseInt(weeksValue, 2), 2);
   const startTimeStr = to16(startTime, 4);
@@ -230,5 +236,5 @@ const fixedTimeToHex = (fixedTime: FixedTimer, isPlug?: boolean) => {
     const temperatureStr = to16(temperature);
     colorHex = hueStr + saturationStr + valueStr + brightnessStr + temperatureStr
   }
-  return enableStr + weeksStr + startTimeStr + endTimeStr + openTimeStr + closeTimeStr + colorHex
+  return (isFeatureData ? '' : powerChannelStr) + weeksStr + startTimeStr + endTimeStr + openTimeStr + closeTimeStr + colorHex
 }

package/src/newModules/fixedTime/FixedTimeDetailPage.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useMemo } from "react";
 import { ScrollView, StyleSheet, View, Text, Image, TouchableOpacity } from "react-native";
 import { useReactive, useUpdateEffect } from "ahooks";
 import Page from "@ledvance/base/src/components/Page";
-import { useNavigation, useRoute } from '@react-navigation/core'
+import { useNavigation } from '@react-navigation/core'
 import I18n from "@ledvance/base/src/i18n";
 import res from "@ledvance/base/src/res";
 import TextField from "@ledvance/base/src/components/TextField";
@@ -21,6 +21,7 @@ import Summary from "../randomTime/Summary";
 import { FixedTimePageParams } from "./FixedTimePage";
 import { Result } from "@ledvance/base/src/models/modules/Result";
 import { useSystemTimeFormate } from "@ledvance/base/src/models/modules/NativePropsSlice";
+import { useParams } from "@ledvance/base/src/hooks/Hooks";
 
 const { convertX: cx } = Utils.RatioUtils;
 const { toFixedString } = Utils.NumberUtils;
@@ -33,13 +34,11 @@ export interface FixedTimeDetailPageParams extends FixedTimePageParams {
 
 const FixedTimeDetailPage = () => {
   const navigation = useNavigation()
-  const params = useRoute().params as FixedTimeDetailPageParams
+  const params = useParams<FixedTimeDetailPageParams>()
   const is24Hour = useSystemTimeFormate()
   const state = useReactive({
     loading: false,
     isColorMode: false,
-    selectedSkill: params.applyDps.length === 1 ? params.applyDps : [],
-    skillList: params.applyDps.length === 1 ? [] : params.applyDps,
     fixedTime: cloneDeep(params.scheduleItem)
   })
 
@@ -56,30 +55,30 @@ const FixedTimeDetailPage = () => {
     if (state.fixedTime.closeTime === 0) state.fixedTime.closeTime = 1
   }, [state.fixedTime.openTime, state.fixedTime.closeTime])
 
-  const showClearIcon = useMemo(() => (
-    false
-  ), [state.skillList])
-
   const inRangeTime = useMemo(() => {
     const { startTime, endTime, closeTime, openTime } = state.fixedTime
     const poweredTime = openTime + closeTime
-    if (startTime <= endTime) {
+    if (startTime < endTime) {
       return (endTime - startTime) >= poweredTime
     } else {
-      return (1440 - endTime + startTime) >= poweredTime
+      return (1440 - endTime - startTime) >= poweredTime
     }
   }, [JSON.stringify(state.fixedTime)])
 
+  const checkItemChanged = useMemo(() =>{
+    return isEqual(state.fixedTime, params.scheduleItem)
+  }, [params.scheduleItem, JSON.stringify(state.fixedTime)])
+
   const canSubmit = useMemo(() => {
-    return state.fixedTime.name?.length > 0 && state.fixedTime.name?.length < 33 && !isEqual(state.fixedTime, params.scheduleItem) && inRangeTime
-  }, [JSON.stringify(state.fixedTime), inRangeTime])
+    return state.fixedTime.name?.length > 0 && state.fixedTime.name?.length < 33 && !checkItemChanged && inRangeTime && state.fixedTime.channel !== undefined
+  }, [JSON.stringify(state.fixedTime), checkItemChanged, inRangeTime])
 
   return (
     <Page
       backText={I18n.getLang('fixedTimeCycle_socket_headline')}
       rightButtonIcon={canSubmit ? res.ic_check : res.ic_uncheck}
       loading={state.loading}
-      showBackDialog={canSubmit}
+      showBackDialog={!checkItemChanged}
       backDialogTitle={I18n.getLang('cancel_dialog_leave_unsaved_titel')}
       backDialogContent={I18n.getLang('cancel_dialog_leave_unsaved_fixedtimecycle_note')}
       headlineText={I18n.getLang(params.mode === 'add' ? 'add_fixedtimecycle_headline_text' : 'edit_fixedtimecycle_headline_text')}
@@ -143,25 +142,31 @@ const FixedTimeDetailPage = () => {
         <View style={styles.cardContainer}>
           <Text style={styles.itemTitle}>{I18n.getLang('timeschedule_add_schedule_subheadline_text')}</Text>
           <Spacer height={cx(10)} />
-          <View style={styles.applyContent}>
-            {state.selectedSkill.length === 0 ?
+          <View style={[styles.applyContent, { paddingTop: state.fixedTime.channel === undefined ? 0 : cx(10) }]}>
+            {state.fixedTime.channel === undefined ?
               <Text>{I18n.getLang('timer_ceiling_fan_selectionfield_no_components_text')}</Text> :
-              state.selectedSkill.map((skill: any) => (
-                <View style={[styles.applyItem, { marginBottom: cx(10), borderRadius: 4 }]} key={skill.label}>
-                  <Text style={{ color: '#000' }}>{skill.label}</Text>
-                  {showClearIcon && <TouchableOpacity
-                    onPress={() => { }}
-                    style={{ paddingHorizontal: cx(5) }}>
-                    <Image style={{ width: cx(16), height: cx(16) }} source={res.ic_arrows_nav_clear} />
-                  </TouchableOpacity>}
-                </View>
-              ))
+              <View style={[styles.applyItem, { marginBottom: cx(10), borderRadius: 4 }]}>
+                <Text style={{ color: '#000' }}>{params.applyForList[state.fixedTime.channel]?.key}</Text>
+                {params.applyForList.length > 1 && <TouchableOpacity
+                  onPress={() => {
+                    state.fixedTime.channel = undefined
+                  }}
+                  style={{ paddingHorizontal: cx(5) }}>
+                  <Image style={{ width: cx(16), height: cx(16) }} source={res.ic_arrows_nav_clear} />
+                </TouchableOpacity>}
+              </View>
             }
           </View>
-          {state.skillList.map((item: any) => {
+          {params.applyForList.map((item, index) => {
+            if (state.fixedTime.channel === index) return null
             return (
-              <TouchableOpacity style={styles.applyItem} key={item.label} onPress={() => { }}>
-                <Text style={{ color: '#000' }}>{item.label}</Text>
+              <TouchableOpacity
+                style={styles.applyItem}
+                key={item.key}
+                onPress={() => {
+                  state.fixedTime.channel = index
+                }}>
+                <Text style={{ color: '#000' }}>{item.key}</Text>
                 <Image style={{ width: cx(16), height: cx(16) }} source={res.device_panel_timer_add} />
               </TouchableOpacity>
             )
@@ -182,9 +187,9 @@ const FixedTimeDetailPage = () => {
               showSwitch={false}
             />
             <LampAdjustView
-              isSupportColor={params.isSupportColor}
-              isSupportBrightness={params.isSupportBrightness}
-              isSupportTemperature={params.isSupportTemperature}
+              isSupportColor={!!params.isSupportColor}
+              isSupportBrightness={!!params.isSupportBrightness}
+              isSupportTemperature={!!params.isSupportTemperature}
               isColorMode={state.isColorMode}
               reserveSV={true}
               setIsColorMode={(v) => state.isColorMode = v}
@@ -263,12 +268,12 @@ const FixedTimeDetailPage = () => {
             <View style={{ flexDirection: 'column' }}>
               <Text style={{ color: '#000' }}>{I18n.formatValue('feature_summary_action_txt_4', `${Math.trunc(state.fixedTime.openTime / 60)}`, `${state.fixedTime.openTime % 60}`)}</Text>
               <View style={styles.summaryTag}>
-                <Text style={{ color: '#000' }}>{state.selectedSkill[0]?.label || ''}</Text>
+                <Text style={{ color: '#000' }}>{I18n.getLang('timeschedule_add_schedule_nightlight_plug_selectionfield_text2')}</Text>
               </View>
               <Spacer height={cx(5)} />
               <Text style={{ color: '#000' }}>{I18n.formatValue('feature_summary_action_txt_6', `${Math.trunc(state.fixedTime.closeTime / 60)}`, `${state.fixedTime.closeTime % 60}`)}</Text>
               <View style={styles.summaryTag}>
-                <Text style={{ color: '#000' }}>{state.selectedSkill[0]?.label || ''}</Text>
+                <Text style={{ color: '#000' }}>{I18n.getLang('timeschedule_add_schedule_nightlight_plug_selectionfield_text2')}</Text>
               </View>
             </View>
           )}
@@ -284,8 +289,8 @@ const FixedTimeDetailPage = () => {
                   title: I18n.getLang('cancel_dialog_delete_item_fixedtimecycle_titel'),
                   subTitle: I18n.getLang('cancel_dialog_delete_item_fixedtimecycle_description'),
                   onConfirm: async (_, { close }) => {
-                    state.loading = true
                     close()
+                    state.loading = true
                     const res = await params.onPost('del', state.fixedTime)
                     state.loading = false
                     if (res.success) {
@@ -338,4 +343,4 @@ const styles = StyleSheet.create({
   }
 })
 
-export default FixedTimeDetailPage
+export default FixedTimeDetailPage