@ledvance/group-ui-biz-bundle 1.0.124 → 1.0.127

package/package.json

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

package/src/modules/powerOnBehavior/LightBehaviorPage.tsx

@@ -3,9 +3,14 @@ import {ScrollView, StyleSheet, Text, View} from 'react-native'
 import {useReactive, useUpdateEffect} from 'ahooks'
 import {Utils} from 'tuya-panel-kit'
 import Page from '@ledvance/base/src/components/Page'
-import {useDeviceInfo} from '@ledvance/base/src/models/modules/NativePropsSlice'
+import {useUAGroupInfo} from '@ledvance/base/src/models/modules/NativePropsSlice'
 import I18n from '@ledvance/base/src/i18n'
-import {LightBehaviorPageParams, useDoNotDisturbControl, usePowerOffMemory} from './PowerOnBehaviorActions'
+import {
+  LightBehaviorPageParams,
+  PowerOffMemoryModel,
+  useDoNotDisturbControl,
+  usePowerOffMemory
+} from './PowerOnBehaviorActions'
 import Spacer from '@ledvance/base/src/components/Spacer'
 import Card from '@ledvance/base/src/components/Card'
 import LampAdjustView from '@ledvance/base/src/components/LampAdjustView'
@@ -23,18 +28,32 @@ export enum PowerMemoryMode {
   Last = 1,
   Custom = 2
 }
+
+const initCustomValue = (powerMemory: PowerOffMemoryModel) => {
+  const newPowerMemory = cloneDeep(powerMemory)
+  if (newPowerMemory.isColor) {
+    newPowerMemory.temperature = 100
+    newPowerMemory.bright = 100
+  } else {
+    newPowerMemory.hue = 0
+    newPowerMemory.sat = 100
+    newPowerMemory.hue = 100
+  }
+  return newPowerMemory
+}
+
 const LightBehaviorPage = (props: { theme?: ThemeType }) => {
   const params = useParams<LightBehaviorPageParams>()
-  const deviceInfo = useDeviceInfo()
+  const uaGroupInfo = useUAGroupInfo()
   const [powerMemory, setPowerMemory] = usePowerOffMemory()
   const [doNotDisturb, setDoNotDisturb] = useDoNotDisturbControl()
   const state = useReactive({
     loading: false,
-    powerMemory: cloneDeep(powerMemory),
+    powerMemory: initCustomValue(powerMemory),
   })
 
   useUpdateEffect(() => {
-    state.powerMemory = powerMemory
+    state.powerMemory = cloneDeep(powerMemory)
   }, [JSON.stringify(powerMemory)])
 
   const styles = StyleSheet.create({
@@ -56,7 +75,7 @@ const LightBehaviorPage = (props: { theme?: ThemeType }) => {
 
   return (
     <Page
-      backText={deviceInfo.name}
+      backText={uaGroupInfo.name}
       headlineText={I18n.getLang('light_sources_specific_settings_power_off')}
       loading={state.loading}>
       <ScrollView style={styles.root} nestedScrollEnabled={true}>

package/src/modules/powerOnBehavior/PlugBehaviorPage.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import {ScrollView, StyleSheet} from 'react-native'
 import Page from '@ledvance/base/src/components/Page'
-import {useDeviceInfo} from '@ledvance/base/src/models/modules/NativePropsSlice'
+import {useUAGroupInfo} 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'
@@ -21,7 +21,7 @@ const RELAY_STATUS_MEMORY = 'memory'
 
 const PlugBehaviorPage = () => {
   const params = useParams<PowerBehaviorPageParams>()
-  const deviceInfo = useDeviceInfo()
+  const uaGroupInfo = useUAGroupInfo()
   const [powerMemories, setPowerMemories] = usePowerBehavior(params.powerBehaviorKeys)
 
   const state = useReactive({
@@ -42,7 +42,7 @@ const PlugBehaviorPage = () => {
 
   return (
     <Page
-      backText={deviceInfo.name}
+      backText={uaGroupInfo.name}
       headlineText={I18n.getLang('light_sources_specific_settings_power_off')}
       loading={state.loading}>
       <ScrollView style={styles.root} nestedScrollEnabled={true}>

package/src/modules/powerOnBehavior/PowerOnBehaviorActions.ts

@@ -2,6 +2,7 @@ import {useFeatureHook} from "@ledvance/base/src/models/modules/NativePropsSlice
 import {Result} from "@ledvance/base/src/models/modules/Result"
 import {Utils} from 'tuya-panel-kit';
 import {spliceByStep} from "@ledvance/base/src/utils/common";
+import {cloneDeep} from "lodash";
 
 const { hexStringToNumber } = Utils.StringUtils;
 
@@ -109,7 +110,8 @@ export function dp2Obj(dp: string): PowerOffMemoryModel {
   };
 }
 
-export function obj2Dp(obj: PowerOffMemoryModel): string {
+export function obj2Dp(powerMemory: PowerOffMemoryModel): string {
+  const obj = cloneDeep(powerMemory)
   const version = '00';
   if (obj.isColor) {
     obj.bright = 0

package/src/modules/remoteSwitch/RemoteSwitchPage.tsx

@@ -56,7 +56,9 @@ const RemoteSwitchPage = (props: { theme?: ThemeType }) => {
 
   return (<Page
     backText={uaGroupInfo.name}
-    loading={state.loading}>
+    loading={state.loading}
+    headlineText={I18n.getLang('light_sources_specific_settings_remote_control')}
+  >
     <View style={[styles.titleBGView, styles.shadow]}>
       <Text style={styles.title}>{I18n.getLang('light_sources_specific_settings_remote_control')}</Text>
       <View style={[styles.colorBlock, { backgroundColor: 'red', opacity: 0 }]} />