@ledvance/ui-biz-bundle 1.1.36 → 1.1.38

package/src/modules/mood/MixMood/MixSceneBeans.ts

@@ -0,0 +1,364 @@
+import I18n from '@ledvance/base/src/i18n'
+import { StripSceneInfo, RemoteSceneInfo } from '../../scene/SceneInfo'
+
+export interface MixSceneInfo {
+  name: string
+  mainLamp: MixMainLampInfo
+  secondlyLamp: StripSceneInfo
+}
+
+export interface MixMainLampInfo {
+  id: number
+  speed: number 
+  mode: number
+  nodes: MixSceneNodeInfo[]
+}
+
+export interface MixSceneNodeInfo {
+  h: number
+  s: number
+  v: number
+  brightness: number
+  colorTemp: number
+}
+
+export function getMixSceneList(): RemoteSceneInfo[] {
+  return [
+    {
+      n: I18n.getLang('mesh_device_detail_lighting_goodnight'),
+      i: '000e0d0000000000000000c80000',
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('mesh_device_detail_lighting_read'),
+      i: '010e0d0000000000000003e801f4',
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('mesh_device_detail_lighting_work'),
+      i: '020e0d0000000000000003e803e8',
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('mesh_device_detail_lighting_leisure'),
+      i: '030e0d0000000000000001f401f4',
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text1'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '01150a5252e000006400c16100b43000b55200c463',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text2'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '01160a64646000006400925f00c660',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text3'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '0117035e5e6000006400382f001e5c00d545011a64',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text4'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '0118026464e000006400b239010a64012d64013f64',
+      t: 0,
+      e: false
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text5'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '01190a54546000006400b12c00c064',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text6'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '011a034b4be000006400e039010953',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text7'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '011b035f5f6000006400ae3900c45d00f964',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text8'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '011c0a5a5ae0000052009d64008e64',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text9'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '011d035252e000006400ae6400a66400c16400cc64',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text10'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '011e0a5252e000006400196400225e002c5b001464000c64',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text11'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '0147054d4d0000006401034500c143',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text12'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '014806323200000064014e41001f49',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text13'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '0149070e0e0000006400da37015241005c37',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text14'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '014a0832320000006400f75000294f010d3800a327',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text15'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '014b0932320000006401034500413a00254b005e42',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text16'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '014c0c32320000006400d84d00c143010345005c37',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text17'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '014d0d323200000064002864005e4200c16400ff50',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text18'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '014e0e323200000064003e5f00be5c',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text19'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '014f0f19190000006400bc64002d4e00006400643c',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text20'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '01501032320000006400e64700643c01194d00b839',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text21'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '011f025f5f6000006401106400d26400ad64008b64',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text22'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '01200a55556000006400c258013e3300ff46011d64',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text23'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '0121033c3c6000006400bf18010417',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text24'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '01220464646000006400d75c00bc5300371e002c3f01613f',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text25'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '01230264646000006401084b00b12f00cd57',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text26'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '01240a4b4b6000006400bc2600d65501186400f94d',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text27'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '01250343436000006400b735009b5400cd61',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text28'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '0126015959e000006401194701493d00cd61002664',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text29'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '0129026161e0000064000b6400d964002b6400916400b964',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text30'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '012a01646460000064011564010564014564012f64',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text31'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '012b035a5ae000006400005701166400da6400b364009564',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text32'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '012c0a484860000064003d64010c5b00ba49001761',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text33'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '012d02595960000064009c6300bc62007b60',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text34'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '012e035a5a60000064013e36010c56011f23',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text35'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '012f026464e000006400dc4200b64a00e14d',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text36'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '0130025e5e6000006400006400786400bb64',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text37'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '01330352526000006400885000d23900fb27',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text38'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '0134035d5d6000006400f73601352b00c634009129',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text39'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '01350352526000004d01126201305d',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text40'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '01360249496000006400663c003c49001e64',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text41'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '01370a5a5a6000006400335800186401004500e35e00ac30',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text42'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '0138025757e0000064010c64011a41014759001564003c38',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text43'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '0139034848e000006400596400b347',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('strip_lights_mood_text44'),
+      i: '040d0d0100000000000003e800000d0d0100000000000003e80000',
+      s: '013a025d5de000004d00b45e011c6400e84900c65f',
+      t: 0,
+      e: false,
+    },
+  ]
+}

package/src/modules/mood/MixMood/RecommendMixMoodItem.tsx

