@ledvance/ui-biz-bundle 1.1.65 → 1.1.66

package/src/newModules/mood/MoodItem.tsx

@@ -7,27 +7,39 @@ import { mapFloatToRange } from '@ledvance/base/src/utils';
 import Card from '@ledvance/base/src/components/Card';
 import Spacer from '@ledvance/base/src/components/Spacer';
 import MoodColorsLine from '@ledvance/base/src/components/MoodColorsLine';
-import { MoodLampInfo, MoodUIInfo } from './Interface';
+import { MoodJumpGradientMode, MoodLampInfo, MoodUIInfo } from './Interface';
 import I18n from '@ledvance/base/src/i18n';
 import res from '@ledvance/base/src/res';
 
 const cx = Utils.RatioUtils.convertX;
 
+interface LightCategory {
+  isMixLight?: boolean
+  isStripLight?: boolean
+  isStringLight?: boolean
+  isCeilingLight?: boolean
+}
+
 interface MoodItemProps extends ViewProps {
   enable: boolean;
   isMix: boolean;
   mood: MoodUIInfo;
   style?: ViewStyle;
+  deviceTypeOption?: LightCategory
   onPress?: () => void;
   onSwitch: (enable: boolean) => void;
 }
 
 const MoodItem = (props: MoodItemProps) => {
-  const { mood, isMix } = props;
+  const { mood, isMix, deviceTypeOption } = props;
   const isDynamic = useMemo(() => {
     return mood.mainLamp.nodes?.length > 1 || mood.secondaryLamp.nodes?.length > 1;
   }, [mood.mainLamp.nodes, mood.secondaryLamp.nodes]);
 
+  const gradientMode = useMemo(() => (
+    deviceTypeOption?.isStringLight ? MoodJumpGradientMode.StringGradient : (deviceTypeOption?.isStripLight || deviceTypeOption?.isCeilingLight) ? MoodJumpGradientMode.StripGradient : MoodJumpGradientMode.SourceGradient
+ ), [MoodJumpGradientMode, deviceTypeOption])
+
   return (
     <Card style={[styles.card, props.style]} onPress={props.onPress}>
       <View>
@@ -41,11 +53,11 @@ const MoodItem = (props: MoodItemProps) => {
           />
         </View>
         <Spacer />
-        <MixMoodColorsLine mixSubLight={mood.mainLamp} isMix={isMix} />
-        {isMix && (
+        <MixMoodColorsLine mixSubLight={mood.mainLamp} isMix={isMix} type={mood.mainLamp.mode === gradientMode ? 'gradient' : 'separate'}/>
+        {(isMix && !!mood.secondaryLamp.nodes.length) &&  (
           <>
             <Spacer height={cx(7)} />
-            <MixMoodColorsLine mixSubLight={mood.secondaryLamp} isMix={isMix} />
+            <MixMoodColorsLine mixSubLight={mood.secondaryLamp} isMix={isMix} type={mood.secondaryLamp.mode === gradientMode ? 'gradient' : 'separate'}/>
           </>
         )}
         <Spacer height={cx(12)} />
@@ -66,7 +78,7 @@ const MoodItem = (props: MoodItemProps) => {
 
 export default MoodItem;
 
-export function MixMoodColorsLine(props: { mixSubLight: MoodLampInfo; isMix: boolean }) {
+export function MixMoodColorsLine(props: { mixSubLight: MoodLampInfo; isMix: boolean, type: 'gradient' | 'separate' }) {
   const { mixSubLight, isMix } = props;
   const lightColors = !!(mixSubLight.enable && mixSubLight.nodes.length) ? mixSubLight.nodes?.map(n => {
     return n.isColorNode
@@ -79,7 +91,7 @@ export function MixMoodColorsLine(props: { mixSubLight: MoodLampInfo; isMix: boo
       <MoodColorsLine
         nodeStyle={{ borderColor: '#ccc', borderWidth: 1 }}
         width={isMix ? cx(264) : undefined}
-        type={'separate'}
+        type={props.type}
         colors={lightColors}
       />
       {isMix && (

package/src/newModules/mood/MoodPage.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect } from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
 import Page from '@ledvance/base/src/components/Page';
 import { Utils } from 'tuya-panel-kit';
 import { saveMoodList, useWorkMode } from './MoodActions';
@@ -21,8 +21,8 @@ import { useNavigation } from '@react-navigation/core';
 import { MoodPageParams, MoodPageState, MoodUIInfo } from './Interface';
 import { getRemoteMoodList, useMoodScene } from './MoodActions';
 import { useParams } from '@ledvance/base/src/hooks/Hooks';
-import { RouterKey } from 'navigation/Router';
-import { cloneDeep } from 'lodash';
+import { ui_biz_routerKey } from '../../navigation/Routers'
+import { cloneDeep, filter, map } from 'lodash';
 import { saveFlagMode } from '@ledvance/ui-biz-bundle/src/modules/flags/FlagActions';
 import { WorkMode } from '@ledvance/base/src/utils/interface';
 
@@ -35,16 +35,7 @@ const MoodPage = () => {
   const deviceInfo = useDeviceInfo();
   const devId = useDeviceId();
   const navigation = useNavigation();
-  const option = {
-    isCeilingLight: params.isCeilingLight,
-    isStripLight: params.isStripLight,
-    isStringLight: params.isStringLight,
-    isFanLight: params.isFanLight,
-    isMixLight: params.isMixLight,
-    isUVCFan: params.isUVCFan,
-    isMatterLight: params.isMatterLight,
-  };
-  const [moodInfo, setMoodInfo] = useMoodScene(params.mainDp, option, params.secondaryDp);
+  const [moodInfo, setMoodInfo] = useMoodScene(params);
   const [moods, setMoods] = useMoods();
   const [mainWork, setMainWork] = useWorkMode(params.mainWorkMode);
   const [secondaryWork, setSecondaryWork] = useWorkMode(params.secondaryWorkMode!);
@@ -60,23 +51,28 @@ const MoodPage = () => {
     timerId: undefined as any,
     flag: Symbol(),
   });
+
+  const moodIds = useMemo(() => {
+    const mainIds = map(state.originMoods, 'id').filter(v => v !== undefined)
+    const secondaryIds = map(state.originMoods.map(m => m.secondaryLamp) || [], 'id')
+    return filter([...mainIds, ...secondaryIds], v => v !== undefined) as number[]
+  }, [JSON.stringify(state.originMoods)])
+  
   useEffect(() => {
+    state.loading = true 
     state.timerId = setTimeout(() => {
       getRemoteMoodList(
         devId,
-        {
-          ...option,
-          isSupportBrightness: params.isSupportBrightness,
-          isSupportColor: params.isSupportColor,
-          isSupportTemperature: params.isSupportTemperature,
-        },
+        params,
         params.featureId
       ).then(res => {
+        state.loading = false 
         if (res.success && Array.isArray(res.data)) {
+          console.log(res.data, '< --- res.data')
           state.originMoods = cloneDeep(res.data);
         }
       });
-    }, 400);
+    }, 250);
 
     return () => {
       clearTimeout(state.timerId);
@@ -98,18 +94,19 @@ const MoodPage = () => {
   const navigationRoute = (isStatic: boolean, mode: 'add' | 'edit', currentMood?: MoodUIInfo) => {
     const path =
       mode === 'add'
-        ? RouterKey.ui_biz_mood_add
+        ? ui_biz_routerKey.ui_biz_mood_add
         : isStatic
-        ? RouterKey.ui_biz_static_mood_edit
+        ? ui_biz_routerKey.ui_biz_static_mood_edit
         : !!(params.isMixLight || params.isCeilingLight)
-        ? RouterKey.ui_biz_dynamic_mix_mood_edit
-        : RouterKey.ui_biz_dynamic_mood_edit;
+        ? ui_biz_routerKey.ui_biz_dynamic_mix_mood_edit
+        : ui_biz_routerKey.ui_biz_dynamic_mood_edit;
     navigation.navigate(path, {
       mode,
       isStatic,
-      moods: state.originMoods,
       currentMood,
       moduleParams: params,
+      moodIds,
+      nameRepeat,
       modDeleteMood,
     });
   };
@@ -139,7 +136,7 @@ const MoodPage = () => {
       },
       secondaryLamp: {
         ...currentMood.secondaryLamp,
-        nodes: currentMood.secondaryLamp
+        nodes: currentMood.secondaryLamp && currentMood.secondaryLamp.nodes?.length
           ? currentMood.secondaryLamp.nodes.map(node => {
               if (mode !== 'del') {
                 if (node.isColorNode) {
@@ -161,7 +158,7 @@ const MoodPage = () => {
       },
     };
     if (mode === 'set') {
-      return setMoodInfo(checkedMood, params);
+      return setMoodInfo(checkedMood);
     }
     let newScene: MoodUIInfo[] = [];
     if (mode === 'add') {
@@ -177,7 +174,7 @@ const MoodPage = () => {
       });
     }
     const mood = mode === 'del' ? (newScene.length === 0 ? undefined : newScene[0]) : checkedMood;
-    const res = await saveMoodList(devId, newScene, option, params.featureId);
+    const res = await saveMoodList(devId, newScene, params, params.featureId);
     if (res.success) {
       state.originMoods = cloneDeep(newScene);
       setMoods(cloneDeep(newScene));
@@ -196,7 +193,7 @@ const MoodPage = () => {
             };
           }
         }
-        setMoodInfo(mood, params).then();
+        setMoodInfo(mood).then();
       } else {
         if (mainWork === WorkMode.Scene) {
           if (params.isCeilingLight) {
@@ -255,7 +252,7 @@ const MoodPage = () => {
 
   const getItemEnable = useCallback(
     (moodItem: MoodUIInfo) => {
-      if (option.isCeilingLight) {
+      if (params.isCeilingLight) {
         return (
           moodInfo.mainLamp.id === moodItem.mainLamp.id &&
           moodInfo.secondaryLamp.id === moodItem.secondaryLamp.id &&
@@ -268,6 +265,10 @@ const MoodPage = () => {
     [moodInfo, mainWork]
   );
 
+  const nameRepeat = useCallback((mood: MoodUIInfo) => {
+    return !!state.originMoods.filter(m => !(params.isCeilingLight ? (m.mainLamp.id === mood.mainLamp.id && m.secondaryLamp.id === mood.secondaryLamp.id) : (m.id === mood.id))).find(m => m.name === mood.name)
+  }, [state.originMoods, params.isCeilingLight])
+
   return (
     <>
       <Page

package/src/newModules/mood/MoodParse.ts

@@ -6,7 +6,8 @@ const { nToHS, toFixed, sToN } = Utils;
 
 // light source
 export function dp2Obj(dp: string, isFan: boolean = false, isUVCFan?: boolean): MoodInfo {
-  if (!dp) return getDefaultMood();
+  console.log(dp, '< ---- dppppp')
+  if (!dp || dp?.length <= 8) return getDefaultMood();
   let dpCopy = dp;
   let fanEnable: undefined | boolean = undefined;
   let fanSpeed: undefined | number = undefined;

package/src/newModules/mood/RecommendMoodItem.tsx

@@ -1,23 +1,35 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { Utils } from 'tuya-panel-kit';
 import Card from '@ledvance/base/src/components/Card';
 import { CellContent } from '@ledvance/base/src/components/Cell';
 import { StyleSheet, View } from 'react-native';
 import Spacer from '@ledvance/base/src/components/Spacer';
-import { MoodUIInfo } from './Interface';
+import { MoodJumpGradientMode, MoodUIInfo } from './Interface';
 import { MixMoodColorsLine } from './MoodItem';
 
 const cx = Utils.RatioUtils.convertX;
 
+interface LightCategory {
+  isMixLight?: boolean
+  isStripLight?: boolean
+  isStringLight?: boolean
+  isCeilingLight?: boolean
+}
+
 interface RecommendMixMoodItemProps {
   title: string;
   isMix: boolean;
   mood: MoodUIInfo;
+  deviceTypeOption?: LightCategory
   onPress: () => void;
 }
 
 const RecommendMixMoodItem = (props: RecommendMixMoodItemProps) => {
-  const { mood, isMix } = props;
+  const { mood, isMix, deviceTypeOption } = props;
+
+  const gradientMode = useMemo(() => (
+    deviceTypeOption?.isStringLight ? MoodJumpGradientMode.StringGradient : (deviceTypeOption?.isStripLight || deviceTypeOption?.isCeilingLight) ? MoodJumpGradientMode.StripGradient : MoodJumpGradientMode.SourceGradient
+ ), [MoodJumpGradientMode, deviceTypeOption])
 
   return (
     <Card style={styles.root} onPress={props.onPress}>
@@ -34,9 +46,9 @@ const RecommendMixMoodItem = (props: RecommendMixMoodItemProps) => {
       {!!(mood.mainLamp) && (
         <>
           <View style={styles.lineStyle}>
-            <MixMoodColorsLine mixSubLight={mood?.mainLamp} isMix={isMix} />
+            <MixMoodColorsLine mixSubLight={mood?.mainLamp} isMix={isMix} type={mood.mainLamp.mode === gradientMode ? 'gradient' : 'separate'}/>
             <Spacer height={cx(7)} />
-            {isMix && <MixMoodColorsLine mixSubLight={mood.secondaryLamp} isMix={isMix} />}
+            {(isMix && !!mood.secondaryLamp.nodes.length) && <MixMoodColorsLine mixSubLight={mood.secondaryLamp} isMix={isMix} type={mood.secondaryLamp.mode === gradientMode ? 'gradient' : 'separate'}/>}
           </View>
           <Spacer height={cx(24)} />
         </>
@@ -54,6 +66,7 @@ const styles = StyleSheet.create({
   content: {
     height: cx(56),
     marginHorizontal: cx(16),
+    width: cx(295)
   },
   title: {
     color: '#000',

package/src/newModules/mood/Router.ts

@@ -1,9 +1,8 @@
-import {NavigationRoute, TransitionPresets} from "tuya-panel-kit";
-import DynamicMoodEditorPage from "../../modules/mood/DynamicMoodEditorPage";
-import StaticMoodEditorPage from "../../modules/mood/StaticMoodEditorPage";
-import AddMoodPage from "../../modules/mood/AddMoodPage";
-import MoodPage from "../../modules/mood/MoodPage";
-import SelectPage from "../../modules/select/SelectPage";
+import {NavigationRoute} from "tuya-panel-kit";
+import DynamicMoodEditorPage from "./DynamicMoodEditorPage";
+import StaticMoodEditorPage from "./StaticMoodEditorPage";
+import AddMoodPage from "./AddMoodPage";
+import MoodPage from "./MoodPage";
 import {ui_biz_routerKey} from "../../navigation/Routers";
 
 const MoodPageRouters: NavigationRoute[] = [
@@ -38,16 +37,7 @@ const MoodPageRouters: NavigationRoute[] = [
       hideTopbar: true,
       showOfflineView: false,
     },
-  },
-  {
-    name: ui_biz_routerKey.ui_biz_select_page,
-    component: SelectPage,
-    options: {
-      gesture: true,
-      hideTopbar: true,
-      ...TransitionPresets.ModalPresentationIOS,
-    },
-  },
+  }
 ]
 
 export default MoodPageRouters

package/src/newModules/mood/StaticMoodEditorPage.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useMemo } from 'react';
 import { ScrollView, StyleSheet, View } from 'react-native';
-import { cloneDeep, find, isEqual } from 'lodash';
+import { cloneDeep, isEqual } from 'lodash';
 import { useReactive } from 'ahooks';
 import Page from '@ledvance/base/src/components/Page';
 import I18n from '@ledvance/base/src/i18n';
@@ -12,26 +12,24 @@ import Spacer from '@ledvance/base/src/components/Spacer';
 import res from '@ledvance/base/src/res';
 import TextButton from '@ledvance/base/src/components/TextButton';
 import { useFanMaxSpeed } from '@ledvance/base/src/models/modules/NativePropsSlice';
-import LampAdjustView from '@ledvance/base/src/components/LampAdjustView';
 import FanAdjustView from '@ledvance/base/src/components/FanAdjustView';
-import { showDeleteMoodDialog } from './tools';
 import { MoodNodeInfo, MoodPageParams, MoodUIInfo } from './Interface';
 import { Result } from '@ledvance/base/src/models/modules/Result';
 import { hsv2Hex, mapFloatToRange } from '@ledvance/base/src/utils';
 import { cctToColor } from '@ledvance/base/src/utils/cctUtils';
 import { useParams } from '@ledvance/base/src/hooks/Hooks';
-import ColorAdjustView from '@ledvance/base/src/components/ColorAdjustView';
-import { RouterKey } from 'navigation/Router';
+import LampAdjustView2 from '@ledvance/base/src/components/LampAdjustView2';
+import { ui_biz_routerKey } from '../../navigation/Routers'
 import LdvSwitch from '@ledvance/base/src/components/ldvSwitch';
+import { showDialog } from '@ledvance/base/src/utils/common';
 
 const cx = Utils.RatioUtils.convertX;
 
 export interface StaticMoodEditorPageParams {
   mode: 'add' | 'edit';
-  moods: MoodUIInfo[];
   currentMood: MoodUIInfo;
-  onSave: () => void;
   moduleParams: MoodPageParams;
+  nameRepeat: (mood: MoodUIInfo) => boolean
   modDeleteMood: (mode: 'add' | 'edit' | 'del', currentMood: MoodUIInfo) => Promise<Result<any>>;
 }
 
@@ -53,7 +51,7 @@ const StaticMoodEditorPage = () => {
     headline: '',
     mood: params.currentMood,
     mainNode: params.currentMood.mainLamp.nodes[0],
-    secondaryNode: params.currentMood?.secondaryLamp?.nodes[0],
+    secondaryNode: params.currentMood?.secondaryLamp?.nodes?.[0],
     loading: false,
   });
   
@@ -73,10 +71,7 @@ const StaticMoodEditorPage = () => {
   }, []);
 
   const onRightClick = async () => {
-    if (getButtonStatus()) {
-      return
-    }
-    if (state.loading) return;
+    if (state.loading || !canSaveMoodData) return;
     state.loading = true;
     const newMood: MoodUIInfo = {
       ...state.mood,
@@ -84,8 +79,12 @@ const StaticMoodEditorPage = () => {
         ...state.mood.mainLamp,
         nodes: [cloneDeep(state.mainNode)],
       },
+      secondaryLamp: {
+        ...state.mood.secondaryLamp,
+        id: undefined
+      }
     };
-    if (isMix) {
+    if (isMix && moduleParams.isMixLight) {
       newMood.secondaryLamp = {
         ...newMood.secondaryLamp,
         nodes: [cloneDeep(state.secondaryNode)],
@@ -101,37 +100,26 @@ const StaticMoodEditorPage = () => {
     const res = await params.modDeleteMood(params.mode, newMood);
     state.loading = false;
     if (res.success) {
-      navigation.navigate(RouterKey.ui_biz_mood);
+      navigation.navigate(ui_biz_routerKey.ui_biz_mood);
     }
   };
 
-  const getButtonStatus = () => {
-    return (
-      (params.mode === 'edit' && isEqual(state.mood, params.currentMood)) ||
-      !state.mood.name ||
-      nameRepeat ||
-      state.mood.name.length > 32
-    );
-  };
-
   const nameRepeat = useMemo(() => {
-    return !!find(params.moods, m => m.id !== state.mood.id && m.name === state.mood.name);
+    return params.nameRepeat(state.mood)
   }, [state.mood.name]);
 
-  useEffect(() =>{
-    console.log(state.mood, '< --- state mood --- >')
-    console.log(params.currentMood, '< --- currentMood --- >')
-  }, [JSON.stringify(state.mood)])
-
+  const checkMoodChanged = useMemo(() =>{
+    return isEqual(state.mood, params.currentMood)
+  }, [JSON.stringify(state.mood), params.currentMood])
 
-  const showBackDialog = (): boolean => {
-    return !isEqual(state.mood, routeParams.currentMood);
-  }
+  const canSaveMoodData = useMemo(() =>{
+    return state.mood.name.length > 0 && state.mood.name.length < 33 && !nameRepeat && (params.mode === 'add' || !checkMoodChanged)
+  }, [nameRepeat, state.mood.name, checkMoodChanged, params.mode])
 
   return (
     <Page
       backText={I18n.getLang('mesh_device_detail_mode')}
-      showBackDialog={showBackDialog()}
+      showBackDialog={!checkMoodChanged}
       backDialogTitle={I18n.getLang(
         params.mode === 'add'
           ? 'string_light_pp_dialog_sm_add_headline_c'
@@ -143,7 +131,7 @@ const StaticMoodEditorPage = () => {
           : 'strip_light_static_mood_editor_step_2_dialog_text'
       )}
       headlineText={state.headline}
-      rightButtonIcon={getButtonStatus() ? res.ic_uncheck : res.ic_check}
+      rightButtonIcon={canSaveMoodData ? res.ic_check : res.ic_uncheck}
       rightButtonIconClick={onRightClick}
       loading={state.loading}
     >
@@ -180,86 +168,33 @@ const StaticMoodEditorPage = () => {
               showSwitch={!!moduleParams.isMixLight}
             />
             {(!moduleParams.isMixLight || state.mood.mainLamp.enable) && (
-              <LampAdjustView
+              <LampAdjustView2
                 isSupportColor={isMix ? false : moduleParams.isSupportColor}
                 isSupportBrightness={moduleParams.isSupportBrightness}
-                isSupportTemperature={moduleParams.isSupportTemperature}
+                isSupportCCT={moduleParams.isSupportTemperature}
                 isColorMode={state.mainNode.isColorNode}
                 reserveSV={true}
                 setIsColorMode={isColorMode => {
                   state.mainNode.isColorNode = isColorMode;
                 }}
-                h={state.mainNode.h}
-                s={state.mainNode.s}
-                v={state.mainNode.v}
-                onHSVChange={(h, s, v) => {
-                  state.mainNode.h = h 
-                  state.mainNode.s = s 
-                  state.mainNode.v = v
+                hsv={state.mainNode}
+                onHSVChange={(hsv) => {
+                  state.mainNode.h = hsv.h
+                  state.mainNode.s = hsv.s
+                  state.mainNode.v = hsv.v
                 }}
-                onHSVChangeComplete={(h, s, v) => {
-                  state.mainNode.h = h 
-                  state.mainNode.s = s 
-                  state.mainNode.v = v
-                }}
-                colorTemp={state.mainNode.colorTemp}
+                cct={state.mainNode.colorTemp}
                 brightness={state.mainNode.brightness}
-                onCCTChange={() => {}}
-                onCCTChangeComplete={cct => {
+                onCCTChange={(cct) => {
                   state.mainNode.colorTemp = cct;
                 }}
-                onBrightnessChange={() => {}}
-                onBrightnessChangeComplete={brightness => {
+                onBrightnessChange={(brightness) => {
                   state.mainNode.brightness = brightness;
                 }}
               />
             )}
           </Card>
           <Spacer />
-          {isMix && (
-            <Card style={styles.fanAdjustCard}>
-              <LdvSwitch
-                title={I18n.getLang('light_sources_tile_sec_lighting_headline')}
-                color={'#fff'}
-                colorAlpha={1}
-                enable={!!state.mood.secondaryLamp.enable}
-                setEnable={v => {
-                  if(v && !state.mood.secondaryLamp.nodes.length){
-                    state.mood.secondaryLamp.nodes.push(
-                      {
-                        h: 0,
-                        s: 100,
-                        v: 100,
-                        brightness: 0,
-                        colorTemp: 0,
-                        isColorNode: true,
-                      },
-                    )
-                    state.secondaryNode = state.mood.secondaryLamp.nodes[0]
-                  }
-                  state.mood.secondaryLamp.enable = v;
-                }}
-                showSwitch={!!moduleParams.isMixLight}
-              />
-              {(!moduleParams.isMixLight || state.mood.secondaryLamp.enable) && (
-                <>
-                  <ColorAdjustView
-                  h={state.secondaryNode.h}
-                  s={state.secondaryNode.s}
-                  v={state.secondaryNode.v}
-                  reserveSV={true}
-                  onHSVChange={() => {}}
-                  onHSVChangeComplete={(h, s, v) => {
-                    state.secondaryNode.h = h 
-                    state.secondaryNode.s = s 
-                    state.secondaryNode.v = v
-                  }}
-                />
-                <Spacer height={cx(16)}/>
-                </>
-              )}
-            </Card>
-          )}
           {!!(moduleParams.isFanLight || moduleParams.isUVCFan) && (
             <FanAdjustView
               fanEnable={!!state.mood.mainLamp.fanEnable}
@@ -284,15 +219,20 @@ const StaticMoodEditorPage = () => {
                 textStyle={styles.deleteBtnText}
                 text={I18n.getLang('edit_static_mood_button_delete_text')}
                 onPress={() => {
-                  showDeleteMoodDialog(async (_, { close }) => {
-                    state.loading = true;
-                    close();
-                    const res = await params.modDeleteMood('del', state.mood);
-                    if (res.success) {
-                      navigation.navigate(RouterKey.ui_biz_mood);
+                  showDialog({
+                    method: 'confirm',
+                    title: I18n.getLang('string_light_pp_dialog_sm_ed_headline_d'),
+                    subTitle: I18n.getLang(`strip_light_static_mood_edit_dialog_text`),
+                    onConfirm: async (_, {close})=>{
+                      close();
+                      state.loading = true;
+                      const res = await params.modDeleteMood('del', state.mood);
+                      state.loading = false;
+                      if (res.success) {
+                        navigation.navigate(ui_biz_routerKey.ui_biz_mood);
+                      }
                     }
-                    state.loading = false;
-                  });
+                  })
                 }}
               />
             </View>

package/src/newModules/select/Route.ts

@@ -0,0 +1,17 @@
+import {NavigationRoute, TransitionPresets} from "tuya-panel-kit";
+import SelectPage from "./SelectPage";
+import {ui_biz_routerKey} from "../../navigation/Routers";
+
+const SelectPagePageRouters: NavigationRoute[] = [
+  {
+    name: ui_biz_routerKey.ui_biz_select_page,
+    component: SelectPage,
+    options: {
+      hideTopbar: true,
+      showOfflineView: false,
+      ...TransitionPresets.ModalPresentationIOS,
+    },
+  }
+]
+
+export default SelectPagePageRouters

package/src/newModules/select/SelectPage.d.ts

@@ -0,0 +1,12 @@
+export interface SelectPageData<T> {
+    text: string;
+    selected: boolean;
+    value: T;
+}
+export interface SelectPageParams<T> {
+    title: string;
+    data: SelectPageData<T>[];
+    onSelect: (selectPageData: SelectPageData<T>) => void;
+}
+declare const SelectPage: () => any;
+export default SelectPage;