@ledvance/ui-biz-bundle 1.0.60 → 1.0.62

package/package.json

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

package/src/modules/history/HistoryPage.tsx

@@ -11,6 +11,7 @@ import Spacer from '@ledvance/base/src/components/Spacer'
 import {RouteProp, useRoute} from '@react-navigation/core'
 import { isEmpty } from 'lodash'
 import Tag from "@ledvance/base/src/components/Tag"
+import { exportHistoryFile } from '@ledvance/base/src/utils/common'
 
 const cx = Utils.RatioUtils.convertX
 
@@ -77,12 +78,16 @@ const SwitchHistoryPage = () => {
             })
     }, [state.onRefresh, state.filterTags])
 
+    const downFile = () => {
+      exportHistoryFile(state.data)
+    }
+
     return (
         <Page
             backText={backText || deviceInfo.name}
             headlineText={headlineText || I18n.getLang('history_socket_headline_text')}
-            // headlineIcon={res.rn_ic_download}
-
+            headlineIcon={res.rn_ic_download}
+            onHeadlineIconClick={downFile}
             >
             <View style={styles.content}>
                 <Text style={styles.titleText}>{I18n.getLang('history_contact_sensor_description_text')}</Text>

package/src/modules/mood/MoodPage.tsx

@@ -78,12 +78,14 @@ const MoodPage = () => {
     setTimeout(async () => {
       const res = await getRemoteSceneList(
         deviceInfo.devId,
-        params.isRGBWLamp,
-        params.isRGBLamp,
-        params.isOnlyRGBLamp,
-        params.isFanLamp,
-        params.isTWLamp,
-        params.isDIMLamp,
+        {
+          isRGBWLamp: params.isRGBWLamp,
+          isRGBLamp: params.isRGBLamp,
+          isOnlyRGBLamp: params.isOnlyRGBLamp,
+          isFanLamp: params.isFanLamp,
+          isTWLamp: params.isTWLamp,
+          isDIMLamp: params.isDIMLamp,
+        },
         isUVCFan
       )
       if (res.success) {

package/src/modules/scene/SceneAction.ts

@@ -34,14 +34,18 @@ export const setRemoteSceneList: SetRemoteSceneListType = async (
   }
 }
 
+interface LampParams{
+  isRGBWLamp?: boolean
+  isRGBLamp?: boolean
+  isOnlyRGBLamp?: boolean
+  isFanLamp?: boolean
+  isTWLamp?: boolean
+  isDIMLamp?: boolean
+}
+
 export async function getRemoteSceneList(
   deviceId: string,
-  isRGBWLamp: boolean = false,
-  isRGBLamp: boolean = false,
-  isOnlyRGBLamp: boolean = false,
-  isFanLamp: boolean = false,
-  isTWLamp: boolean = false,
-  isDIMLamp: boolean = false,
+  lampParams?: LampParams,
   isUVCFan?: boolean
 ): Promise<Result<SceneUIState[]>> {
   const res: NativeResult<RemoteSceneInfo[]> = await getFeature(deviceId, SceneFeatureId)
@@ -50,12 +54,12 @@ export async function getRemoteSceneList(
   }
   if (!(!!res.data)) {
     const res = await setRemoteSceneList(deviceId, getDefSceneList(
-      isRGBWLamp,
-      isRGBLamp,
-      isOnlyRGBLamp,
-      isFanLamp,
-      isTWLamp,
-      isDIMLamp,
+      lampParams?.isRGBWLamp,
+      lampParams?.isRGBLamp,
+      lampParams?.isOnlyRGBLamp,
+      lampParams?.isFanLamp,
+      lampParams?.isTWLamp,
+      lampParams?.isDIMLamp,
     ))
     if (res.success) {
       return getRemoteSceneList(deviceId)
@@ -64,7 +68,7 @@ export async function getRemoteSceneList(
   }
   return {
     success: true,
-    data: res.data.map((item, index) => remoteSceneInfo2SceneUIState(item, index, isFanLamp, isUVCFan)),
+    data: res.data.map((item, index) => remoteSceneInfo2SceneUIState(item, index, !!lampParams?.isFanLamp, isUVCFan)),
   }
 }
 

package/src/modules/scene/ScenePage.tsx

@@ -32,7 +32,7 @@ const ScenePage = () => {
     })
 
     const getSceneList: () => void = useCallback(async () => {
-        const res = await getRemoteSceneList(deviceId, dpCodes)
+        const res = await getRemoteSceneList(deviceId, )
         console.log(res)
         if (res.success) {
             state.scenes = res.data!!
@@ -55,7 +55,7 @@ const ScenePage = () => {
             <TouchableOpacity
                 style={{ flex: 1, marginBottom: cx(15), marginHorizontal: cx(6), height: cx(100) }}
                 onPress={async () => {
-                    await setScene(deviceId, item, dpCodes)
+                    // await setScene(deviceId, item, dpCodes)
                 }}>
                 <ImageBackground
                     source={{ uri: item.image }}

package/src/modules/sleepWakeup/SleepWakeUpActions.ts

@@ -22,37 +22,42 @@ const putFeatureFn = async (devId, featureId, data) => {
   return status
 }
 
-export const useSleepPlan = (dpCodes: Record<string, string>) => {
+export const useSleepPlan = (dpCodes: Record<string, string>, disableFeature?: boolean) => {
   const deviceId = useDeviceId()
   const [uiData, setUiData] = useState([] as any)
   const [sleepPlan, setSleepPlan]: any = useDp(dpCodes.sleep_mode);
   // 获取云端数据
   useEffect(() => {
-    getFeature(deviceId, sleepPlanFeatureId).then(res => {
-      if (res?.result) {
-        const data = res?.data
-        let list = data?.map(item => { return { ...item, startTime: (item?.startTime || item?.v) && JSON.parse(item?.startTime || item?.v)?.dp || '' } })
-        // 首次进入同步云端数据 （云端无数据）
-        if (!list) {
-          list = decodeSleepString(sleepPlan)
-          setSleepCloudData(list, deviceId).then()
-          setUiData(list)
-          return
+    if(disableFeature){
+      const dpData = decodeSleepString(sleepPlan)
+      setUiData(dpData)
+    }else{
+      getFeature(deviceId, sleepPlanFeatureId).then(res => {
+        if (res?.result) {
+          const data = res?.data
+          let list = data?.map(item => { return { ...item, startTime: (item?.startTime || item?.v) && JSON.parse(item?.startTime || item?.v)?.dp || '' } })
+          // 首次进入同步云端数据 （云端无数据）
+          if (!list) {
+            list = decodeSleepString(sleepPlan)
+            setSleepCloudData(list, deviceId).then()
+            setUiData(list)
+            return
+          }
+          const dpData = decodeSleepString(sleepPlan)
+          const sleepCloudData = highInTheCloudsSleepString(list)
+          // 更新
+          if (sleepCloudData?.length === dpData?.length) {
+            const list = dpData?.map((item, index) => {
+              return { ...item, name: sleepCloudData[index]?.name }
+            })
+            setSleepCloudData(list, deviceId).then()
+            setUiData(list)
+            return
+          }
+          setUiData(highInTheCloudsSleepString(list))
         }
-        const dpData = decodeSleepString(sleepPlan)
-        const sleepCloudData = highInTheCloudsSleepString(list)
-        // 更新
-        if (sleepCloudData?.length === dpData?.length) {
-          const list = dpData?.map((item, index) => {
-            return { ...item, name: sleepCloudData[index]?.name }
-          })
-          setSleepCloudData(list, deviceId).then()
-          setUiData(list)
-          return
-        }
-        setUiData(highInTheCloudsSleepString(list))
-      }
-    })
+      })
+    }
   }, [sleepPlan])
 
   const setSleepList = async (sleepPlan: any[]) => {
@@ -83,37 +88,42 @@ export const useSleepPlan = (dpCodes: Record<string, string>) => {
   return [uiData, setSleepList];
 }
 
-export const useWakeUpPlan = (dpCodes: Record<string, string>) => {
+export const useWakeUpPlan = (dpCodes: Record<string, string>, disableFeature?: boolean) => {
   const deviceId = useDeviceId()
   const [uiData, setUiData] = useState([] as any)
   const [wakeUpPlan, setWakeUpPlan]: any = useDp(dpCodes.wakeup_mode)
   // 获取云端数据
   useEffect(() => {
-    getFeature(deviceId, wakeUpPlanFeatureId).then(res => {
-      if (res?.result) {
-        const data = res?.data
-        let list = data?.map(item => { return { ...item, startTime: (item?.startTime || item?.v) && JSON.parse(item?.startTime || item?.v)?.dp || '' } })
-        // 首次进入同步云端数据 （云端无数据）
-        if (!list) {
-          list = decodeWakeUpString(wakeUpPlan)
-          setWakeCloudData(list, deviceId).then()
-          setUiData(list)
-          return
+    if(disableFeature){
+      const dpData = decodeWakeUpString(wakeUpPlan)
+      setUiData(dpData)
+    }else{
+      getFeature(deviceId, wakeUpPlanFeatureId).then(res => {
+        if (res?.result) {
+          const data = res?.data
+          let list = data?.map(item => { return { ...item, startTime: (item?.startTime || item?.v) && JSON.parse(item?.startTime || item?.v)?.dp || '' } })
+          // 首次进入同步云端数据 （云端无数据）
+          if (!list) {
+            list = decodeWakeUpString(wakeUpPlan)
+            setWakeCloudData(list, deviceId).then()
+            setUiData(list)
+            return
+          }
+          const dpData = decodeWakeUpString(wakeUpPlan)
+          const wakeCloudData = highInTheCloudsWakeString(list)
+          // 更新
+          if (wakeCloudData?.length === dpData?.length) {
+            const list = dpData?.map((item, index) => {
+              return { ...item, name: wakeCloudData[index]?.name }
+            })
+            setWakeCloudData(list, deviceId).then()
+            setUiData(list)
+            return
+          }
+          setUiData(highInTheCloudsWakeString(list))
         }
-        const dpData = decodeWakeUpString(wakeUpPlan)
-        const wakeCloudData = highInTheCloudsWakeString(list)
-        // 更新
-        if (wakeCloudData?.length === dpData?.length) {
-          const list = dpData?.map((item, index) => {
-            return { ...item, name: wakeCloudData[index]?.name }
-          })
-          setWakeCloudData(list, deviceId).then()
-          setUiData(list)
-          return
-        }
-        setUiData(highInTheCloudsWakeString(list))
-      }
-    })
+      })
+    }
   }, [wakeUpPlan])
 
   const setWakeUpList = async (wakeUpPlan) => {

package/src/modules/timeSchedule/DeviceState.tsx

@@ -75,12 +75,16 @@ const DeviceState = (props: DeviceStateProps) => {
                 <Text style={{
                   color: '#FF9500',
                   marginLeft: cx(5),
-                }}>{I18n.getLang('timeschedule_add_schedule_no_device_warning_text')}</Text>
+                }}>{I18n.getLang('timeschedule_add_schedule_devicestate_sec_warning_text')}</Text>
               </View> :
               <MoodSetting
+                isOnlyRGBLamp={props.isOnlyRGBLamp}
+                isDIMLamp={props.isDIMLamp}
+                isRGBLamp={props.isRGBLamp}
+                isRGBWLamp={props.isRGBWLamp}
+                isTWLamp={props.isTWLamp}
+                isFanLamp={props.isFanLamp}
                 actionScene={props.actionScene}
-                dpCodes={props.dpCodes}
-                dps={props.dps}
                 scheduleItem={props.scheduleItem}
                 setSendDps={props.setSendDps}
                 changeSkillEnable={props.changeSkillEnable}/>

package/src/modules/timeSchedule/ManualSetting.tsx

@@ -1,4 +1,4 @@
-import React from 'react'
+import React, {memo} from 'react'
 import { View } from 'react-native'
 import SingleLightView from './SingleLightView'
 import { ScheduleItemDp } from './TimeScheduleEditpage'
@@ -35,9 +35,7 @@ const ManualSetting = (props: ManualSettingProps) => {
       return (
         <MixLightView
           mixActions={state.mixActions}
-          dpCodes={props.dpCodes}
           setSendDps={props.setSendDps}
-          scheduleItem={props.scheduleItem}
         />
       )
     }
@@ -75,4 +73,4 @@ const ManualSetting = (props: ManualSettingProps) => {
   )
 }
 
-export default ManualSetting
+export default memo(ManualSetting)

package/src/modules/timeSchedule/MoodSetting.tsx

@@ -1,22 +1,25 @@
-import React from 'react'
-import { ScheduleItemDp } from './TimeScheduleEditpage'
+import React, { memo } from 'react'
 import ScheduleScene from './ScheduleScene'
+import { JudgeTimeScheduleProps } from './TimeScheduleBean'
 
-interface MoodSettingProps {
+interface MoodSettingProps extends JudgeTimeScheduleProps {
   actionScene: any
   scheduleItem: any
-  dps: ScheduleItemDp[]
-  dpCodes: Record<string, string>
   setSendDps: (actions: any, type: string) => void
   changeSkillEnable: (dpId: string, enable: boolean) => void
 }
 
 const MoodSetting = (props: MoodSettingProps) => {
-  const { dpCodes, setSendDps } = props
+  const { setSendDps } = props
 
   return (
     <ScheduleScene
-      dpCodes={dpCodes}
+      isOnlyRGBLamp={props.isOnlyRGBLamp}
+      isDIMLamp={props.isDIMLamp}
+      isRGBLamp={props.isRGBLamp}
+      isRGBWLamp={props.isRGBWLamp}
+      isTWLamp={props.isTWLamp}
+      isFanLamp={props.isFanLamp}
       scene={props.actionScene}
       setScene={s => {
         setSendDps(s, 'actionScene')
@@ -24,4 +27,4 @@ const MoodSetting = (props: MoodSettingProps) => {
   )
 }
 
-export default MoodSetting
+export default memo(MoodSetting)

package/src/modules/timeSchedule/ScheduleScene.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect } from 'react'
 import I18n from '@ledvance/base/src/i18n'
 import { getRemoteSceneList } from '../scene/SceneAction'
-import { useDeviceInfo } from '@ledvance/base/src/models/modules/NativePropsSlice'
+import { isUVCFanDevice, useDeviceInfo } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import { useReactive } from 'ahooks'
 import { ScenePageUIState, SceneUIState } from '../scene/SceneInfo'
 import res from '@ledvance/base/src/res'
@@ -22,8 +22,9 @@ interface MoodUIState extends ScenePageUIState {
 }
 
 
-const ScheduleScene = ({ scene, setScene, dpCodes }) => {
+const ScheduleScene = ({ scene, setScene, isOnlyRGBLamp, isDIMLamp, isRGBLamp, isRGBWLamp, isTWLamp, isFanLamp }) => {
   const deviceInfo = useDeviceInfo()
+  const isUVCFan = isUVCFanDevice()
   const state = useReactive<MoodUIState>({
     currentScene: undefined,
     staticTagChecked: true,
@@ -34,7 +35,14 @@ const ScheduleScene = ({ scene, setScene, dpCodes }) => {
   })
 
   const getSceneList = useCallback(async () => {
-    const res = await getRemoteSceneList(deviceInfo.devId, dpCodes)
+    const res = await getRemoteSceneList(deviceInfo.devId,{
+      isOnlyRGBLamp,
+      isDIMLamp,
+      isRGBLamp,
+      isRGBWLamp,
+      isTWLamp,
+      isFanLamp
+    }, isUVCFan)
     if (res.success) {
       state.scenes = res.data || []
       state.currentScene = isEmpty(scene) ? state.scenes[0] : scene

package/src/modules/timeSchedule/SingleLightView.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react'
+import React, { useCallback, memo } from 'react'
 import { View } from 'react-native'
 import LdvSwitch from '@ledvance/base/src/components/ldvSwitch'
 import { Utils } from 'tuya-panel-kit'
@@ -26,7 +26,7 @@ interface SingleLightViewProps extends JudgeTimeScheduleProps {
   setEnable: (dpId: string, enable: boolean) => void
 }
 
-export default function SingleLightView(props: SingleLightViewProps) {
+const SingleLightView = (props: SingleLightViewProps) =>{
   const {
     dp,
     setSendDps,
@@ -187,4 +187,6 @@ export default function SingleLightView(props: SingleLightViewProps) {
       }
     </Card>
   )
-}
+}
+
+export default memo(SingleLightView)

package/src/modules/timeSchedule/TimeScheduleEditpage.tsx

@@ -12,7 +12,7 @@ import Spacer from '@ledvance/base/src/components/Spacer'
 import DeleteButton from '@ledvance/base/src/components/DeleteButton'
 import { loopText, toFixed } from '@ledvance/base/src/utils/common'
 import { NativeApi } from '@ledvance/base/src/api/native'
-import { useDeviceId } from '@ledvance/base/src/models/modules/NativePropsSlice'
+import { isUVCFanDevice, useDeviceId } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import res from '@ledvance/base/src/res'
 import { useReactive } from 'ahooks'
 import { dpItem, TimeSchedulePageRouteParams } from './TimeSchedulePage'
@@ -43,6 +43,7 @@ const TimeScheduleEditPage = () => {
   const navigation = useNavigation()
   const devId = useDeviceId()
   const route = useRoute()
+  const isUVCFan = isUVCFanDevice()
   const props = cloneDeep(route.params) as TimeScheduleEditPageParams
   const { scheduleItem, dps, reloadData, deleteDialog, dpCodes } = props
   const state = useReactive({
@@ -135,7 +136,7 @@ const TimeScheduleEditPage = () => {
       }
 
       if (scheduleItem.dps[dpCodes.scene_data] !== undefined) {
-        state.actionScene = sencePp2Obj(scheduleItem.dps[dpCodes.scene_data], !!props.isFanLamp)
+        state.actionScene = sencePp2Obj(scheduleItem.dps[dpCodes.scene_data], !!props.isFanLamp, isUVCFan)
         state.isManual = false
       }
       if (scheduleItem.dps[dpCodes.mix_light_scene] !== undefined) {
@@ -179,7 +180,7 @@ const TimeScheduleEditPage = () => {
         !isEqual(scheduleItem?.time, [state.hour, state.minute].join(':')),
         !isEqual(scheduleItem?.loops, state.loop.join('')),
         !isEqual(!!scheduleItem?.isAppPush, state.isNotification),
-        !isEqual(scheduleItem?.dps, getSendDps()),
+        // !isEqual(scheduleItem?.dps, getSendDps()),
       ].some(e => e)
   }
 
@@ -348,7 +349,7 @@ const TimeScheduleEditPage = () => {
           [dpCodes.scene_data]: senceObj2Dp({
             id: Number(state?.actionScene?.id),
             nodes: state?.actionScene?.nodes,
-          }, !!props.isFanLamp),
+          }, !!props.isFanLamp, isUVCFan),
           [dpCodes.work_mode]: SCENE,
         }
         return props.isFanLamp ? {
@@ -422,14 +423,14 @@ const TimeScheduleEditPage = () => {
     return !!state.selectedSkill.length
   }
 
-  const changeSkillEnable = (dpId: string, enable: boolean) => {
+  const changeSkillEnable = useCallback((dpId: string, enable: boolean) => {
     state.selectedSkill = state.selectedSkill.map((skill) => {
       if (dpId === skill.dpId) {
         skill.enable = enable
       }
       return skill
     })
-  }
+  }, [state.selectedSkill])
 
   const showClearIcon = () => {
     return dps.length > 1 && !props.isMixRGBWLamp
@@ -522,7 +523,9 @@ const TimeScheduleEditPage = () => {
             selectedDps={state.selectedSkill}
             scheduleItem={scheduleItem}
             isManual={state.isManual}
-            setIsManual={(v) => state.isManual = v}
+            setIsManual={useCallback((v) => {
+              state.isManual = v
+            }, [])}
             setSendDps={setSendDps}
             changeSkillEnable={changeSkillEnable}
             isDIMLamp={props.isDIMLamp}