@ledvance/ui-biz-bundle 1.1.133 → 1.1.135

package/src/newModules/biorhythm/circular/interface.ts

@@ -0,0 +1,114 @@
+import { StyleProp, ViewStyle, ImageStyle, ImageSourcePropType } from 'react-native';
+
+export interface RhythmsCircleProps {
+  /**
+   * picker的大小
+   */
+  size: number;
+  /**
+   * 滑动图标内圈大小
+   */
+  ringWidth: number;
+  /**
+   * 滑块图标大小
+   */
+  thumbSize: number;
+  /**
+   * 色盘最外围样式
+   */
+  pickerStyle?: StyleProp<ViewStyle>;
+  /**
+   * 时间盘的样式
+   */
+  timeStyle?: StyleProp<ViewStyle>;
+  /**
+   * 时间指针图片
+   */
+  timeImg?: ImageSourcePropType;
+  /**
+   * 滑块图标样式
+   */
+  thumbStyle?: StyleProp<ViewStyle>;
+  /**
+   * 图标样式
+   */
+  iconStyle?: StyleProp<ImageStyle>;
+  /**
+   * 数据
+   */
+  data?: IData[];
+  /**
+   * 滑块图标是否可拖动
+   */
+  disabled?: boolean;
+  /**
+   * 不能拖动的透明度
+   */
+  disabledOpacity?: number;
+  /**
+   * 是否可以滑过超过上一个节点和下一个节点
+   */
+  stepOverEnabled?: boolean;
+  /**
+   * 最小间隔时间为15分钟对应的角度
+   */
+  stepTime?: number;
+  /**
+   * 滑块图标移动事件
+   */
+  onMove?: (v: IMovePropsData[]) => void;
+  /**
+   * 滑块图标移动结束事件
+   */
+  onRelease?: (v: IMovePropsData[]) => void;
+  /**
+   * 滑块图标改变事件
+   */
+  onChange?: (v: IMovePropsData[]) => void;
+  /**
+   * 在日落节点后多加一个颜色进行优化
+   */
+  lastRingColor?: string;
+}
+
+export interface IData {
+  /**
+   * 下标
+   */
+  index: number;
+  /**
+   *  hour * 60 + minute,
+   */
+  time: number;
+  /**
+   * 图标
+   */
+  icon: string;
+  /**
+   * 图标未点击的颜色
+   */
+  noActiveColor: string;
+  /**
+   * 图标点击的颜色
+   */
+  activeColor: string;
+  /**
+   * 每个图标之间极坐标的颜色
+   */
+  color: string;
+  /**
+   * 图标是否可以触发
+   */
+  valid?: boolean;
+  /**
+   * 改节点的角度
+   */
+  angle?: number;
+}
+export interface IMovePropsData {
+  index: number;
+  time: number;
+  icon: string;
+  color: string;
+  deg: number;
+}

package/src/newModules/energyConsumption/component/EnergyModal.tsx

