@ledvance/group-ui-biz-bundle 1.0.126 → 1.0.128

package/package.json

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

package/src/modules/biorhythm/BiorhythmActions.ts

@@ -23,12 +23,15 @@ export const useBiorhythm = (): [BiorhythmBean, (value: BiorhythmBean) => Promis
     return obj2Dp(val)
   })
   const supportOldData = useCallback((oldData: BiorhythmBean) =>{
+    const repeatPeriod = [...oldData.repeatPeriod]
+    repeatPeriod.sort((a, b) => a.index - b.index)
     return {
       ...oldData,
+      repeatPeriod: repeatPeriod,
       planList: oldData.planList.map(p => {
         // @ts-ignore  老数据中使用的是startTime
         if (!p.hasOwnProperty('time') && p.startTime){
-         // @ts-ignore
+          // @ts-ignore
           const t = p.startTime.split(':')
           return {
             ...p,
@@ -72,6 +75,7 @@ export function dp2Obj(dp: string): BiorhythmBean {
         enabled: p === '1',
       }
     })
+  repeatPeriod.sort((a, b) => a.index - b.index)
   dpCopy = dpCopy.slice(2)
   // 节点个数 (每个节点长度18)，最多8个节点
   hex2Int(dpCopy.slice(0, 2))
@@ -203,8 +207,9 @@ function obj2Dp(obj: BiorhythmBean): string {
   const versionHex = '00'
   const enableHex = obj.enable ? '01' : '00'
   const gradientHex = obj.gradient === BiorhythmGradientType.EntireGradient ? '00' : '0F'
+  const newRepeatPeriod = [obj.repeatPeriod[obj.repeatPeriod.length - 1], ...obj.repeatPeriod.slice(0, -1)]
   const repeatPeriodHex = parseInt(
-    obj.repeatPeriod
+    newRepeatPeriod
       .map(p => (p.enabled ? '1' : '0'))
       .reverse()
       .join(''),

package/src/modules/biorhythm/BiorhythmPage.tsx

@@ -22,7 +22,6 @@ import I18n from '@ledvance/base/src/i18n'
 import res from '@ledvance/base/src/res'
 import { ui_biz_routerKey } from '../../navigation/Routers'
 import { cctToColor } from '@ledvance/base/src/utils/cctUtils'
-import { setDataSource } from '@ledvance/base/src/components/weekSelect'
 import { BiorhythmEditPageParams } from './BiorhythmDetailPage'
 import { useBiorhythm } from './BiorhythmActions'
 import { convertMinutesTo12HourFormat, showDialog as showCommonDialog, showDialog } from '@ledvance/base/src/utils/common'
@@ -185,11 +184,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
   }, [JSON.stringify(biorhythm)])
 
   useEffect(() => {
-    const weeks: string[] = setDataSource(
-      biorhythm.repeatPeriod.map(item => {
-        return item?.enabled ? 1 : 0
-      })).filter(item => item.enabled)
-      .map(item => item.title)
+    const weeks = biorhythm.repeatPeriod.filter(it => it.enabled).map(it => it.title)
 
     if (weeks.length > 0) {
       // / more than one
@@ -219,20 +214,20 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
   const sunHomeText = string => {
     const text = string.split('SUN@HOME')
     return text?.length === 1 && <Text style={{ fontSize: cx(14), color: props.theme?.global.fontColor }}>{text[0]}</Text> ||
-      <Text style={{
-        fontSize: cx(14),
-        flexDirection: 'row',
-      }}>
-        <Text style={{ color: props.theme?.global.fontColor }}>{text[0]}</Text>
-        <Text onPress={openLink}
-          style={{
-            fontFamily: 'helvetica_neue_lt_std_roman',
-            color: props.theme?.button.primary,
-            textDecorationLine: 'underline',
-            flexWrap: 'wrap',
-          }}>SUN@HOME</Text>
-        <Text style={{ color: props.theme?.global.fontColor }}>{text[1]}</Text>
-      </Text>
+        <Text style={{
+          fontSize: cx(14),
+          flexDirection: 'row',
+        }}>
+            <Text style={{ color: props.theme?.global.fontColor }}>{text[0]}</Text>
+            <Text onPress={openLink}
+                  style={{
+                    fontFamily: 'helvetica_neue_lt_std_roman',
+                    color: props.theme?.button.primary,
+                    textDecorationLine: 'underline',
+                    flexWrap: 'wrap',
+                  }}>SUN@HOME</Text>
+            <Text style={{ color: props.theme?.global.fontColor }}>{text[1]}</Text>
+        </Text>
   }
 
   const randomIcon = () => {
@@ -433,66 +428,66 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
                 marginTop: cx(26),
               }}>
               {state.planList.length === 8 && <View
-                style={{ marginVertical: cx(10), flexDirection: 'row', alignItems: 'center', width: width - cx(48) }}>
-                <Image style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.warning }} source={{ uri: res.ic_warning_amber }} />
-                <Text
-                  style={{
-                    flexWrap: 'wrap',
-                    fontSize: cx(12),
-                    color: props.theme?.global.fontColor
-                  }}>{I18n.getLang('add_new_trigger_time_warning_max_number_text')}</Text>
+                  style={{ marginVertical: cx(10), flexDirection: 'row', alignItems: 'center', width: width - cx(48) }}>
+                  <Image style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.warning }} source={{ uri: res.ic_warning_amber }} />
+                  <Text
+                      style={{
+                        flexWrap: 'wrap',
+                        fontSize: cx(12),
+                        color: props.theme?.global.fontColor
+                      }}>{I18n.getLang('add_new_trigger_time_warning_max_number_text')}</Text>
               </View>}
               {state.planList.length < 8 &&
-                <>
-                  <Text
-                    style={{
-                      fontSize: cx(16),
-                      fontWeight: 'bold',
-                      color: props.theme?.global.fontColor,
-                    }}>{I18n.getLang('bio_ryhthm_default_subheadline_text')}</Text>
-                  <TouchableOpacity
-                    onPress={() => {
-                      const ids: number[] = state.planList.map(p => p.id)
-                      const newPlan: Plan = {
-                        id: Math.max(...ids) + 1,
-                        icon: res.rhythm_icon1,
-                        time: 0,
-                        name: '',
-                        colorTemperature: 0,
-                        brightness: 100,
-                        action: [
-                          {
-                            uri: 'model/attribute/set/LightCtrl/ColorTemperature',
-                            startValue: `${colorTemperatureValue(0)}`,
-                          },
-                          {
-                            uri: 'model/attribute/set/LightCtrl/Brightness',
-                            startValue: '100',
-                          },
-                        ],
-                        enable: true,
-                        iconId: randomIcon(),
-                      }
-                      const editPageParams: BiorhythmEditPageParams = {
-                        planData: newPlan,
-                        isAdd: true,
-                        onPlanEdited,
-                        onPlanDelete,
-                        nameRepeat,
-                        minimumEnable,
-                        iconIdList: state.planList?.map(item => {
-                          return item.iconId
-                        }),
-                        isMixLight: params.isMixLight,
-                        isSupportTemperature: params.isSupportTemperature,
-                        isSupportBrightness: params.isSupportBrightness,
-                        showDeleteBtn
-                      }
-                      navigation.navigate(ui_biz_routerKey.group_ui_biz_biological_detail, editPageParams)
-                    }}>
-                    <Image source={{ uri: res.biorhythom_add }} style={{ height: cx(24), width: cx(24), tintColor: props.theme?.icon.primary }} />
-                  </TouchableOpacity>
-                </>
+                  <>
+                      <Text
+                          style={{
+                            fontSize: cx(16),
+                            fontWeight: 'bold',
+                            color: props.theme?.global.fontColor,
+                          }}>{I18n.getLang('bio_ryhthm_default_subheadline_text')}</Text>
+                      <TouchableOpacity
+                          onPress={() => {
+                            const ids: number[] = state.planList.map(p => p.id)
+                            const newPlan: Plan = {
+                              id: Math.max(...ids) + 1,
+                              icon: res.rhythm_icon1,
+                              time: 0,
+                              name: '',
+                              colorTemperature: 0,
+                              brightness: 100,
+                              action: [
+                                {
+                                  uri: 'model/attribute/set/LightCtrl/ColorTemperature',
+                                  startValue: `${colorTemperatureValue(0)}`,
+                                },
+                                {
+                                  uri: 'model/attribute/set/LightCtrl/Brightness',
+                                  startValue: '100',
+                                },
+                              ],
+                              enable: true,
+                              iconId: randomIcon(),
+                            }
+                            const editPageParams: BiorhythmEditPageParams = {
+                              planData: newPlan,
+                              isAdd: true,
+                              onPlanEdited,
+                              onPlanDelete,
+                              nameRepeat,
+                              minimumEnable,
+                              iconIdList: state.planList?.map(item => {
+                                return item.iconId
+                              }),
+                              isMixLight: params.isMixLight,
+                              isSupportTemperature: params.isSupportTemperature,
+                              isSupportBrightness: params.isSupportBrightness,
+                              showDeleteBtn
+                            }
+                            navigation.navigate(ui_biz_routerKey.group_ui_biz_biological_detail, editPageParams)
+                          }}>
+                          <Image source={{ uri: res.biorhythom_add }} style={{ height: cx(24), width: cx(24), tintColor: props.theme?.icon.primary }} />
+                      </TouchableOpacity>
+                  </>
               }
             </View>
             <FlatList

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 }]} />