@ledvance/ui-biz-bundle 1.0.85 → 1.0.87

package/package.json

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

package/src/modules/fixedTime/FixedTimeActions.ts

@@ -34,6 +34,15 @@ export interface CycleTimerItem extends CycleTimer {
   name: string
 }
 
+export interface PlugFixedTimer {
+  power: boolean;
+  channel: number;
+  weeks: number[];
+  startTime: number;
+  endTime: number;
+  openTime: number;
+  closeTime: number;
+}
 
 type UseFixedTimeType = (dpKey: string, disableFeature?: boolean) => [CycleTimerItem[], (fixedTimeList: CycleTimerItem[], manualEdit?: boolean) => Promise<{ success: boolean }>]
 

package/src/modules/mood/FantasyMood.tsx

@@ -41,7 +41,7 @@ const FantasyMoodPage = () => {
   const params: FantasyMoodPageProps = {
     ...routeParams,
   }
-  const [sceneId, setScene] = useFantasyScene(params.sceneDpCode, params.workModeDpCode, params.isStringLight)
+  const [sceneId, setScene] = useFantasyScene(params.sceneDpCode, params.workModeDpCode, params.switchLedDpCode, params.isStringLight)
   const [workMode] = useWorkMode(params.workModeDpCode)
   const deviceInfo = useDeviceInfo()
   const navigation = useNavigation()
@@ -80,7 +80,7 @@ const FantasyMoodPage = () => {
         state.flag = Symbol()
       },
     })