@@ -311,6 +311,9 @@ const EnergyModal = (props: EnergyModalProps) => {
   return (
     <Modal
       visible={props.visible}
+      onRequestClose={() => {
+        props.onCancel && props.onCancel()
+      }}
     >
       <ScrollView>
         <View style={{ backgroundColor: props.theme?.card.head, flexDirection: 'row', height: cx(60), justifyContent: 'space-between', alignItems: 'center', borderTopLeftRadius: cx(10), borderTopRightRadius: cx(10), paddingHorizontal: cx(8) }}>

package/src/newModules/lightMode/LightModePage.tsx

@@ -1,16 +1,16 @@
-import React, { PropsWithChildren } from 'react'
-import { Image, ScrollView, StyleSheet, Text, TouchableOpacity, View, ViewProps } from 'react-native'
+import React, {useEffect, useMemo} from 'react'
+import {ScrollView, StyleSheet, Text} from 'react-native'
 import Page from '@ledvance/base/src/components/Page'
 import {useDeviceInfo, useDp} from '@ledvance/base/src/models/modules/NativePropsSlice'
 import I18n from '@ledvance/base/src/i18n'
-import { Utils } from 'tuya-panel-kit'
+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'
-import { useParams } from '@ledvance/base/src/hooks/Hooks'
+import {useReactive, useUpdateEffect} from 'ahooks'
+import {useParams} from '@ledvance/base/src/hooks/Hooks'
 import {Result} from "@ledvance/base/src/models/modules/Result";
 import ThemeType from '@ledvance/base/src/config/themeType'
+import {getGlobalParamsProperty} from '@ledvance/base/src/utils/common'
+import OptionGroup from "@ledvance/base/src/components/OptionGroup";
 
 const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
@@ -19,12 +19,13 @@ const LIGHT_MODE_RELAY = 'relay'
 const LIGHT_MODE_POS = 'pos'
 const LIGHT_MODE_OFF = 'off'
 const LIGHT_MODE_ON = 'on'
+const LIGHT_MODE_NONE = 'none'
 
 export interface LightModePageParams {
   lightModeCode: string
 }
 
-type LightMode = 'relay' | 'pos' | 'off' | 'on'
+type LightMode = 'relay' | 'pos' | 'off' | 'on' | 'none'
 
 export const useLightMode = (code: string): [LightMode, (v: LightMode) => Promise<Result<any>>] => {
   return useDp(code)
@@ -38,12 +39,42 @@ const LightModePage = (props: { theme?: ThemeType }) => {
   const state = useReactive({
     lightMode: lightMode,
     loading: false,
+    modes: [] as LightMode[]
   })
 
+  useEffect(() => {
+    state.modes = getGlobalParamsProperty(params.lightModeCode)?.range || []
+  }, []);
+
   useUpdateEffect(() => {
     state.lightMode = lightMode
   }, [lightMode])
 
+  const modeMap = useMemo(() => {
+    return {
+      [LIGHT_MODE_RELAY]: {
+        title: I18n.getLang('matterplug_option1title'),
+        content: I18n.getLang('matterplug_option1description'),
+      },
+      [LIGHT_MODE_POS]: {
+        title: I18n.getLang('matterplug_option2title'),
+        content: I18n.getLang('matterplug_option2description'),
+      },
+      [LIGHT_MODE_OFF]: {
+        title: I18n.getLang('matterplug_option3title'),
+        content: I18n.getLang('matterplug_option3description'),
+      },
+      [LIGHT_MODE_ON]: {
+        title: I18n.getLang('matterplug_option4title'),
+        content: I18n.getLang('matterplug_option4description'),
+      },
+      [LIGHT_MODE_NONE]: {
+        title: I18n.getLang('matterplug_option3title'),
+        content: I18n.getLang('matterplug_option3description'),
+      }
+    }
+  }, [])
+
   const styles = StyleSheet.create({
     root: {
       flex: 1,
@@ -55,58 +86,6 @@ const LightModePage = (props: { theme?: ThemeType }) => {
       fontWeight: 'bold',
       fontFamily: 'helvetica_neue_lt_std_bd',
     },
-    tipText: {
-      marginHorizontal: cx(24),
-      color: props.theme?.global.fontColor,
-      fontSize: cx(14),
-      fontFamily: 'helvetica_neue_lt_std_roman',
-    },
-    modeSelectGroup: {
-      marginHorizontal: cx(24),
-      backgroundColor: props.theme?.container.background,
-      borderRadius: cx(4),
-    },
-    modeTip: {
-      marginHorizontal: cx(8),
-      color: props.theme?.global.fontColor,
-      fontSize: cx(14),
-      fontWeight: 'bold',
-      fontFamily: 'helvetica_neue_lt_std_bd',
-    },
-    modeSelectCard: {
-      marginHorizontal: cx(8),
-    },
-    line: {
-      height: cx(1),
-      marginHorizontal: cx(12),
-      backgroundColor: props.theme?.container.divider,
-    },
-    itemRoot: {
-      flexDirection: 'row',
-      alignItems: 'center',
-      paddingHorizontal: cx(12),
-      paddingBottom: cx(8),
-    },
-    itemTextGroup: {
-      flex: 1,
-      marginEnd: cx(12),
-      justifyContent: 'center',
-    },
-    itemTitle: {
-      color: props.theme?.global.fontColor,
-      fontSize: cx(14),
-      fontFamily: 'helvetica_neue_lt_std_roman',
-    },
-    itemContent: {
-      color: props.theme?.global.secondFontColor,
-      fontSize: cx(14),
-      fontFamily: 'helvetica_neue_lt_std_roman',
-    },
-    itemCheckedIcon: {
-      width: cx(32),
-      height: cx(32),
-      marginEnd: cx(4),
-    },
   })
 
   return (
@@ -119,94 +98,22 @@ const LightModePage = (props: { theme?: ThemeType }) => {
           {I18n.getLang('matterplug_description')}
         </Text>
         <Spacer />
-        <View style={styles.modeSelectGroup}>
-          <Spacer height={cx(8)} />
-          <Text style={styles.modeTip}>
-            {I18n.getLang('matterplug_heading')}
-          </Text>
-          <Spacer height={cx(8)} />
-          <Card style={styles.modeSelectCard}>
-            <Spacer height={cx(12)} />
-            <LightModeItem
-              styles={styles}
-              enable={state.lightMode === LIGHT_MODE_RELAY}
-              title={I18n.getLang('matterplug_option1title')}
-              content={I18n.getLang('matterplug_option1description')}
-              onPress={async () => {
-                state.lightMode = LIGHT_MODE_RELAY
-                await setLightMode(state.lightMode)
-              }} />
-            <View style={styles.line} />
-            <Spacer height={cx(8)} />
-            <LightModeItem
-              styles={styles}
-              enable={state.lightMode === LIGHT_MODE_POS}
-              title={I18n.getLang('matterplug_option2title')}
-              content={I18n.getLang('matterplug_option2description')}
-              onPress={async () => {
-                state.lightMode = LIGHT_MODE_POS
-                await setLightMode(state.lightMode)
-              }} />
-            <View style={styles.line} />
-            <Spacer height={cx(8)} />
-            <LightModeItem
-              styles={styles}
-              enable={state.lightMode === LIGHT_MODE_OFF}
-              title={I18n.getLang('matterplug_option3title')}
-              content={I18n.getLang('matterplug_option3description')}
-              onPress={async () => {
-                state.lightMode = LIGHT_MODE_OFF
-                await setLightMode(state.lightMode)
-              }} />
-            <Spacer height={cx(8)} />
-            <View style={styles.line} />
-            <LightModeItem
-              styles={styles}
-              enable={state.lightMode === LIGHT_MODE_ON}
-              title={I18n.getLang('matterplug_option4title')}
-              content={I18n.getLang('matterplug_option4description')}
-              onPress={async () => {
-                state.lightMode = LIGHT_MODE_ON
-                await setLightMode(state.lightMode)
-              }} />
-            <Spacer height={cx(4)} />
-          </Card>
-          <Spacer height={cx(8)} />
-        </View>
+        <OptionGroup
+          tips={I18n.getLang('matterplug_heading')}
+          selected={state.lightMode}
+          options={state.modes.map((mode) => ({
+            title: modeMap[mode].title,
+            content: modeMap[mode].content,
+            value: mode,
+            onPress: async (value) => {
+              state.lightMode = value
+              await setLightMode(state.lightMode)
+            }
+          }))}
+        />
       </ScrollView>
     </Page>
   )
 }
 
-interface LightModeItemProps extends PropsWithChildren<ViewProps> {
-  styles: StyleSheet.NamedStyles<any>
-  onPress: () => void
-  title: string
-  content: string
-  enable: boolean
-}
-
-function LightModeItem(props: LightModeItemProps) {
-  const { styles } = props
-  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>
-  )
-}
-
 export default withTheme(LightModePage)

package/src/newModules/mood/DynamicMoodEditorPage.tsx

@@ -267,7 +267,7 @@ const DynamicMoodEditorPage = (props: { theme?: ThemeType }) => {
             maxLength={33}
             showError={state.mood.name.length > 32 || nameRepeat}
             tipColor={nameRepeat ? props.theme?.global.error : undefined}
-            tipIcon={nameRepeat ? res.ic_text_field_input_error : undefined}
+            tipIcon={nameRepeat ? { uri: res.ic_text_field_input_error } : undefined}
             errorText={Strings.getLang(
               nameRepeat ? 'string_light_pp_field_sm_add_error1' : 'add_new_dynamic_mood_alert_text'
             )}

package/src/newModules/mood/MixDynamicMoodEditor.tsx

@@ -291,7 +291,7 @@ const MixDynamicMoodEditorPage = (props: { theme?: ThemeType }) => {
             maxLength={33}
             showError={state.mood.name.length > 32 || nameRepeat}
             tipColor={nameRepeat ? props.theme?.global.error : undefined}
-            tipIcon={nameRepeat ? res.ic_text_field_input_error : undefined}
+            tipIcon={nameRepeat ? { uri: res.ic_text_field_input_error } : undefined}
             errorText={Strings.getLang(
               nameRepeat ? 'string_light_pp_field_sm_add_error1' : 'add_new_dynamic_mood_alert_text'
             )}

package/src/newModules/mood/MoodInfo.ts

@@ -383,7 +383,7 @@ function getStringLightSceneList(): RemoteMoodInfo[] {
     },
     {
       n: I18n.getLang('dynamicmoods_sorbet'),
-      i: "0110104b4b0000006400d2580000000064000000000000006400336400000000",
+      i: "0111104b4b0000006400d2580000000064003364000000006400000100000000",
       s: '',
       t: 0,
       e: false,

package/src/newModules/mood/MoodPage.tsx

@@ -94,12 +94,11 @@ const MoodPage = (props: { theme?: ThemeType }) => {
 
   useEffect(() => {
     state.filterMoods = state.originMoods.filter(item => {
+      const isDynamic = (item.secondaryLamp.nodes.length > 1 || item.mainLamp.nodes.length > 1)
       return (
-        (state.staticTagChecked && state.dynamicTagChecked) ||
-        (!state.staticTagChecked && !state.dynamicTagChecked) ||
-        (state.staticTagChecked && item.mainLamp.nodes.length < 2) ||
-        (state.dynamicTagChecked &&
-          (item.secondaryLamp.nodes.length > 1 || item.mainLamp.nodes.length > 1))
+        [state.staticTagChecked, state.dynamicTagChecked].every(it => !it) ||
+        (state.staticTagChecked && !isDynamic) ||
+        (state.dynamicTagChecked && isDynamic)
       );
     });
   }, [state.staticTagChecked, state.dynamicTagChecked, state.originMoods]);

package/src/newModules/mood/StaticMoodEditorPage.tsx

@@ -184,7 +184,7 @@ const StaticMoodEditorPage = (props: { theme?: ThemeType }) => {
             maxLength={33}
             showError={state.mood.name.length > 32 || nameRepeat}
             tipColor={nameRepeat ? props.theme?.global.error : undefined}
-            tipIcon={nameRepeat ? res.ic_text_field_input_error : undefined}
+            tipIcon={nameRepeat ? { uri: res.ic_text_field_input_error } : undefined}
             errorText={I18n.getLang(
               nameRepeat ? 'string_light_pp_field_sm_add_error1' : 'add_new_dynamic_mood_alert_text'
             )}

package/src/newModules/powerOnBehavior/LightBehaviorPage.tsx

@@ -1,19 +1,19 @@
-import React, { PropsWithChildren } from 'react'
-import { Image, ScrollView, StyleSheet, Text, TouchableOpacity, View, ViewProps } from 'react-native'
-import { useReactive, useUpdateEffect } from 'ahooks'
-import { Utils } from 'tuya-panel-kit'
+import React from 'react'
+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 {useDeviceInfo} from '@ledvance/base/src/models/modules/NativePropsSlice'
 import I18n from '@ledvance/base/src/i18n'
-import { usePowerOffMemory, useDoNotDisturbControl } from './PowerOnBehaviorActions'
+import {useDoNotDisturbControl, usePowerOffMemory} from './PowerOnBehaviorActions'
 import Spacer from '@ledvance/base/src/components/Spacer'
 import Card from '@ledvance/base/src/components/Card'
-import res from '@ledvance/base/src/res'
 import LampAdjustView from '@ledvance/base/src/components/LampAdjustView'
 import LdvSwitch from '@ledvance/base/src/components/ldvSwitch'
-import { cloneDeep } from 'lodash'
-import { useParams } from '@ledvance/base/src/hooks/Hooks'
+import {cloneDeep} from 'lodash'
+import {useParams} from '@ledvance/base/src/hooks/Hooks'
 import ThemeType from '@ledvance/base/src/config/themeType'
+import OptionGroup from "@ledvance/base/src/components/OptionGroup";
 
 const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
@@ -61,42 +61,6 @@ const LightBehaviorPage = (props: { theme?: ThemeType }) => {
       backgroundColor: props.theme?.container.background,
       borderRadius: cx(4),
     },
-    modeTip: {
-      marginHorizontal: cx(8),
-      color: props.theme?.global.fontColor,
-      fontSize: cx(14),
-      fontWeight: 'bold',
-      fontFamily: 'helvetica_neue_lt_std_bd',
-    },
-    modeSelectCard: {
-      marginHorizontal: cx(8),
-    },
-    line: {
-      height: cx(1),
-      marginHorizontal: cx(12),
-      backgroundColor: props.theme?.container.divider,
-    },
-    itemRoot: {
-      flexDirection: 'row',
-      alignItems: 'center',
-      paddingHorizontal: cx(12),
-      paddingBottom: cx(8),
-    },
-    itemTextGroup: {
-      flex: 1,
-      marginEnd: cx(12),
-      justifyContent: 'center',
-    },
-    itemTitle: {
-      color: props.theme?.global.fontColor,
-      fontSize: cx(14),
-      fontFamily: 'helvetica_neue_lt_std_roman',
-    },
-    itemContent: {
-      color: props.theme?.global.secondFontColor,
-      fontSize: cx(14),
-      fontFamily: 'helvetica_neue_lt_std_roman',
-    },
   })
 
   return (
@@ -110,49 +74,34 @@ const LightBehaviorPage = (props: { theme?: ThemeType }) => {
             {I18n.getLang('light_settings_default_secondtopic')}
           </Text>
           <Spacer />
-          <View style={styles.modeSelectGroup}>
-            <Spacer height={cx(8)} />
-            <Text style={styles.modeTip}>
-              {I18n.getLang('groups_settings_power_on_behavior_secondbox_topic')}
-            </Text>
-            <Spacer height={cx(8)} />
-            <Card style={styles.modeSelectCard}>
-              <Spacer height={cx(12)} />
-              <PowerOnBehaviorModeItem
-                styles={styles}
-                enable={state.powerMemory.type === PowerMemoryMode.Default}
-                title={I18n.getLang('groups_settings_power_on_behavior_secondbox_status_value1_topic')}
-                content={I18n.getLang('groups_settings_power_on_behavior_secondbox_status_value1_description')}
-                onPress={async () => {
-                  state.powerMemory.type = PowerMemoryMode.Default
-                  await setPowerMemory(state.powerMemory)
-                }} />
-              <View style={styles.line} />
-              <Spacer height={cx(8)} />
-              <PowerOnBehaviorModeItem
-                styles={styles}
-                enable={state.powerMemory.type === PowerMemoryMode.Last}
-                title={I18n.getLang('groups_settings_power_on_behavior_secondbox_status_value2_topic')}
-                content={I18n.getLang('groups_settings_power_on_behavior_secondbox_status_value2_description')}
-                onPress={async () => {
-                  state.powerMemory.type = PowerMemoryMode.Last
-                  await setPowerMemory(state.powerMemory)
-                }} />
-              <View style={styles.line} />
-              <Spacer height={cx(8)} />
-              <PowerOnBehaviorModeItem
-                styles={styles}
-                enable={state.powerMemory.type === PowerMemoryMode.Custom}
-                title={I18n.getLang('groups_settings_power_on_behavior_secondbox_status_value3_topic')}
-                content={I18n.getLang('groups_settings_power_on_behavior_secondbox_status_value3_description')}
-                onPress={async () => {
-                  state.powerMemory.type = PowerMemoryMode.Custom
-                  await setPowerMemory(state.powerMemory)
-                }} />
-              <Spacer height={cx(4)} />
-            </Card>
-            <Spacer height={cx(8)} />
-          </View>
+          <OptionGroup
+            tips={I18n.getLang('groups_settings_power_on_behavior_secondbox_topic')}
+            selected={state.powerMemory.type}
+            options={[{
+              title: I18n.getLang('groups_settings_power_on_behavior_secondbox_status_value1_topic'),
+              content: I18n.getLang('groups_settings_power_on_behavior_secondbox_status_value1_description'),
+              value: PowerMemoryMode.Default,
+              onPress: (value) => {
+                state.powerMemory.type = value
+                setPowerMemory(state.powerMemory).then()
+              }
+            }, {
+              title: I18n.getLang('groups_settings_power_on_behavior_secondbox_status_value2_topic'),
+              content: I18n.getLang('groups_settings_power_on_behavior_secondbox_status_value2_description'),
+              value: PowerMemoryMode.Last,
+              onPress: (value) => {
+                state.powerMemory.type = value
+                setPowerMemory(state.powerMemory).then()
+              }
+            }, {
+              title: I18n.getLang('groups_settings_power_on_behavior_secondbox_status_value3_topic'),
+              content: I18n.getLang('groups_settings_power_on_behavior_secondbox_status_value3_description'),
+              value: PowerMemoryMode.Custom,
+              onPress: (value) => {
+                state.powerMemory.type = value
+                setPowerMemory(state.powerMemory).then()
+              }
+            }]} />
           <Spacer />
           {state.powerMemory.type === PowerMemoryMode.Custom &&
               <Card style={{ marginHorizontal: cx(24) }}>
@@ -234,36 +183,4 @@ const LightBehaviorPage = (props: { theme?: ThemeType }) => {
   )
 }
 
-interface PowerOnBehaviorModeItemProps extends PropsWithChildren<ViewProps> {
-  onPress: () => void
-  title: string
-  content: string
-  enable: boolean
-  styles: StyleSheet.NamedStyles<any>
-}
-
-function PowerOnBehaviorModeItem(props: PowerOnBehaviorModeItemProps) {
-  const { styles } = props
-  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={{
-            width: cx(32),
-            height: cx(32),
-            marginEnd: cx(4),
-            display: props.enable ? 'flex' : 'none',
-          }}
-        />
-      </View>
-    </TouchableOpacity>
-  )
-}
-
 export default withTheme(LightBehaviorPage)