@@ -0,0 +1,68 @@
+import React 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 { MixSceneInfo } from './MixSceneBeans'
+import { MixMoodColorsLine } from './MixMoodItem'
+
+const cx = Utils.RatioUtils.convertX
+
+interface RecommendMixMoodItemProps {
+  title: string
+  isStatic: boolean
+  mixMood?: MixSceneInfo
+  onPress: () => void
+}
+
+const RecommendMixMoodItem = (props: RecommendMixMoodItemProps) => {
+  const { mixMood, isStatic } = props
+
+  return (
+    <Card style={styles.root} onPress={props.onPress}>
+      <CellContent
+        title={props.title}
+        value={''}
+        style={styles.content}
+        titleStyle={styles.title}
+        iconStyle={{
+          color: '#000',
+          size: cx(16),
+        }} />
+      {!!mixMood &&
+        (<>
+          <View style={styles.lineStyle}>
+            <MixMoodColorsLine mixSubLight={mixMood?.mainLamp} colorLight={false} />
+            <Spacer height={cx(7)} />
+            {!isStatic && <MixMoodColorsLine mixSubLight={mixMood?.secondlyLamp} colorLight={true} />}
+          </View>
+          <Spacer height={cx(24)} />
+        </>
+        )
+      }
+    </Card>
+  )
+}
+
+const styles = StyleSheet.create({
+  root: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    marginHorizontal: cx(24),
+  },
+  content: {
+    height: cx(56),
+    marginHorizontal: cx(16),
+  },
+  title: {
+    color: '#000',
+    fontSize: cx(16),
+    fontFamily: 'helvetica_neue_lt_std_bd',
+  },
+  lineStyle: {
+    alignItems: 'center',
+  },
+})
+
+export default RecommendMixMoodItem

package/src/modules/mood/StaticMoodEditorPage.tsx

@@ -154,10 +154,14 @@ const StaticMoodEditorPage = () => {
     return !!find(params.moods, m => (m.id !== state.mood.id && m.name === state.mood.name))
   }, [state.mood.name])
 