-  }, [])
+  }, [state.scenes])
 
   const getSwitchEnable = useCallback((id: number) => {
     return state.currentScene?.id === id &&  workMode === SCENE

package/src/modules/mood/FantasyMoodEditPage.tsx

@@ -50,7 +50,7 @@ const FantasyMoodEditPage = () => {
   const moduleParams = params.moduleParams
   const deviceId = useDeviceId()
   const [, setWorkMode] = useWorkMode(moduleParams.workModeDpCode)
-  const [, setFantasyScene] = useFantasyScene(params.moduleParams.sceneDpCode, params.moduleParams.workModeDpCode, moduleParams.isStringLight)
+  const [, setFantasyScene] = useFantasyScene(params.moduleParams.sceneDpCode, params.moduleParams.workModeDpCode, params.moduleParams.switchLedDpCode, moduleParams.isStringLight)
   const role = useRole()
   const state = useReactive<FantasyMoodEditPageState>({
     headline: '',
@@ -83,7 +83,7 @@ const FantasyMoodEditPage = () => {
   }, [])
 
   const onPost = useCallback(async (isDelete: boolean) => {
-    const maxModeObject = maxBy(params.moods, 'mode');
+    const maxModeObject = maxBy(params.moods, 'id');
     const currentMood = {
       ...state.mood,
       nodes: state.mood.nodes.map(node => {
@@ -97,8 +97,9 @@ const FantasyMoodEditPage = () => {
         }
         return node
       }),
-      id: params.mode === 'add' ? maxModeObject && maxModeObject.mode > 200 ? maxModeObject.mode + 1 : 201 : state.mood.id
+      id: params.mode === 'add' ? maxModeObject && maxModeObject.id > 200 ? maxModeObject.id + 1 : 201 : state.mood.id
     }
+
     const list = params.mode === 'add' ? [currentMood,...params.moods] :
       isDelete ? params.moods.filter(mood => mood.id !== currentMood.id) :
         params.moods.map(mood => {
@@ -118,7 +119,7 @@ const FantasyMoodEditPage = () => {
     }
     navigation.navigate(ui_biz_routerKey.ui_biz_fantasy_mood)
     routeParams.onSave()
-  }, [])
+  }, [params.moods])
 
   const createSelectModeData = useCallback(() => {
     return Object.values(state.sceneMode).map(scene => {

package/src/modules/powerOnBehavior/PowerOnBehaviorActions.ts

@@ -0,0 +1,12 @@
+import { useDp } from "@ledvance/base/src/models/modules/NativePropsSlice"
+import { Result } from "@ledvance/base/src/models/modules/Result"
+
+export interface PowerBehaviorPageParams {
+  powerBehaviorCode: string 
+}
+
+type PowerBehaviorType = 'off' | 'on' | 'memory'
+
+export const usePowerBehavior = (code: string): [PowerBehaviorType, (v: PowerBehaviorType) => Promise<Result<any>>] => {
+  return useDp(code)
+}

package/src/modules/powerOnBehavior/PowerOnBehaviorPage.tsx

@@ -0,0 +1,173 @@
+import React, { PropsWithChildren } from 'react'
+import { Image, ScrollView, StyleSheet, Text, TouchableOpacity, View, ViewProps } from 'react-native'
+import { useRoute } from '@react-navigation/core'
+import Page from '@ledvance/base/src/components/Page'
+import { useDeviceInfo } from '@ledvance/base/src/models/modules/NativePropsSlice'
+import I18n from '@ledvance/base/src/i18n'
+import { PowerBehaviorPageParams, usePowerBehavior } from './PowerOnBehaviorActions'
+import { Utils } from 'tuya-panel-kit'
+import Spacer from '@ledvance/base/src/components/Spacer'
+import Card from '@ledvance/base/src/components/Card'
+import res from '@ledvance/base/src/res'
+import { useReactive, useUpdateEffect } from 'ahooks'
+
+const { convertX: cx } = Utils.RatioUtils
+
+const RELAY_STATUS_OFF = 'off'
+const RELAY_STATUS_ON = 'on'
+const RELAY_STATUS_MEMORY = 'memory'
+
+const PowerOnBehaviorPage = () => {
+  const params = useRoute().params as PowerBehaviorPageParams
+  const deviceInfo = useDeviceInfo()
+  const [powerMemory, setPowerMemory] = usePowerBehavior(params.powerBehaviorCode)
+  
+  const state = useReactive({
+    powerMemory,
+    loading: false,
+  })
+
+  useUpdateEffect(() => {
+    state.powerMemory = powerMemory
+  }, [powerMemory])
+
+  return (
+    <Page
+      backText={deviceInfo.name}
+      headlineText={I18n.getLang('light_sources_specific_settings_power_off')}
+      loading={state.loading}>
+      <ScrollView style={styles.root} nestedScrollEnabled={true}>
+        <Spacer />
+        <View style={styles.modeSelectGroup}>
+          <Spacer height={cx(8)} />
+          <Text style={styles.modeTip}>
+            {I18n.getLang('socket_settings_firstbox_topic')}
+          </Text>
+          <Spacer height={cx(8)} />
+          <Card style={styles.modeSelectCard}>
+            <Spacer height={cx(12)} />
+            <PowerOnBehaviorModeItem
+              enable={state.powerMemory === RELAY_STATUS_OFF}
+              title={I18n.getLang('feature_summary_action_txt_2')}
+              content={I18n.getLang('socket_settings_firstbox_status1_description')}
+              onPress={async () => {
+                state.powerMemory = RELAY_STATUS_OFF
+                await setPowerMemory(state.powerMemory)
+              }} />
+            <View style={styles.line} />
+            <Spacer height={cx(8)} />
+            <PowerOnBehaviorModeItem
+              enable={state.powerMemory === RELAY_STATUS_ON}
+              title={I18n.getLang('feature_summary_action_txt_1')}
+              content={I18n.getLang('socket_settings_firstbox_status2_description')}
+              onPress={async () => {
+                state.powerMemory = RELAY_STATUS_ON
+                await setPowerMemory(state.powerMemory)
+              }} />
+            <View style={styles.line} />
+            <Spacer height={cx(8)} />
+            <PowerOnBehaviorModeItem
+              enable={state.powerMemory === RELAY_STATUS_MEMORY}
+              title={I18n.getLang('sockets_specific_settings_relay_status_remember')}
+              content={I18n.getLang('socket_settings_firstbox_status3_description')}
+              onPress={async () => {
+                state.powerMemory = RELAY_STATUS_MEMORY
+                await setPowerMemory(state.powerMemory)
+              }} />
+            <Spacer height={cx(4)} />
+          </Card>
+          <Spacer height={cx(8)} />
+        </View>
+      </ScrollView>
+    </Page>
+  )
+}
+
+interface PowerOnBehaviorModeItemProps extends PropsWithChildren<ViewProps> {
+  onPress: () => void
+  title: string
+  content: string
+  enable: boolean
+}
+
+function PowerOnBehaviorModeItem(props: PowerOnBehaviorModeItemProps) {
+  return (
+    <TouchableOpacity onPress={props.onPress}>
+      <View style={styles.itemRoot}>
+        <View style={styles.itemTextGroup}>
+          <Text style={styles.itemTitle}>{props.title}</Text>
+          <Spacer height={cx(4)} />
+          <Text style={styles.itemContent}>{props.content}</Text>
+        </View>
+        <Image
+          source={{ uri: res.ic_check }}
+          style={[
+            styles.itemCheckedIcon,
+            {
+              display: props.enable ? 'flex' : 'none',
+            },
+          ]} />
+      </View>
+    </TouchableOpacity>
+  )
+}
+
+const styles = StyleSheet.create({
+  root: {
+    flex: 1,
+  },
+  tipText: {
+    marginHorizontal: cx(24),
+    color: '#000',
+    fontSize: cx(14),
+    fontFamily: 'helvetica_neue_lt_std_roman',
+  },
+  modeSelectGroup: {
+    marginHorizontal: cx(24),
+    backgroundColor: '#f6f6f6',
+    borderRadius: cx(4),
+  },
+  modeTip: {
+    marginHorizontal: cx(8),
+    color: '#000',
+    fontSize: cx(14),
+    fontWeight: 'bold',
+    fontFamily: 'helvetica_neue_lt_std_bd',
+  },
+  modeSelectCard: {
+    marginHorizontal: cx(8),
+  },
+  line: {
+    height: cx(1),
+    marginHorizontal: cx(12),
+    backgroundColor: '#3C3C435B',
+  },
+  itemRoot: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    paddingHorizontal: cx(12),
+    paddingBottom: cx(8),
+  },
+  itemTextGroup: {
+    flex: 1,
+    marginEnd: cx(12),
+    justifyContent: 'center',
+  },
+  itemTitle: {
+    color: '#000',
+    fontSize: cx(14),
+    fontFamily: 'helvetica_neue_lt_std_roman',
+  },
+  itemContent: {
+    color: '#666',
+    fontSize: cx(14),
+    fontFamily: 'helvetica_neue_lt_std_roman',
+  },
+  itemCheckedIcon: {
+    width: cx(32),
+    height: cx(32),
+    marginEnd: cx(4),
+  },
+})
+
+export default PowerOnBehaviorPage

package/src/modules/randomTime/RandomTimeActions.ts

@@ -29,6 +29,18 @@ export interface RandomTimerItem extends RandomTimer{
   name: string
 }
 
+export interface PlugRandomTimer {
+  power: boolean;
+  weeks: number[];
+  startTime: number;
+  endTime: number;
+}
+
+export interface PlugRandomTimerItem extends PlugRandomTimer {
+  index: number | string
+  name: string
+}
+
 
 type UseFixedTimeType = (dpKey: string, disableFeature?: boolean) => [RandomTimerItem[], (randomTimeList: RandomTimerItem[], manualEdit?: boolean) => Promise<{ success: boolean}>]
 

package/src/modules/scene/SceneAction.ts

@@ -401,7 +401,7 @@ export function stripObj2Dp(scene: StripSceneInfo, isStringLight: boolean = fals
   return versionHex + idHex + modeHex + intervalTimeHex + changeTimeHex + optionAHex + optionBHex + optionCHex + nodeHex
 }
 
-export function useFantasyScene(sceneDp: string, workModeDp: string, isStringLight?: boolean): [number, (scene: StripSceneInfo) => Promise<Result<any>>] {
+export function useFantasyScene(sceneDp: string, workModeDp: string, switchDp: string, isStringLight?: boolean): [number, (scene: StripSceneInfo) => Promise<Result<any>>] {
   const [dps, setDps]: [any, (v: any) => Promise<Result<any>>] = useDps()
   const dp = dps[sceneDp]
   const [sceneState, setSceneState] = useState<StripSceneInfo>(stripDp2Obj(dp, isStringLight))
@@ -414,7 +414,8 @@ export function useFantasyScene(sceneDp: string, workModeDp: string, isStringLig
     const sceneHex = stripObj2Dp(scene, isStringLight)
     return setDps({
       [sceneDp]: sceneHex,
-      [workModeDp]: SCENE
+      [workModeDp]: SCENE,
+      [switchDp]: true
     })
   }
   return [sceneState.id, setFantasyScene]
@@ -426,14 +427,14 @@ type LampType = {
 }
 export async function getRemoteFantasyScene(featureId: string, devId: string, lampType: LampType) {
   const res = await NativeApi.getJson(devId, featureId)
-  const cloudData = Array.isArray(parseJSON(res?.data)) && parseJSON(res?.data) || []
-  if (res.success && cloudData?.length) {
+  const isNormalData = Array.isArray(parseJSON(res?.data))
+  if (res.success && isNormalData) {
     return {
       success: true,
       data: JSON.parse(res.data)?.map(item => remoteFantasySceneInfo2SceneUIState(item, lampType.isStringLight)),
     }
   } else {
-    if (res.msg?.includes('资源未找到') || cloudData?.length === 0) {
+    if (res.msg?.includes('资源未找到') || !isNormalData) {
       const defaultScene = getDefFantasyScene(lampType)
       const res = await NativeApi.putJson(devId, featureId, JSON.stringify(defaultScene))
       if (res.success) {

package/src/modules/sleepWakeup/SleepWakeUpDetailPage.tsx

@@ -126,19 +126,19 @@ const SleepWakeUpDetailPage = () => {
   }, [])
 
   useUpdateEffect(() => {
-    const min = state.fadeOutHour === '02' ? '00' : (state.fadeOutHour === '00' && state.fadeOutMinute === '00' && '05') || state.fadeOutMinute
+    const min = state.fadeOutHour === '02' ? '00' : (state.fadeOutHour === '00' && state.fadeOutMinute === '00') ? '05' : state.fadeOutMinute
     state.fadeOutMinute = min
     state.fadeOut = (Number(state.fadeOutHour) * 60) + Number(min)
   }, [state.fadeOutHour, state.fadeOutMinute])
 
   useUpdateEffect(() => {
-    const min = state.fadeInHour === '02' ? '00' : (state.fadeInHour === '00' && state.fadeInMinute === '00' && '05') || state.fadeInMinute
+    const min = state.fadeInHour === '02' ? '00' : (state.fadeInHour === '00' && state.fadeInMinute === '00') ? '05' : state.fadeInMinute
     state.fadeInMinute = min
     state.fadeIn = (Number(state.fadeInHour) * 60) + Number(min)
   }, [state.fadeInHour, state.fadeInMinute])
 
   useUpdateEffect(() => {
-    const min = state.durationHour === '02' ? '00' : (state.durationHour === '00' && state.durationMinute === '00' && '05') || state.durationMinute
+    const min = state.durationHour === '02' ? '00' : (state.durationHour === '00' && state.durationMinute === '00') ? '05' : state.durationMinute
     state.durationMinute = min
     state.duration = (Number(state.durationHour) * 60) + Number(min)
   }, [state.durationHour, state.durationMinute])
@@ -386,7 +386,7 @@ const SleepWakeUpDetailPage = () => {
           <LdvPickerView
             style={styles.picker}
             hour={props.isSleep ? state.fadeOutHour : state.fadeInHour}
-            minute={props.isSleep ? state.fadeOutMinute : state.fadeOutMinute}
+            minute={props.isSleep ? state.fadeOutMinute : state.fadeInMinute}
             minutesStep={5}
             setHour={v => {
               if (props.isSleep) {
@@ -403,6 +403,7 @@ const SleepWakeUpDetailPage = () => {
               }
             }}
             unit={['h', 'min']}
+            maxHour={3}
           />
           <Text>{I18n.formatValue(props.isSleep ? 'add_sleepschedule_one_source_settings_text2' : 'add_wakeupschedule_settings_text2', `${formateTime(props.isSleep ? state.fadeOut : state.fadeIn, props.isSleep)}`)}</Text>
           <Spacer />
@@ -435,6 +436,7 @@ const SleepWakeUpDetailPage = () => {
               setHour={v => (state.durationHour = v)}
               setMinute={v => (state.durationMinute = v)}
               unit={['h', 'min']}
+              maxHour={3}
             />
             <Text>{I18n.formatValue('add_wakeupschedule_settings_text5', `${formateTime(state.duration, !props.isSleep)}`)}</Text>
             <Spacer />

package/src/navigation/Routers.ts

@@ -1,4 +1,4 @@
-import {NavigationRoute, TransitionPresets} from 'tuya-panel-kit'
+import { NavigationRoute, TransitionPresets } from 'tuya-panel-kit'
 import TimeSchedulePage from '../modules/timeSchedule/TimeSchedulePage'
 import TimeScheduleEditPage from '../modules/timeSchedule/TimeScheduleEditpage'
 import DynamicMoodEditorPage from '../modules/mood/DynamicMoodEditorPage'
@@ -19,6 +19,8 @@ import FixedTimePage from '../modules/fixedTime/FixedTimePage'
 import FixedTimeDetailPage from '../modules/fixedTime/FixedTimeDetailPage'
 import RandomTimePage from 'modules/randomTime/RandomTimePage'
 import RandomTimeDetailPage from '../modules/randomTime/RandomTimeDetailPage'
+import HistoryPage from '../modules/history/HistoryPage'
+import PowerOnBehaviorPage from '../modules/powerOnBehavior/PowerOnBehaviorPage'
 
 export const ui_biz_routerKey = {
   'ui_biz_time_schedule': 'ui_biz_time_schedule',
@@ -40,7 +42,9 @@ export const ui_biz_routerKey = {
   'ui_biz_fixed_time': 'ui_biz_fixed_time',
   'ui_biz_fixed_time_edit': 'ui_biz_fixed_time_edit',
   'ui_biz_random_time': 'ui_biz_random_time',
-  'ui_biz_random_time_edit': 'ui_biz_random_time_edit'
+  'ui_biz_random_time_edit': 'ui_biz_random_time_edit',
+  'ui_biz_history': 'ui_biz_history',
+  'ui_biz_power_behavior': 'ui_biz_power_behavior'
 }
 
 export const BiologicalRouters: NavigationRoute[] = [
@@ -238,4 +242,26 @@ export const RandomTimePageRouters: NavigationRoute[] = [
       showOfflineView: false,
     },
   }
+]
+
+export const HistoryPageRouters: NavigationRoute[] = [
+  {
+    name: ui_biz_routerKey.ui_biz_history,
+    component: HistoryPage,
+    options: {
+      hideTopbar: true,
+      showOfflineView: false,
+    }
+  }
+]
+
+export const PowerOnBehaviorPageRouters: NavigationRoute[] = [
+  {
+    name: ui_biz_routerKey.ui_biz_power_behavior,
+    component: PowerOnBehaviorPage,
+    options: {
+      hideTopbar: true,
+      showOfflineView: false,
+    }
+  }
 ]