@ledvance/group-ui-biz-bundle 1.0.91 → 1.0.93

package/src/modules/mood_new/Interface.ts

@@ -93,6 +93,7 @@ export interface DefMoodOption extends LightCategory{
   isSupportColor: boolean;
   isSupportTemperature: boolean;
   isSupportBrightness: boolean;
+  isRefresh?: boolean
 }
 
 export interface MoodDps {

package/src/modules/mood_new/MoodActions.ts

@@ -205,6 +205,18 @@ export const getRemoteMoodList = async (
   devId: string,
   option: DefMoodOption,
 ) => {
+  const defaultScene = getDefMoodList(option);
+  if (option.isRefresh){
+    const res = await setRemoteMoodList(devId, defaultScene, SceneFeatureId)
+    if (res.success){
+      return {
+        success: true,
+        data: defaultScene.map((item, index) =>
+          remoteMoodInfo2MoodUIState(item, index, option)
+        ),
+      }
+    }
+  }
   const res = await NativeApi.getJson(devId, SceneFeatureId);
   const isNormalData = Array.isArray(parseJSON(res?.data));
   if (res.success && isNormalData) {
@@ -216,7 +228,6 @@ export const getRemoteMoodList = async (
     };
   } else {
     if (res.msg?.includes('资源未找到') || !isNormalData) {
-      const defaultScene = getDefMoodList(option);
       const res = await setRemoteMoodList(devId, defaultScene, SceneFeatureId);
       if (res.success) {
         return {

package/src/modules/mood_new/MoodItem.tsx

@@ -118,8 +118,9 @@ export default withTheme(MoodItem)
 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 => {
+    const s = Math.round(mapFloatToRange(n.s / 100, 30, 100));
     return n.isColorNode
-      ? hsv2Hex(n.h, Math.round(n.s), Math.round(mapFloatToRange(n.v / 100, 50, 100)))
+      ? hsv2Hex(n.h, s, Math.round(mapFloatToRange(n.v / 100, 50, 100)))
       : cctToColor(n.colorTemp.toFixed());
   }) : ['#eee'];
 

package/src/modules/mood_new/MoodPage.tsx

@@ -10,7 +10,7 @@ import {
 import { useReactive } from 'ahooks';
 import Strings from '@ledvance/base/src/i18n';
 import res from '@ledvance/base/src/res';
-import { FlatList, StyleSheet, View, Platform } from 'react-native';
+import { FlatList, StyleSheet, View, Platform, Image, TouchableOpacity } from 'react-native';
 import Tag from '@ledvance/base/src/components/Tag';
 import Spacer from '@ledvance/base/src/components/Spacer';
 import InfoText from '@ledvance/base/src/components/InfoText';
@@ -25,6 +25,8 @@ import { cloneDeep, filter, map } from 'lodash';
 import { useFlagMode } from '../flags/FlagActions';
 import { WorkMode } from '@ledvance/base/src/utils/interface';
 import ThemeType from '@ledvance/base/src/config/themeType'
+import { showDialog } from '@ledvance/base/src/utils/common';
+import I18n from '@ledvance/base/src/i18n';
 
 const cx = Utils.RatioUtils.convertX;
 const { withTheme } = Utils.ThemeUtils
@@ -63,17 +65,7 @@ const MoodPage = (props: {theme?: ThemeType}) => {
 
   useEffect(() => {
     state.timerId = setTimeout(() => {
-      state.loading = true
-      getRemoteMoodList(
-        uaGroupInfo.tyGroupId.toString(),
-        params
-      ).then(res => {
-        state.loading = false
-        if (res.success && Array.isArray(res.data)) {
-          state.originMoods = cloneDeep(res.data);
-          console.log(state.originMoods, '< --- originMoods')
-        }
-      });
+      getMoodList()
     }, 250);
 
     return () => {
@@ -93,6 +85,21 @@ const MoodPage = (props: {theme?: ThemeType}) => {
     });
   }, [state.staticTagChecked, state.dynamicTagChecked, state.originMoods]);
 
+  const getMoodList = (isRefresh?: boolean) =>{
+    state.loading = true 
+    getRemoteMoodList(
+      uaGroupInfo.tyGroupId.toString(),
+      {...params, isRefresh}
+    ).then(res => {
+      state.loading = false
+      if (res.success && Array.isArray(res.data)) {
+        state.originMoods = cloneDeep(res.data);
+        setMoods(cloneDeep(res.data));
+      }
+    });
+    state.loading = false
+  }
+
   const navigationRoute = (isStatic: boolean, mode: 'add' | 'edit', currentMood?: MoodUIInfo) => {
     const path =
       mode === 'add'
@@ -307,6 +314,21 @@ const MoodPage = (props: {theme?: ThemeType}) => {
                 }}
             />
         </View>}
+        <TouchableOpacity style={{ alignItems: 'flex-end',paddingRight: cx(24) }}
+          onPress={() => {
+            showDialog({
+              method: 'confirm',
+              title: I18n.getLang('mood_resetbutton'),
+              subTitle: I18n.getLang('reset_mooddescription'),
+              onConfirm: (_, { close }) => {
+                close()
+                getMoodList(true)
+              }
+            })
+          }}
+        >
+          <Image source={res.ic_refresh} style={{ width: cx(24), height: cx(24) }} />
+        </TouchableOpacity>
         <Spacer height={cx(10)} />
         {state.originMoods.length >= MAX_MOOD_COUNT && (
           <View style={styles.infoLine}>

package/src/modules/randomTimeForPlug/ItemCard.tsx

@@ -24,10 +24,11 @@ export interface ItemCardProps<T> {
   is24Hour?: boolean,
   onSwitch: (enable: boolean) => void
   onPress: () => void
+  onLongPress: () => void
 }
 
 const ItemCard = <T, >(props: ItemCardProps<T>) => {
-  const {item, is24Hour, onSwitch, onPress} = props
+  const {item, is24Hour, onSwitch, onPress, onLongPress} = props
   // 判断是否关闭
   const closed = getIsClosed(item)
 
@@ -56,7 +57,7 @@ const ItemCard = <T, >(props: ItemCardProps<T>) => {
     },
   })
   return (
-    <Card style={styles.itemCard} onPress={onPress}>
+    <Card style={styles.itemCard} onPress={onPress} onLongPress={onLongPress}>
       <Spacer height={cx(16)}/>
       <View style={styles.switchLine}>
         <Text style={styles.time}>

package/src/modules/randomTimeForPlug/RandomTimeForPlugPage.tsx

@@ -14,6 +14,7 @@ import ItemCard from "./ItemCard";
 import {cloneDeep} from "lodash";
 import InfoText from "@ledvance/base/src/components/InfoText";
 import ThemeType from '@ledvance/base/src/config/themeType'
+import { showDialog } from "@ledvance/base/src/utils/common";
 
 const {convertX: cx, topBarHeight} = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
@@ -128,6 +129,19 @@ const RandomTimeForPlugPage = (props: { theme?: ThemeType}) => {
               onPress={() => {
                 onAddOrEditItem('edit', item)
               }}
+              onLongPress={async () =>{
+                showDialog({
+                  method: 'confirm',
+                  title: I18n.getLang('cancel_dialog_delete_item_randomtimecycle_titel'),
+                  subTitle: I18n.getLang('cancel_dialog_delete_item_randomtimecycle_description'),
+                  onConfirm: async (_, {close}) => {
+                    close()
+                    state.loading = true
+                    await onPost('del', item)
+                    state.loading = false 
+                  }
+                })
+              }}
             />
           )}
           keyExtractor={(item: any) => `${item?.index}`}

package/src/modules/randomTimingForLight/RandomTimingForLightPage.tsx

@@ -14,6 +14,7 @@ import ItemCard from "./ItemCard";
 import {cloneDeep} from "lodash";
 import InfoText from "@ledvance/base/src/components/InfoText";
 import ThemeType from '@ledvance/base/src/config/themeType'
+import { showDialog } from "@ledvance/base/src/utils/common";
 
 const {convertX: cx, topBarHeight} = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
@@ -131,6 +132,19 @@ const RandomTimeForLightPage = (props: { theme?: ThemeType}) => {
               onPress={() => {
                 onAddOrEditItem('edit', item)
               }}
+              onLongPress={async () =>{
+                showDialog({
+                  method: 'confirm',
+                  title: I18n.getLang('cancel_dialog_delete_item_randomtimecycle_titel'),
+                  subTitle: I18n.getLang('cancel_dialog_delete_item_randomtimecycle_description'),
+                  onConfirm: async (_, {close}) => {
+                    close()
+                    state.loading = true
+                    await onPost('del', item)
+                    state.loading = false 
+                  }
+                })
+              }}
             />
           )}
           keyExtractor={(item: any) => `${item?.index}`}

package/src/modules/sleepWakeUp/SleepWakeUpPage.tsx

@@ -10,7 +10,7 @@ import {useDeviceInfo, useSystemTimeFormate} from "@ledvance/base/src/models/mod
 import {useReactive, useUpdateEffect} from "ahooks";
 import CustomListDialog from "@ledvance/base/src/components/CustomListDialog";
 import {SwitchButton, Utils} from "tuya-panel-kit";
-import {convertMinutesTo12HourFormat, getIsClosed, loopText} from "@ledvance/base/src/utils/common";
+import {convertMinutesTo12HourFormat, getIsClosed, loopText, showDialog} from "@ledvance/base/src/utils/common";
 import TextButton from "@ledvance/base/src/components/TextButton";
 import {ui_biz_routerKey} from "../../navigation/Routers";
 import {cloneDeep} from "lodash";
@@ -49,6 +49,7 @@ const SleepWakeUpPage = (props: {theme?: ThemeType}) => {
     sleepScheduleList: cloneDeep(sleepList),
     wakeUpScheduleList: cloneDeep(wakeUpList),
     filteredScheduleList: [] as any[],
+    loading: false 
   })
 
   const isMaxNum = useMemo(() => {
@@ -192,7 +193,7 @@ const SleepWakeUpPage = (props: {theme?: ThemeType}) => {
       alignItems: 'center'
     },
     emptyBtn: {
-      backgroundColor: props.theme?.button.primary,
+      backgroundColor: props.theme?.button.active,
       borderRadius: cx(5),
       paddingHorizontal: cx(15),
       paddingVertical: cx(10)
@@ -255,6 +256,7 @@ const SleepWakeUpPage = (props: {theme?: ThemeType}) => {
         onHeadlineIconClick={() => {
           state.showAddSchedulePopover = !state.showAddSchedulePopover
         }}
+        loading={state.loading}
       >
         <View style={{ marginHorizontal: cx(24) }}>
           <Text style={{ color: props.theme?.global.fontColor, fontSize: cx(12) }}>
@@ -302,6 +304,32 @@ const SleepWakeUpPage = (props: {theme?: ThemeType}) => {
                     settingTime: new Date().getTime()
                   })
                 }}
+                onLongPress={() =>{
+                  showDialog({
+                    method: 'confirm',
+                    title: I18n.getLang(
+                      item.isSleep
+                        ? 'cancel_dialog_delete_item_sleepschedule_titel'
+                        : 'cancel_dialog_delete_item_wakeupschedule_titel'
+                    ),
+                    subTitle: I18n.getLang(
+                      item.isSleep
+                        ? 'cancel_dialog_delete_item_sleepschedule_description'
+                        : 'cancel_dialog_delete_item_wakeupschedule_description'
+                    ),
+                    onConfirm: async (_, { close }) => {
+                      close();
+                      if (state.loading) return;
+                      state.loading = true;
+                      await modDeleteTimeSchedule(
+                        'del',
+                        item.isSleep,
+                        item
+                      );
+                      state.loading = false;
+                    },
+                  });
+                }}
               />
             )}
             ListHeaderComponent={() => (<Spacer height={cx(10)} />)}
@@ -374,16 +402,17 @@ const SleepWakeUpPage = (props: {theme?: ThemeType}) => {
   )
 }
 
-const SleepWakeUpCard = ({ sleepWakeUp, is24HourClock, onSwitch, onPress, styles }: {
+const SleepWakeUpCard = ({ sleepWakeUp, is24HourClock, onSwitch, onPress, onLongPress, styles }: {
   sleepWakeUp: SleepWakeUpItem,
   onSwitch: (enable: boolean) => void,
   onPress: () => void
+  onLongPress: () => void
   is24HourClock: boolean
   styles: StyleSheet.NamedStyles<any>
 }) => {
   const closed = getIsClosed({weeks: sleepWakeUp.weeks, settingTime: sleepWakeUp.settingTime, endTime: getEndTime(sleepWakeUp)})
   return (
-    <Card style={styles.randomTimingCard} onPress={onPress}>
+    <Card style={styles.randomTimingCard} onPress={onPress} onLongPress={onLongPress}>
       <Spacer height={cx(16)} />
       <View style={styles.switchLine}>
         <Text style={styles.time}>
@@ -393,7 +422,7 @@ const SleepWakeUpCard = ({ sleepWakeUp, is24HourClock, onSwitch, onPress, styles
           thumbStyle={{ elevation: 0 }}
           onValueChange={onSwitch} />
       </View>
-      <Text style={styles.loopText}>{loopText(sleepWakeUp.weeks, parseTimer(getStartTime(sleepWakeUp) * 60))}</Text>
+      <Text style={styles.loopText}>{loopText(sleepWakeUp.weeks, parseTimer(getEndTime(sleepWakeUp) * 60))}</Text>
       <Spacer height={cx(5)} />
       <Text style={styles.loopText}>{sleepWakeUp.name}</Text>
       <Spacer height={cx(10)} />

package/src/modules/timeSchedule/Interface.ts

@@ -1,3 +1,7 @@
+import I18n from "@ledvance/base/src/i18n";
+import { AdjustType, DiySceneInfo } from "@ledvance/base/src/utils/interface";
+import { MoodInfo, MoodUIInfo } from "../mood_new/Interface";
+
 export interface IAddSingleTime {
   bizId: string;
   bizType?: string;
@@ -15,8 +19,6 @@ export interface IQueryTimerTasks {
   category?: string;
 }
 
-
-
 export interface IModifySingleTimer {
   bizId: string;
   bizType?: string;
@@ -40,10 +42,6 @@ export enum UVCFanMode {
   Normal = 'normal'
 }
 
-
-import I18n from "@ledvance/base/src/i18n";
-import { MoodInfo, MoodUIInfo } from "../mood_new/Interface";
-
 export interface Timer {
   status: number;
   loops: string;
@@ -84,6 +82,7 @@ interface judgmentSupport {
   isMixLight?: boolean;
   isFanLight?: boolean;
   isUVCFan?: boolean;
+  isMoodStrip?: boolean;
 }
 
 export interface ManualSettingProps extends judgmentSupport {
@@ -100,7 +99,8 @@ export enum DeviceType {
   MixLight = 'mixLight',
   StripLight = 'stripLight',
   CeilingLight = 'ceilingLight',
-  FanLight = 'fanLight'
+  FanLight = 'fanLight',
+  MoodStrip = 'moodStrip',
 }
 // export type DeviceType = 'LightSource' | 'CeilingLight' | 'StringLight' | 'StripLight' | 'MixLight';
 
@@ -135,12 +135,17 @@ export interface FanLightData extends DeviceData {
   disinfect: boolean
 }
 
+export interface MoodStripData extends DeviceData {
+  adjustType: AdjustType
+}
+
 export type ComponentConfig =
   | { type: DeviceType.LightSource; deviceData: DeviceData }
   | { type: DeviceType.MixLight; deviceData: MixLightData }
   | { type: DeviceType.StripLight; deviceData: StripLightData }
   | { type: DeviceType.CeilingLight; deviceData: CeilingLightData }
   | { type: DeviceType.FanLight; deviceData: FanLightData }
+  | { type: DeviceType.MoodStrip; deviceData: MoodStripData}
 
 export interface TimeScheduleDetailState {
   timeSchedule: Timer;
@@ -152,15 +157,19 @@ export interface TimeScheduleDetailState {
   loading: boolean;
   moodLoading: boolean;
   manualData: ComponentConfig;
-  mood?: MoodInfo;
-  moods: MoodUIInfo[];
+  mood?: MoodInfo | DiySceneInfo;
+  moods: MoodUIInfo[] | DiySceneInfo[];
+  filterMoods: MoodUIInfo[] | DiySceneInfo[];
+  staticTagChecked: boolean;
+  dynamicTagChecked: boolean;
+  diyTagChecked: boolean;
   timerId: any;
   moodName: string;
 }
 
 export interface DeviceStateType {
   deviceData: ComponentConfig
-  mood?: MoodInfo
+  mood?: MoodInfo | DiySceneInfo
   isManual: boolean
 }
 

package/src/modules/timeSchedule/TimeScheduleActions.ts

@@ -1,9 +1,10 @@
 import { commonApi } from "@tuya/tuya-panel-api"
-import { IAddSingleTime, IQueryTimerTasks, IModifySingleTimer, IModDeleteTaskByIds, UVCFanMode } from "@ledvance/group-ui-biz-bundle/src/modules/timeSchedule/Interface"
+import { IAddSingleTime, IQueryTimerTasks, IModifySingleTimer, IModDeleteTaskByIds, UVCFanMode } from "./Interface"
 import { flatMapDeep } from "lodash";
 import I18n from "@ledvance/base/src/i18n";
 import { ColorList } from '@ledvance/base/src/components/StripAdjustView';
 import { parseJSON } from "@tuya/tuya-panel-lamp-sdk/lib/utils";
+import { AdjustType } from "@ledvance/base/src/utils/interface";
 
 export const defDeviceData = {
   h: 0,
@@ -40,6 +41,11 @@ export const defFanLightDeviceData = {
   disinfect: false
 }
 
+export const defMoodStripDeviceData = {
+  ...defDeviceData,
+  adjustType: AdjustType.COLOUR
+}
+
 export const addTimeSchedule = async (props: IAddSingleTime) => {
   try {
     const res = await commonApi.timerApi.addSingleTimer({

package/src/modules/timeSchedule/TimeScheduleDetailPage.tsx

@@ -37,13 +37,16 @@ import DeleteButton from '@ledvance/base/src/components/DeleteButton';
 import SegmentControl from '@ledvance/base/src/components/segmentControl';
 import { useParams } from '@ledvance/base/src/hooks/Hooks';
 import ManualSettings from './components/ManuaSettings';
-import { defDeviceData, defMixDeviceData, defStripDeviceData, defFanLightDeviceData } from './TimeScheduleActions';
+import { defDeviceData, defMixDeviceData, defStripDeviceData, defFanLightDeviceData, defMoodStripDeviceData } from './TimeScheduleActions';
 import MoodItem from '../mood_new/MoodItem';
 import Summary from './components/Summary'
 import { getRemoteMoodList } from '../mood_new/MoodActions'
-import { MoodUIInfo } from '../mood_new/Interface';
+import {MoodInfo, MoodUIInfo } from '../mood_new/Interface';
 import InfoText from '@ledvance/base/src/components/InfoText';
 import ThemeType from '@ledvance/base/src/config/themeType'
+import Tag from '@ledvance/base/src/components/Tag';
+import { DiySceneInfo } from '@ledvance/base/src/utils/interface';
+import DiySceneItem from '@ledvance/base/src/components/DiySceneItem';
 
 const { convertX: cx } = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
@@ -61,6 +64,7 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
   const uaGroupInfo = useUAGroupInfo()
   const is24HourClock = useSystemTimeFormate();
   const [moods, setMoods] = useMoods();
+  type MoodsType = typeof params.isMoodStrip extends true ? DiySceneInfo[] : MoodUIInfo[]
   const state = useReactive<TimeScheduleDetailState>({
     timeSchedule: params.mode === 'add' ? newTimeSchedule() : cloneDeep(params.timeSchedule),
     dps: params.mode === 'add' ? {} : params.timeSchedule.dps,
@@ -76,6 +80,10 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
         : params.manualDataDp2Obj(params.timeSchedule.dps)?.deviceData,
     mood: params.mode === 'add' ? undefined : params.manualDataDp2Obj(params.timeSchedule.dps)?.mood,
     moods: cloneDeep(moods),
+    filterMoods: cloneDeep(moods),
+    staticTagChecked: true,
+    dynamicTagChecked: true,
+    diyTagChecked: true,
     timerId: undefined,
     moodName: '',
   });
@@ -145,15 +153,37 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
   useEffect(() => {
     if (state.moods?.length) {
       state.moodName =
-        state.moods.find(m =>
+        (state.moods as MoodsType).find(m =>
           params.isCeilingLight
-            ? m.mainLamp.id === state.mood?.mainLamp.id &&
-            m.secondaryLamp.id === state.mood?.secondaryLamp.id
+            ? m.mainLamp.id === (state.mood as MoodInfo)?.mainLamp.id &&
+            m.secondaryLamp.id === (state.mood as MoodInfo)?.secondaryLamp.id
             : m.id === state.mood?.id
         )?.name || '';
     }
   }, [state.mood, state.moods]);
 
+  useEffect(() => {
+    if (params.isMoodStrip) {
+      state.filterMoods = (state.moods as DiySceneInfo[]).filter(item => {
+        return [state.staticTagChecked, state.dynamicTagChecked, state.diyTagChecked].every(it => !it)
+          || (state.staticTagChecked && item.type === 'Static')
+          || (state.dynamicTagChecked && item.type === 'Dynamic')
+          || (state.diyTagChecked && item.type === 'DIY')
+      })
+    } else {
+      state.filterMoods = (state.moods as MoodsType).filter(item => {
+        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, state.diyTagChecked, state.moods]);
+
   const getFormateTime = useCallback((time: number | string) => {
     if (typeof time === 'number') {
       return `${toFixedString(Math.trunc(time / 60), 2)}:${toFixedString(time % 60, 2)}`;
@@ -211,7 +241,7 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
   }, [params.applyForList.length, params.applyForDisabled]);
 
   const getMoodItemEnable = useCallback((item: MoodUIInfo ) =>{
-    return params.isCeilingLight ? ((item.mainLamp.id === state.mood?.mainLamp?.id) && (item.secondaryLamp.id === state.mood?.secondaryLamp?.id)) : item.id === state.mood?.id
+    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 styles = StyleSheet.create({
@@ -264,6 +294,10 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
       color: props.theme?.global.fontColor,
       fontSize: cx(14)
     },
+    tagLine: {
+      flexDirection: 'row',
+      marginHorizontal: cx(24),
+    }
   })
 
   return (
@@ -429,7 +463,7 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
         {showMoodFanSelectText && <InfoText
             style={{marginHorizontal: cx(24)}}
             icon={res.ic_warning_amber}
-            contentColor={props.theme?.global.warnging}
+            contentColor={props.theme?.global.warning}
             text={I18n.getLang('timeschedule_add_schedule_devicestate_sec_warning_text')}
         />}
         {state.isManual ? (
@@ -454,25 +488,77 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
             }}
           />
         ) : (
-          !showMoodFanSelectText ? <FlatList
-            data={state.moods}
-            renderItem={({ item }) => {
-              return (
-                <MoodItem
-                  enable={getMoodItemEnable(item)}
-                  mood={item}
-                  isMix={!!(params.isMixLight || params.isCeilingLight)}
-                  onSwitch={_ => {
-                    state.mood = cloneDeep(item);
+          !showMoodFanSelectText ? (
+            <View>
+              {!(params.isStringLight || params.isStripLight) && <View style={styles.tagLine}>
+                  <Tag
+                      checked={state.staticTagChecked}
+                      text={I18n.getLang('mood_overview_filter_name_text1')}
+                      onCheckedChange={checked => {
+                        state.staticTagChecked = checked;
+                      }}
+                  />
+                  <Spacer width={cx(8)} height={0} />
+                  <Tag
+                      checked={state.dynamicTagChecked}
+                      text={I18n.getLang('mood_overview_filter_name_text2')}
+                      onCheckedChange={checked => {
+                        state.dynamicTagChecked = checked;
+                      }}
+                  />
+                {
+                  params.isMoodStrip && <>
+                        <Spacer width={cx(8)} height={0}/>
+                        <Tag
+                            checked={state.diyTagChecked}
+                            text={I18n.getLang('mood_overview_field_chip_diy')}
+                            onCheckedChange={checked => {
+                              state.diyTagChecked = checked;
+                            }}
+                        />
+                    </>
+                }
+              </View>}
+              {params.isMoodStrip ? <FlatList
+                  data={state.filterMoods as DiySceneInfo[]}
+                  renderItem={({item}) => {
+                    return (
+                      <DiySceneItem
+                        enable={item.id === state.mood?.id}
+                        scene={item}
+                        onSwitch={_ => {
+                          state.mood = cloneDeep(item);
+                        }}
+                      />
+                    );
                   }}
+                  ListHeaderComponent={() => <Spacer height={cx(10)}/>}
+                  ItemSeparatorComponent={() => <Spacer/>}
+                  ListFooterComponent={() => <Spacer/>}
+                  keyExtractor={item => `${item.name}`}
+                /> :
+                <FlatList
+                  data={state.filterMoods as MoodUIInfo[]}
+                  renderItem={({ item }) => {
+                    return (
+                      <MoodItem
+                        enable={getMoodItemEnable(item)}
+                        mood={item}
+                        isMix={!!(params.isMixLight || params.isCeilingLight)}
+                        onSwitch={_ => {
+                          state.mood = cloneDeep(item);
+                        }}
+                      />
+                    );
+                  }}
+                  ListHeaderComponent={() => <Spacer height={cx(10)} />}
+                  ItemSeparatorComponent={() => <Spacer />}
+                  ListFooterComponent={() => <Spacer />}
+                  keyExtractor={item => `${item.name}`}
                 />
-              );
-            }}
-            ListHeaderComponent={() => <Spacer height={cx(10)} />}
-            ItemSeparatorComponent={() => <Spacer />}
-            ListFooterComponent={() => <Spacer />}
-            keyExtractor={item => `${item.name}`}
-          /> : <View></View>
+              }
+            </View>
+          ) : <View></View>
         )}
         <Spacer />
 
@@ -614,7 +700,9 @@ const getDefaultManual = (props: TimeScheduleDetailPageParams): ComponentConfig
             DeviceType.FanLight
             : props.isCeilingLight
               ? DeviceType.CeilingLight
-              : DeviceType.LightSource;
+              : props.isMoodStrip
+                ? DeviceType.MoodStrip
+                : DeviceType.LightSource
   const deviceData =
     (deviceType === DeviceType.StripLight || deviceType === DeviceType.CeilingLight)
       ? defStripDeviceData
@@ -622,7 +710,9 @@ const getDefaultManual = (props: TimeScheduleDetailPageParams): ComponentConfig
         ? defMixDeviceData
         : deviceType === DeviceType.FanLight
           ? defFanLightDeviceData
-          : defDeviceData;
+          : deviceType === DeviceType.MoodStrip
+            ? defMoodStripDeviceData
+            : defDeviceData;
   // @ts-ignore
   return {
     type: deviceType,

package/src/modules/timeSchedule/TimeSchedulePage.tsx

@@ -38,6 +38,7 @@ export interface TimeSchedulePageParams {
   isMixLight?: boolean;
   isFanLight?: boolean
   isUVCFan?: boolean;
+  isMoodStrip?: boolean
   applyForList: ApplyForItem[];
   applyForDisabled?: boolean; // 是否可以选择apply for
   manualDataDp2Obj: (dps: Record<string, any>) => DeviceStateType;