@ledvance/ui-biz-bundle 1.1.159 → 1.1.160

package/package.json

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

package/src/newModules/energyConsumption/EnergyConsumptionPage.tsx

@@ -364,7 +364,7 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
       style={{ position: 'relative' }}
       backText={backTitle}
       headlineText={backTitle}
-      headlineIcon={res.ic_refresh}
+      headlineIcon={res.ic_reset_energy}
       onHeadlineIconClick={() => {
         showDialog({
           method: 'confirm',

package/src/newModules/timeSchedule/Interface.ts

@@ -1,5 +1,5 @@
 import I18n from "@ledvance/base/src/i18n";
-import { AdjustType, ApplyForItem, DiySceneInfo } from "@ledvance/base/src/utils/interface";
+import {AdjustType, AlarmState, ApplyForItem, DiySceneInfo} from "@ledvance/base/src/utils/interface";
 import { MoodInfo, MoodUIInfo } from "../mood/Interface";
 
 export interface Timer {
@@ -36,6 +36,7 @@ interface judgmentSupport {
   isFanLight?: boolean;
   isUVCFan?: boolean;
   isMoodStrip?: boolean;
+  isSiren?: boolean;
 }
 
 export interface ManualSettingProps extends judgmentSupport {
@@ -57,7 +58,8 @@ export enum DeviceType {
   FanLight = 'fanLight',
   MoodStrip = 'moodStrip',
   Shutter = 'shutter',
-  OsramFanLight = 'osramFanLight'
+  OsramFanLight = 'osramFanLight',
+  Siren = 'Siren'
 }
 // export type DeviceType = 'LightSource' | 'CeilingLight' | 'StringLight' | 'StripLight' | 'MixLight';
 
@@ -106,6 +108,10 @@ export interface OsramFanLightData extends DeviceData {
   fanSpeed: number
 }
 
+export interface SirenData extends DeviceData {
+  alarmState: AlarmState
+}
+
 export type ComponentConfig =
   | { type: DeviceType.LightSource; deviceData: DeviceData }
   | { type: DeviceType.MixLight; deviceData: MixLightData }
@@ -116,6 +122,7 @@ export type ComponentConfig =
   | { type: DeviceType.MoodStrip; deviceData: MoodStripData}
   | { type: DeviceType.Shutter; deviceData: ShutterData}
   | { type: DeviceType.OsramFanLight; deviceData: OsramFanLightData}
+  | { type: DeviceType.Siren; deviceData: SirenData}
 
 export interface TimeScheduleDetailState {
   timeSchedule: Timer;
@@ -142,6 +149,11 @@ export interface DeviceStateType {
   isManual: boolean
 }
 
+export interface SuggestItem {
+  name: string;
+  suggestValue: boolean | undefined;
+}
+
 export const directOptions = [
   {label: I18n.getLang('ceiling_fan_tile_uvc_fan_direction_opt_1'), value: 'forward'},
   {label: I18n.getLang('ceiling_fan_tile_uvc_fan_direction_opt_2'), value: 'reverse'}

package/src/newModules/timeSchedule/TimeScheduleActions.ts

@@ -1,8 +1,8 @@
 import { NativeApi } from '@ledvance/base/src/api/native';
-import { Timer, TimerActions } from './Interface';
+import { Timer, TimerActions} from './Interface';
 import { parseJSON } from '@tuya/tuya-panel-lamp-sdk/lib/utils';
 import { ColorList } from '@ledvance/base/src/components/StripAdjustView';
-import {AdjustType} from "@ledvance/base/src/utils/interface";
+import {AdjustType, AlarmState} from "@ledvance/base/src/utils/interface";
 import { TimeScheduleDetailPageParams } from './TimeScheduleDetailPage'
 
 export const defDeviceData = {
@@ -45,6 +45,16 @@ export const defShutterDeviceData = (props: TimeScheduleDetailPageParams) => {
   }
 };
 
+export const defSirenDeviceData = (props: TimeScheduleDetailPageParams) => {
+  return {
+    alarmState: props.suggestValue === undefined
+      ? AlarmState.AlarmSound
+      : props.suggestValue
+        ? AlarmState.AlarmLight
+        : AlarmState.AlarmSoundAndLight
+  }
+};
+
 export const defOsramFanLightDeviceData = {
   ...defDeviceData,
   fanSpeed: 1,

package/src/newModules/timeSchedule/TimeScheduleAddPage.tsx

@@ -14,6 +14,16 @@ import { TimeScheduleDetailPageParams } from './TimeScheduleDetailPage'
 
 const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
+const DEFAULT_SUGGEST_ITEMS = [
+  {
+    name: I18n.getLang('timeschedule_on'),
+    suggestValue: true,
+  },
+  {
+    name: I18n.getLang('timeschedule_off'),
+    suggestValue: false,
+  },
+]
 
 interface TimeScheduleAddProps {
   theme?: ThemeType
@@ -21,6 +31,8 @@ interface TimeScheduleAddProps {
 
 const TimeScheduleAddPage = (props: TimeScheduleAddProps) => {
   const params = useParams<TimeScheduleDetailPageParams>()
+  const suggestItems = params.suggestList ?? DEFAULT_SUGGEST_ITEMS
+
   const navigation = useNavigation()
   const state = useReactive({
     loading: false,
@@ -55,14 +67,16 @@ const TimeScheduleAddPage = (props: TimeScheduleAddProps) => {
         <Card style={styles.card} onPress={() => nextPage()}>
           <Text style={styles.text}>{I18n.getLang('timeschedule_own')}</Text>
         </Card>
-        <Spacer/>
-        <Card style={styles.card} onPress={() => nextPage(true)}>
-          <Text style={styles.text}>{I18n.getLang('timeschedule_on')}</Text>
-        </Card>
-        <Spacer/>
-        <Card style={styles.card} onPress={() => nextPage(false)}>
-          <Text style={styles.text}>{I18n.getLang('timeschedule_off')}</Text>
-        </Card>
+        {suggestItems.map((item) => {
+          return (
+            <View key={item.name}>
+              <Spacer/>
+              <Card style={styles.card} onPress={() => nextPage(item.suggestValue)}>
+                <Text style={styles.text}>{item.name}</Text>
+              </Card>
+            </View>
+          )
+        })}
       </View>
     </Page>
   )

package/src/newModules/timeSchedule/TimeScheduleDetailPage.tsx

@@ -15,7 +15,7 @@ import { useDeviceId, useMoods, useSystemTimeFormate, } from '@ledvance/base/src
 import { Result } from '@ledvance/base/src/models/modules/Result'
 import res from '@ledvance/base/src/res'
 import { convertTo12HourFormat, loopText, showDialog } from '@ledvance/base/src/utils/common'
-import { ApplyForItem, DiySceneInfo } from '@ledvance/base/src/utils/interface'
+import {AlarmState, ApplyForItem, DiySceneInfo} from '@ledvance/base/src/utils/interface'
 import { ui_biz_routerKey } from '../../navigation/Routers'
 import { useNavigation } from '@react-navigation/core'
 import { useReactive } from 'ahooks'
@@ -27,14 +27,14 @@ import { MoodInfo, MoodUIInfo } from '../mood/Interface'
 import { getRemoteMoodList } from '../mood/MoodActions'
 import MoodItem from '../mood/MoodItem'
 import ManualSettings from './components/ManuaSettings'
-import { ComponentConfig, DeviceType, Timer, TimerActions, TimeScheduleDetailState, } from './Interface'
+import {ComponentConfig, DeviceType, SirenData, Timer, TimerActions, TimeScheduleDetailState,} from './Interface'
 import {
   defDeviceData,
   defFanLightDeviceData,
   defMixDeviceData,
   defMoodStripDeviceData,
   defOsramFanLightDeviceData,
-  defShutterDeviceData,
+  defShutterDeviceData, defSirenDeviceData,
   defStripDeviceData
 } from './TimeScheduleActions'
 import { TimeSchedulePageParams } from './TimeSchedulePage'
@@ -238,6 +238,14 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
     return params.isCeilingLight ? ((item.mainLamp.id === (state.mood as MoodInfo)?.mainLamp?.id) && (item.secondaryLamp.id === (state.mood as MoodInfo)?.secondaryLamp?.id)) : item.id === state.mood?.id
   }, [state.mood, params.isCeilingLight])
 
+  const alarmStateValueMap = useMemo(() => {
+    return {
+      [AlarmState.AlarmSound]: I18n.getLang('siren_alarm_type_sound'),
+      [AlarmState.AlarmLight]: I18n.getLang('siren_alarm_type_light'),
+      [AlarmState.AlarmSoundAndLight]: I18n.getLang('siren_alarm_type_sound_light'),
+    }
+  }, [])
+
   const renderSkillGroup = (skills: ApplyForItem[], i18nString: string) => {
     if (!skills.length) return null;
 
@@ -263,6 +271,31 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
     );
   };
 
+  const renderSirenSkillGroup = (skills: ApplyForItem[]) => {
+    if (!skills.length) return null;
+    return (
+      <>
+        {skills.map(item => (
+          <View key={item.dp}>
+            <Text style={{fontSize: cx(14), color: props.theme?.global.fontColor}}>
+              {item.key}
+            </Text>
+            <View style={{flexDirection: 'row', flexWrap: 'wrap'}}>
+              <View
+                style={[
+                  styles.summaryRight,
+                  {marginRight: cx(5), marginBottom: cx(5)},
+                ]}
+              >
+                <Text
+                  style={styles.rightItem}>{alarmStateValueMap[(state.manualData.deviceData as SirenData).alarmState]}</Text>
+              </View>
+            </View>
+          </View>))}
+      </>
+    );
+  };
+
   const styles = StyleSheet.create({
     cardContainer: {
       marginHorizontal: cx(24),
@@ -629,8 +662,9 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
               {state.isManual ? (
                 state.selectedSkill.length ? (
                   <>
-                    {renderSkillGroup(state.selectedSkill.filter(skill => skill.enable), I18n.getLang(params.isShutter ? 'curtain_summary_action_txt_1' : 'feature_summary_action_txt_1'))}
-                    {renderSkillGroup(state.selectedSkill.filter(skill => !skill.enable), I18n.getLang(params.isShutter ? 'curtain_summary_action_txt_2' : 'feature_summary_action_txt_2'))}
+                    {!params.isSiren && renderSkillGroup(state.selectedSkill.filter(skill => skill.enable), I18n.getLang(params.isShutter ? 'curtain_summary_action_txt_1' : 'feature_summary_action_txt_1'))}
+                    {!params.isSiren && renderSkillGroup(state.selectedSkill.filter(skill => !skill.enable), I18n.getLang(params.isShutter ? 'curtain_summary_action_txt_2' : 'feature_summary_action_txt_2'))}
+                    {params.isSiren && renderSirenSkillGroup(state.selectedSkill)}
                   </>
                 ) : null
               ) : (
@@ -698,7 +732,8 @@ const getDefaultManual = (props: TimeScheduleDetailPageParams): ComponentConfig
     isCeilingLight: DeviceType.CeilingLight,
     isMoodStrip: DeviceType.MoodStrip,
     isShutter: DeviceType.Shutter,
-    isOsramFanLight: DeviceType.OsramFanLight
+    isOsramFanLight: DeviceType.OsramFanLight,
+    isSiren: DeviceType.Siren
   };
 
   const deviceType = Object.entries(deviceTypeMap)
@@ -716,6 +751,7 @@ const getDefaultManual = (props: TimeScheduleDetailPageParams): ComponentConfig
     [DeviceType.PowerStrip]: defDeviceData,
     [DeviceType.LightSource]: defDeviceData,
     [DeviceType.Plug]: defDeviceData,
+    [DeviceType.Siren]: defSirenDeviceData(props),
   };
 
   return {

package/src/newModules/timeSchedule/TimeSchedulePage.tsx

@@ -14,7 +14,7 @@ import Spacer from '@ledvance/base/src/components/Spacer';
 import InfoText from '@ledvance/base/src/components/InfoText';
 import DeleteButton from '@ledvance/base/src/components/DeleteButton';
 import { useReactive, useUpdateEffect } from 'ahooks';
-import { DeviceStateType, Timer, TimerActions } from './Interface';
+import {DeviceStateType, SuggestItem, Timer, TimerActions} from './Interface';
 import { getTimeSchedule, manageTimeSchedule } from './TimeScheduleActions';
 import { useParams } from '@ledvance/base/src/hooks/Hooks';
 import ScheduleCard from './components/ScheduleCard';
@@ -46,8 +46,11 @@ export interface TimeSchedulePageParams {
   isMoodStrip?: boolean
   isShutter?: boolean
   isOsramFan?: boolean
+  isSiren?: boolean
+  showPresets?: boolean
   featureId?: string
   applyForList: ApplyForItem[];
+  suggestList?: SuggestItem[];
   applyForDisabled?: boolean; // 是否可以选择apply for
   manualDataDp2Obj: (dps: Record<string, any>) => DeviceStateType;
   manualDataObj2Dp: (deviceState: DeviceStateType, applyForList: ApplyForItem[]) => Record<string, any>;
@@ -130,7 +133,8 @@ const TimeSchedulePage = (props: { theme?: ThemeType }) => {
   };
 
   const navigateToEdit = useCallback((mode: 'add' | 'update', timeSchedule?: Timer) => {
-    const path = mode === 'add' ? ui_biz_routerKey.ui_biz_time_schedule_add_new : ui_biz_routerKey.ui_biz_time_schedule_edit_new;
+    const {showPresets = true} = params;
+    const path = mode === 'add' && showPresets ? ui_biz_routerKey.ui_biz_time_schedule_add_new : ui_biz_routerKey.ui_biz_time_schedule_edit_new;
     navigation.navigate(path, {
       mode,
       name: path,

package/src/newModules/timeSchedule/components/AlarmModeItem.tsx

@@ -0,0 +1,54 @@
+import React from "react";
+import {Utils} from 'tuya-panel-kit';
+import ThemeType from '@ledvance/base/src/config/themeType'
+import OptionGroup from "@ledvance/base/src/components/OptionGroup";
+import I18n from "@ledvance/base/src/i18n";
+import {useReactive} from "ahooks";
+import {AlarmState} from "@ledvance/base/src/utils/interface";
+
+const {withTheme} = Utils.ThemeUtils
+
+interface AlarmModeItemProps {
+  theme?: ThemeType
+  name: string
+  alarmState: AlarmState
+  onAlarmStateChange: (alarmState: AlarmState) => void
+}
+
+const AlarmModeItem = (props: AlarmModeItemProps) => {
+  const {name, alarmState, onAlarmStateChange} = props;
+  const state = useReactive({
+    alarmState: alarmState,
+  });
+  return (
+    <OptionGroup
+      tips={name}
+      selected={state.alarmState}
+      options={[{
+        title: I18n.getLang('siren_alarm_type_sound'),
+        value: AlarmState.AlarmSound,
+        onPress: (value) => {
+          state.alarmState = value
+          onAlarmStateChange(value)
+        }
+      }, {
+        title: I18n.getLang('siren_alarm_type_light'),
+        value: AlarmState.AlarmLight,
+        onPress: (value) => {
+          state.alarmState = value
+          onAlarmStateChange(value)
+        }
+      }, {
+        title: I18n.getLang('siren_alarm_type_sound_light'),
+        value: AlarmState.AlarmSoundAndLight,
+        onPress: (value) => {
+          state.alarmState = value
+          onAlarmStateChange(value)
+        }
+      }]}
+    />
+  )
+
+}
+
+export default withTheme(AlarmModeItem) as React.ComponentType<AlarmModeItemProps>

package/src/newModules/timeSchedule/components/ManuaSettings.tsx

@@ -6,7 +6,7 @@ import {
   ManualSettingProps,
   modeOptions,
   OsramFanLightData,
-  ShutterData,
+  ShutterData, SirenData,
   StripLightData
 } from '../Interface';
 import { View, Text, } from 'react-native';
@@ -28,6 +28,7 @@ import { hsv2Hex, mapFloatToRange } from '@ledvance/base/src/utils';
 import { AdjustType, ApplyForItem } from "@ledvance/base/src/utils/interface";
 import LdvSlider from '@ledvance/base/src/components/ldvSlider';
 import OsramFanAdjustView from '@ledvance/base/src/components/OsramFanAdjustView'
+import AlarmModeItem from "./AlarmModeItem";
 
 const { convertX: cx } = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
@@ -524,7 +525,7 @@ function ManualSettings(props: ManualSettingProps) {
       <Card style={{ marginHorizontal: cx(24) }}>
         <Spacer height={cx(16)} />
         <LdvSlider
-          title={'Curtain'}
+          title={I18n.getLang('curtain_control_headline_text')}
           value={(state.deviceData as ShutterData).percentControl}
           min={0}
           max={100}
@@ -544,22 +545,37 @@ function ManualSettings(props: ManualSettingProps) {
     )
   }, [state.deviceData, state.applyForList, props.theme?.type])
 
-  const componentRender = useMemo(() => {
-    const component =
-      props.manualData.type === DeviceType.MixLight
-        ? mixLightCard
-        : props.manualData.type === DeviceType.StripLight
-          ? stripLightCard
-          : props.manualData.type === DeviceType.CeilingLight
-            ? ceilingLightCard
-            : props.manualData.type === DeviceType.PowerStrip
-              ? powerStripCard
-              : props.manualData.type === DeviceType.Shutter
-                ? shutterCard
-                : lightSourceCard;
-    return component;
-  }, [props.manualData, state.applyForList, state.deviceData, props.theme?.type]);
+  const sirenCard = useMemo(() => {
+    return (
+      <View>
+        {state.applyForList.map((item, idx) => (
+          <View key={item.dp}>
+            <AlarmModeItem
+              name={item.name!}
+              alarmState={(state.deviceData as SirenData).alarmState}
+              onAlarmStateChange={async (alarmState) => {
+                (state.deviceData as SirenData).alarmState = alarmState
+                state.manualFlag = Symbol()
+              }}
+            />
+            <Spacer />
+          </View>
+        ))}
+      </View>
+    )
+  }, [state.deviceData, state.applyForList, props.theme?.type])
+
+  const componentMap = {
+    [DeviceType.MixLight]: mixLightCard,
+    [DeviceType.StripLight]: stripLightCard,
+    [DeviceType.CeilingLight]: ceilingLightCard,
+    [DeviceType.PowerStrip]: powerStripCard,
+    [DeviceType.Shutter]: shutterCard,
+    [DeviceType.Siren]: sirenCard,
+  };
 
+  const componentRender =
+    componentMap[props.manualData.type] ?? lightSourceCard;
 
   return <View>{componentRender}</View>;
 }