@ledvance/ui-biz-bundle 1.1.35 → 1.1.37

package/src/modules/timeSchedule/MoodSetting.tsx

@@ -1,4 +1,4 @@
-import React, { memo, useEffect } from 'react'
+import React, { memo, useCallback, useEffect } from 'react'
 import { JudgeTimeScheduleProps } from './TimeScheduleBean'
 import { FlatList, View, StyleSheet } from 'react-native'
 import FantasyMoodItem from '../mood/FantasyMoodItem'
@@ -12,6 +12,9 @@ import MoodItem from '../mood/MoodItem'
 import { useReactive, useUpdateEffect } from 'ahooks'
 import { isUVCFanDevice, useDeviceId, useMoods } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import { getRemoteFantasyScene, getRemoteSceneList } from '../scene/SceneAction'
+import { getRemoteMixScene } from '../mood/MixMood/MixMoodActions'
+import MixMoodItem from '../mood/MixMood/MixMoodItem'
+import { MixSceneInfo } from '../mood/MixMood/MixSceneBeans'
 import { cloneDeep, isEmpty } from 'lodash'
 
 const cx = Utils.RatioUtils.convertX
@@ -23,8 +26,10 @@ interface MoodSettingProps extends JudgeTimeScheduleProps {
 }
 
 const MoodSetting = (props: MoodSettingProps) => {
-  const { setSendDps, isStringLight, isStripLight, actionScene, fantasyFeatureId = '' } = props
+  const { setSendDps, isStringLight, isStripLight, actionScene, isCeilingLight, fantasyFeatureId = '' } = props
   const [moods, setMoods] = useMoods()
+  console.log(111)
+  console.log(moods[0], ' <-- moods[0')
   const devId = useDeviceId()
   const isUVCFan = isUVCFanDevice()
   const state = useReactive({
@@ -32,7 +37,7 @@ const MoodSetting = (props: MoodSettingProps) => {
     staticTagChecked: true,
     dynamicTagChecked: true,
     filteredMoods: cloneDeep(moods),
-    currentScene: !isEmpty(actionScene) ? actionScene : moods[0]
+    currentScene: !isEmpty(actionScene) ? actionScene : cloneDeep(moods[0])
   })
 
   useUpdateEffect(() => {
@@ -44,9 +49,18 @@ const MoodSetting = (props: MoodSettingProps) => {
       if (isStringLight || isStripLight) {
         getRemoteFantasyScene(fantasyFeatureId, devId, { isStringLight, isStripLight }).then(res => {
           if (res.success && res.data) {
-            state.scenes = cloneDeep(res.data)
-            setMoods(res.data)  
-            if(isEmpty(actionScene)) state.currentScene = cloneDeep(res.data[0])
+            state.scenes = res.data
+            setMoods(res.data)
+            if (isEmpty(actionScene)) state.currentScene = res.data[0]
+            setSendDps(state.currentScene, 'actionScene')
+          }
+        })
+      } else if (isCeilingLight) {
+        getRemoteMixScene(devId).then(res => {
+          if (res.success && res.data) {
+            state.scenes = res.data
+            setMoods(cloneDeep(res.data))
+            if (isEmpty(actionScene)) state.currentScene = res.data[0]
             setSendDps(state.currentScene, 'actionScene')
           }
         })
@@ -62,71 +76,45 @@ const MoodSetting = (props: MoodSettingProps) => {
           if (res.success && res.data) {
             state.scenes = cloneDeep(res.data)
             setMoods(cloneDeep(res.data))
-            if(isEmpty(actionScene)) state.currentScene = cloneDeep(res.data[0])
+            if (isEmpty(actionScene)) state.currentScene = res.data[0]
             setSendDps(state.currentScene, 'actionScene')
           }
         })
       }
-      
-    }else{
-      setSendDps(cloneDeep(moods[0]), 'actionScene')
+
+    } else {
+      setSendDps(state.scenes[0], 'actionScene')
     }
   }, [])
 
   useEffect(() => {
-    state.filteredMoods = state.scenes.filter(item => {
+    state.filteredMoods = cloneDeep(state.scenes).filter(item => {
       return (state.staticTagChecked && state.dynamicTagChecked) ||
         (state.staticTagChecked && item.nodes.length < 2) ||
         (state.dynamicTagChecked && item.nodes.length > 1)
     })
   }, [state.staticTagChecked, state.dynamicTagChecked, state.scenes])
 
+  const checkItemEnable = useCallback((mixMood: MixSceneInfo) => {
+    const { mainLamp, secondlyLamp } = mixMood
+    const cloneCurrentScene = cloneDeep(state.currentScene)
+    const isStatic = mainLamp.nodes.length === 1
+    return isStatic ? ((cloneCurrentScene?.mainLamp?.id === mainLamp.id) && mainLamp.id !== -1) :
+      ((cloneCurrentScene?.mainLamp?.id === mainLamp.id) && (cloneCurrentScene?.secondlyLamp?.id === secondlyLamp.id))
+  }, [state.currentScene])
+  console.log(state.scenes, '< --- state.cesee')
   return (
-    (isStringLight || isStripLight) ?
-      <FlatList
-        data={state.scenes}
-        renderItem={({ item }) => {
-          return (
-            <FantasyMoodItem
-              style={{ marginHorizontal: cx(8) }}
-              enable={state.currentScene?.id === item.id}
-              mood={item}
-              onPress={() => { }}
-              onSwitch={async _ => {
-                state.currentScene = item
-                setSendDps(item, 'actionScene')
-              }} />
-          )
-        }}
-        ListHeaderComponent={() => (<Spacer height={cx(10)} />)}
-        ItemSeparatorComponent={() => (<Spacer />)}
-        ListFooterComponent={() => (<Spacer />)}
-        keyExtractor={item => `${item.id}`} /> :
-      <>
-        <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
-            }} />
-        </View>
-        <Spacer height={cx(10)} />
+    <View style={{ marginHorizontal: -cx(24) }}>
+      {(isStringLight || isStripLight) ?
         <FlatList
-          data={state.filteredMoods}
+          data={state.scenes}
           renderItem={({ item }) => {
             return (
-              <MoodItem
-                style={{ marginHorizontal: cx(8) }}
+              <FantasyMoodItem
+                style={{ marginHorizontal: cx(24) }}
                 enable={state.currentScene?.id === item.id}
                 mood={item}
+                onPress={() => { }}
                 onSwitch={async _ => {
                   state.currentScene = item
                   setSendDps(item, 'actionScene')
@@ -135,17 +123,74 @@ const MoodSetting = (props: MoodSettingProps) => {
           }}
           ListHeaderComponent={() => (<Spacer height={cx(10)} />)}
           ItemSeparatorComponent={() => (<Spacer />)}
-          ListFooterComponent={() => (
-            <View style={styles.infoLine}>
-              <Spacer />
-              <InfoText
-                icon={res.ic_info}
-                text={I18n.getLang('mood_overview_information_text')} />
-              <Spacer height={cx(40)} />
+          ListFooterComponent={() => (<Spacer />)}
+          keyExtractor={item => `${item.id}`} /> :
+        isCeilingLight ?
+          <FlatList
+            data={state.filteredMoods}
+            renderItem={({ item }) => {
+              return (
+                <MixMoodItem
+                  style={{ marginHorizontal: cx(24) }}
+                  enable={checkItemEnable(item)}
+                  mixMood={item}
+                  onPress={() => { }}
+                  onSwitch={async _ => {
+                    state.currentScene = item
+                    setSendDps(item, 'actionScene')
+                  }}
+                />
+              )
+            }}
+            ListHeaderComponent={() => (<Spacer height={cx(10)} />)}
+            ItemSeparatorComponent={() => (<Spacer />)}
+            ListFooterComponent={() => (<Spacer />)}
+            keyExtractor={item => `${item.name}`} /> :
+          <>
+            <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
+                }} />
             </View>
-          )}
-          keyExtractor={item => `${item.id}`} />
-      </>
+            <Spacer height={cx(10)} />
+            <FlatList
+              data={state.filteredMoods}
+              renderItem={({ item }) => {
+                return (
+                  <MoodItem
+                    style={{ marginHorizontal: cx(24) }}
+                    enable={state.currentScene?.id === item.id}
+                    mood={item}
+                    onSwitch={async _ => {
+                      state.currentScene = item
+                      setSendDps(item, 'actionScene')
+                    }} />
+                )
+              }}
+              ListHeaderComponent={() => (<Spacer height={cx(10)} />)}
+              ItemSeparatorComponent={() => (<Spacer />)}
+              ListFooterComponent={() => (
+                <View style={styles.infoLine}>
+                  <Spacer />
+                  <InfoText
+                    icon={res.ic_info}
+                    text={I18n.getLang('mood_overview_information_text')} />
+                  <Spacer height={cx(40)} />
+                </View>
+              )}
+              keyExtractor={item => `${item.id}`} />
+          </>}
+    </View>
   )
 }
 

package/src/modules/timeSchedule/TimeScheduleBean.ts

@@ -12,6 +12,7 @@ export interface JudgeTimeScheduleProps {
   isSupportMood?: boolean
   isStringLight?: boolean
   isStripLight?: boolean
+  isCeilingLight?: boolean
   isFanLamp?: boolean
   isSupportMode?: boolean
   isMixRGBWLamp?: boolean

package/src/modules/timeSchedule/TimeScheduleEditpage.tsx

@@ -16,7 +16,7 @@ import { isUVCFanDevice, useDeviceId } from '@ledvance/base/src/models/modules/N
 import res from '@ledvance/base/src/res'
 import { useReactive } from 'ahooks'
 import { dpItem, TimeSchedulePageRouteParams } from './TimeSchedulePage'
-import { cloneDeep, differenceBy, isEqual, isNumber } from 'lodash'
+import { cloneDeep, differenceBy, isEmpty, isEqual } from 'lodash'
 import DeviceState from './DeviceState'
 import { getHexByHSV, getHSVByHex } from '@ledvance/base/src/utils'
 import { Buffer } from 'buffer'
@@ -58,7 +58,8 @@ const TimeScheduleEditPage = () => {
     skillList: [] as ScheduleItemDp[],
     isManual: true,
     singleActions: {
-      enable: true,
+      enable: true,  // colorLightSwitch
+      whiteLightSwitch: false,
       isColor: true,
       h: 0,
       s: 100,
@@ -85,7 +86,7 @@ const TimeScheduleEditPage = () => {
     actionScene: {} as any,
     dpsValue: {} as Record<string, any>,
   })
-
+  console.log(props, '< --- props')
   useEffect(() => {
     // 设置功能列表
     if (props.mode === 'edit' && scheduleItem) {
@@ -94,7 +95,7 @@ const TimeScheduleEditPage = () => {
       state.name = scheduleItem.aliasName
       state.isNotification = !!scheduleItem.isAppPush
       state.loop = scheduleItem.loops.split('').map((mItem: string) => parseInt(mItem))
-      state.selectedSkill = dps.reduce((pre, cur) => {
+      state.selectedSkill = props.isCeilingLight ? props.dps : dps.reduce((pre, cur) => {
         if (scheduleItem.dps[cur.dpId] !== undefined) {
           const result = { ...cur, enable: scheduleItem.dps[cur.dpId] }
           pre.push(result)
@@ -104,7 +105,9 @@ const TimeScheduleEditPage = () => {
       state.skillList = differenceBy(dps, state.selectedSkill, 'dpId')
 
       if (props.dps2lightData) {
+        console.log(scheduleItem.dps, '< --- dps')
         const lightData = props.dps2lightData(scheduleItem.dps)
+        console.log(lightData, '< --- lightData')
         state.singleActions = {
           ...state.singleActions,
           ...lightData.singleActions,
@@ -183,6 +186,9 @@ const TimeScheduleEditPage = () => {
   
   // 只支持风扇灯跟普通灯
   const sceneCheck = () => {
+    if(props.isCeilingLight){
+      return (state.actionScene?.mainLamp?.nodes?.length) || (state.actionScene?.secondlyLamp?.nodes?.length)
+    }
     return !state.isManual && state.skillList.length === 0 && state.actionScene && (state?.actionScene?.nodes || state?.actionScene?.value)
   }
   
@@ -254,7 +260,7 @@ const TimeScheduleEditPage = () => {
       return props.lightData2dps({
         singleActions: state.singleActions,
         mixActions: state.mixActions,
-        actionScene: isNumber(state.actionScene?.id) ? state.actionScene : undefined,
+        actionScene: !isEmpty(state.actionScene) ? state.actionScene : undefined,
         isManual: state.isManual,
       })
     }
@@ -361,6 +367,7 @@ const TimeScheduleEditPage = () => {
       } else {
         const v = {
           [dpCodes.switch_led]: true,
+          // @ts-ignore
           [dpCodes.scene_data]: senceObj2Dp({
             id: Number(state?.actionScene?.id),
             nodes: state?.actionScene?.nodes,
@@ -394,7 +401,6 @@ const TimeScheduleEditPage = () => {
   }
 
   const setSendDps = useCallback((actions, type) => {
-    console.log('setSendDps --->', actions, type)
     state[type] = actions
   }, [])
 
@@ -448,7 +454,7 @@ const TimeScheduleEditPage = () => {
   }, [state.selectedSkill])
 
   const showClearIcon = () => {
-    return dps.length > 1 && !props.isMixRGBWLamp
+    return dps.length > 1 && !props.isMixRGBWLamp && !props.isCeilingLight
   }
 
   return (
@@ -559,6 +565,7 @@ const TimeScheduleEditPage = () => {
             isStringLight={props.isStringLight}
             isStripLight={props.isStripLight} 
             fantasyFeatureId={props.fantasyFeatureId}
+            isCeilingLight={props.isCeilingLight}
             />
           {!hasSelected() && <View style={{ flexDirection: 'row', alignItems: 'center' }}>
               <Image style={{ width: cx(16), height: cx(16), tintColor: '#FF9500' }} source={res.ic_warning_amber}/>

package/src/modules/timeSchedule/TimeSchedulePage.tsx

@@ -28,6 +28,7 @@ export type dpItem = {
 export interface LightData {
   singleActions?: {
     enable: boolean
+    whiteLightSwitch: boolean
     isColor: boolean
     h: number
     s: number
@@ -56,7 +57,6 @@ const TimeSchedulePage = () => {
   const deviceInfo = useDeviceInfo()
   const navigation = useNavigation()
   const props = useRoute().params as TimeSchedulePageRouteParams
-
   const { dps } = props
   const state = useReactive({
     timeScheduleList: [] as any[],

package/src/navigation/Routers.ts

@@ -7,6 +7,9 @@ import AddMoodPage from '../modules/mood/AddMoodPage'
 import MoodPage from '../modules/mood/MoodPage'
 import FantasyMoodPage from '../modules/mood/FantasyMood'
 import FantasyMoodEditPage from '../modules/mood/FantasyMoodEditPage'
+import MixMoodPage from '../modules/mood/MixMood/MixMoodPage'
+import MixMoodEditPage from '../modules/mood/MixMood/MixMoodEditPage'
+import AddMixMoodPage from '../modules/mood/MixMood/AddMixMoodPage'
 import TimerPage from '../modules/timer/TimerPage'
 import SleepWakeUpPage from 'modules/sleepWakeup/SleepWakeUpPage'
 import SleepWakeUpDetailPage from 'modules/sleepWakeup/SleepWakeUpDetailPage'
@@ -33,6 +36,9 @@ export const ui_biz_routerKey = {
   'ui_biz_mood_add': 'ui-biz_mood_add',
   'ui_biz_static_mood_edit': 'ui_biz_static_mood_edit',
   'ui_biz_dynamic_mood_edit': 'ui_biz_dynamic_mood_edit',
+  'ui_biz_mix_mood': 'ui_biz_mix_mood',
+  'ui_biz_mix_mood_edit': 'ui_biz_mix_mood_edit',
+  'ui_biz_mix_mood_add': 'ui_biz_mix_mood_add',
   'ui_biz_timer': 'ui_biz_timer',
   'bi_biz_biological': 'bi_biz_biological',
   'bi_biz_biological_edit': 'bi_biz_biological_edit',
@@ -169,6 +175,42 @@ export const FantasyMoodRouters: NavigationRoute[] = [
   },
 ]
 
+export const MixMoodRouters: NavigationRoute[] = [
+  {
+    name: ui_biz_routerKey.ui_biz_mix_mood,
+    component: MixMoodPage,
+    options: {
+      hideTopbar: true,
+      showOfflineView: false,
+    }
+  },
+  {
+    name: ui_biz_routerKey.ui_biz_mix_mood_edit,
+    component: MixMoodEditPage,
+    options: {
+      hideTopbar: true,
+      showOfflineView: false,
+    },
+  },
+  {
+    name: ui_biz_routerKey.ui_biz_mix_mood_add,
+    component: AddMixMoodPage,
+    options: {
+      hideTopbar: true,
+      showOfflineView: false,
+    },
+  },
+  {
+    name: ui_biz_routerKey.ui_biz_select_page,
+    component: SelectPage,
+    options: {
+      gesture: true,
+      hideTopbar: true,
+      ...TransitionPresets.ModalPresentationIOS,
+    },
+  },
+]
+
 export const TimerPageRouters: NavigationRoute[] = [
   {
     name: ui_biz_routerKey.ui_biz_timer,