+  const showBackDialog = (): boolean => {
+    return !isEqual(state.mood, routeParams.currentMood);
+  }
+
   return (
     <Page
       backText={Strings.getLang('mesh_device_detail_mode')}
-      showBackDialog={true}
+      showBackDialog={showBackDialog()}
       backDialogTitle={
         Strings.getLang(params.mode === 'add' ?
           'string_light_pp_dialog_sm_add_headline_c' :

package/src/modules/music/MusicPage.tsx

@@ -180,9 +180,9 @@ const MusicPage = () => {
 
   const getSelect = async () => {
     const res: any = await NativeApi.getJson(deviceId, 'musicSelect')
-    const type = res?.data ? JSON.parse(res?.data)?.type : 0
+    const type = res?.data ? (JSON.parse(res?.data)?.type || 0) : 0
     state.musicType = res?.data ? JSON.parse(res?.data)?.musicType : props.dreamMusicDp ? 0 : 1
-    state.phoneGenreMode = musicDefalutDatasource[type !== '' && type]?.id
+    state.phoneGenreMode = musicDefalutDatasource[type]?.id
     state.musicEnable = workMode === 'music' && !!switchLed
     if (type !== '' && state.musicType === 1 && state.musicEnable) {
       openMusic()
@@ -190,6 +190,7 @@ const MusicPage = () => {
   }
 
   const changeMusic = async (id: number) => {
+    console.log(id, '< --- id')
     if (workMode !== 'music') await setWorkMode('music')
     if (!switchLed) setSwitchLed(true)
     await saveSelect(id)
@@ -206,6 +207,7 @@ const MusicPage = () => {
   }
 
   const putMusicDataFn = (data: any, extraDp = {}) => {
+    console.log(data, '< --- data')
     setMusicData(data, extraDp).then()
   }
 

package/src/modules/timeSchedule/DeviceState.tsx

@@ -59,6 +59,7 @@ const DeviceState = (props: DeviceStateProps) => {
           isSupportTemperature={props.isSupportTemperature}
           isStringLight={props.isStringLight}
           isStripLight={props.isStripLight}
+          isCeilingLight={props.isCeilingLight}
         /> :
         <View>
           {
@@ -74,6 +75,7 @@ const DeviceState = (props: DeviceStateProps) => {
                 fantasyFeatureId={props.fantasyFeatureId}
                 isStringLight={props.isStringLight}
                 isStripLight={props.isStripLight}
+                isCeilingLight={props.isCeilingLight}
                 isOnlyRGBLamp={props.isOnlyRGBLamp}
                 isDIMLamp={props.isDIMLamp}
                 isRGBLamp={props.isRGBLamp}

package/src/modules/timeSchedule/ManualSetting.tsx

@@ -13,7 +13,9 @@ import LdvSwitch from '@ledvance/base/src/components/ldvSwitch'
 import Spacer from '@ledvance/base/src/components/Spacer'
 import { hsv2Hex, mapFloatToRange } from '@ledvance/base/src/utils'
 import { cctToColor } from '@ledvance/base/src/utils/cctUtils'
-
+import ColorTempAdjustView from '@ledvance/base/src/components/ColorTempAdjustView'
+import { Utils } from 'tuya-panel-kit'
+const { convertX: cx } = Utils.RatioUtils
 
 interface ManualSettingProps extends JudgeTimeScheduleProps {
   singleActions: any
@@ -32,17 +34,17 @@ const ManualSetting = (props: ManualSettingProps) => {
     mixActions: props.mixActions,
     flag: Symbol(),
   })
-  const tabList = useCreation(() =>{
-    const isSupportWhite = props.isSupportBrightness || props.isSupportTemperature
+  const tabList = useCreation(() => {
+    const isSupportWhite = props.isCeilingLight ? false : (props.isSupportBrightness || props.isSupportTemperature)
     const tabs = [
       { key: 1, title: I18n.getLang('add_new_static_mood_lights_schedule_switch_tab_color_text') },
       { key: 0, title: I18n.getLang('add_new_static_mood_lights_schedule_switch_tab_white_text') },
       { key: 3, title: I18n.getLang('add_new_dynamic_mood_strip_lights_schedule_switch_tab_combination_text') },
     ]
-    if(!isSupportWhite){
+    if (!isSupportWhite || props.isCeilingLight) {
       return tabs.filter(tab => tab.key !== 0)
     }
-    if(!props.isSupportColor){
+    if (!props.isSupportColor) {
       return tabs.filter(tab => tab.key === 0)
     }
     return tabs
@@ -56,26 +58,63 @@ const ManualSetting = (props: ManualSettingProps) => {
     props.setSendDps(state.singleActions, 'singleActions')
   }, [state.flag])
 
-  const getColorBlockColor = useCallback(() =>{
-    if(!state.singleActions.enable) return '#fff' 
+  const getColorBlockColor = useCallback(() => {
+    if (!state.singleActions.enable) return '#fff'
     const s = Math.round(mapFloatToRange(state.singleActions.s / 100, 30, 100))
-    if(props.isSupportColor && state.singleActions.activeKey === 1){
+    if (props.isSupportColor && state.singleActions.activeKey === 1) {
       return hsv2Hex(state.singleActions.h, s, 100)
     }
-    if(props.isSupportTemperature && state.singleActions.activeKey === 0){
+    if (props.isSupportTemperature && state.singleActions.activeKey === 0) {
       return cctToColor(state.singleActions.temperature.toFixed())
     }
     return '#fff'
   }, [state.singleActions])
 
   const renderContent = () => {
-    if (props.isStripLight) {
+    if (props.isStripLight || props.isCeilingLight) {
       return (
         <>
+          {props.isCeilingLight && <><Spacer />
+            <Card>
+              <LdvSwitch
+                title={I18n.getLang('light_sources_tile_main_lighting_headline')}
+                color={cctToColor(state.singleActions.temperature)}
+                colorAlpha={1}
+                enable={state.singleActions.whiteLightSwitch}
+                setEnable={async value => {
+                  state.singleActions.whiteLightSwitch = value
+                  state.flag = Symbol()
+                }} />
+              {state.singleActions.whiteLightSwitch && <>
+                <ColorTempAdjustView
+                  minBrightness={1}
+                  isSupportTemperature={!!props.isSupportTemperature}
+                  isSupportBrightness={!!props.isSupportBrightness}
+                  colorTemp={state.singleActions.temperature}
+                  brightness={state.singleActions.brightness}
+                  onCCTChange={() => { }}
+                  onCCTChangeComplete={(temperature) => {
+                    state.singleActions = {
+                      ...state.singleActions,
+                      temperature
+                    }
+                    state.flag = Symbol()
+                  }}
+                  onBrightnessChange={() => { }}
+                  onBrightnessChangeComplete={brightness => {
+                    state.singleActions = {
+                      ...state.singleActions,
+                      brightness
+                    }
+                    state.flag = Symbol()
+                  }} />
+                <Spacer height={cx(10)} />
+              </>}
+            </Card></>}
           <Spacer />
           <Card>
             <LdvSwitch
-              title={I18n.getLang('light_sources_tile_tw_lighting_headline')}
+              title={I18n.getLang(props.isCeilingLight ? 'light_sources_tile_sec_lighting_headline' : 'light_sources_tile_tw_lighting_headline')}
               color={getColorBlockColor()}
               colorAlpha={1}
               enable={state.singleActions.enable}
@@ -106,8 +145,8 @@ const ManualSetting = (props: ManualSettingProps) => {
                 }
                 state.flag = Symbol()
               }}
-              isSupportTemperature={!!props.isSupportTemperature}
-              isSupportBrightness={!!props.isSupportBrightness}
+              isSupportTemperature={!!props.isSupportTemperature && !props.isCeilingLight}
+              isSupportBrightness={!!props.isSupportBrightness && !props.isCeilingLight}
               h={state.singleActions.h} s={state.singleActions.s} v={state.singleActions.v}
               onHSVChange={() => { }}
               onHSVChangeComplete={async (h, s, v) => {
@@ -147,6 +186,8 @@ const ManualSetting = (props: ManualSettingProps) => {
         <MixLightView
           mixActions={state.mixActions}
           setSendDps={props.setSendDps}
+          isSupportBrightness={props.isSupportBrightness}
+          isSupportTemperature={props.isSupportTemperature}
         />
       )
     }