@ledvance/ui-biz-bundle 1.1.100 → 1.1.102

package/package.json

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

package/src/modules/flags/FlagActions.ts

@@ -72,7 +72,8 @@ export const useFlag: UseFlagType = (flagCode, extra) => {
       return setDps(extraDps)
     } else {
       const hex = obj2Dp(flagItem, extra)
-      return setDps({ [flagCode]: hex, [extra.workModeCode]: WORK_MODE.SCENE, [extra.switchLedCode]: true })
+      const newHex = extra.isSolarLight ? ('01'+hex.substring(2)) : hex
+      return setDps({ [flagCode]: newHex, [extra.workModeCode]: WORK_MODE.SCENE, [extra.switchLedCode]: true })
     }
   }
   return [flagState, setFlagFn]

package/src/modules/flags/FlagPage.tsx

@@ -36,6 +36,7 @@ export interface FlagPageProps {
   isStringLight?: boolean
   isStripLight?: boolean
   isCeilingLight?: boolean
+  isSolarLight?: boolean
   isSupportMixScene?: boolean
   isSupportSceneStatus?: boolean
   drawToolLight?: {
@@ -203,7 +204,7 @@ const FlagPage = (props: { theme?: ThemeType }) => {
     }else{
       return flagMode?.flagMode && dps[params.workModeCode] === (params.isCeilingLight ? WORK_MODE.WHITE : params.isStripLight ? WORK_MODE.COLOUR : WORK_MODE.SCENE) && flagId === flagItem.id && dps[params.switchLedCode]
     }
-  }, [params.isSupportSceneStatus, sceneStatusId, dps[params.workModeCode], dps[params.switchLedCode], flagId])
+  }, [params.isSupportSceneStatus, sceneStatusId, dps[params.workModeCode], dps[params.switchLedCode], flagId, flagMode?.flagMode])
 
   return (
     <Page

package/src/newModules/energyConsumption/EnergyConsumptionActions.ts

@@ -72,10 +72,6 @@ const getDpResultByYearMonth = async (devId: string, addEleDpCode: string, dateS
   const date = dayjs(dateStr)
   const startDay = date.startOf('month').format('YYYYMMDD')
   const endDay = date.endOf('month').format('YYYYMMDD')
-  if (overDays(startDay, 365)) {
-    console.log("getDpResultByYearMonth overDays true")
-    return []
-  }
   const res = await getDataWithSpecified(devId, addEleDpCode, startDay, endDay, 'sum')
   if (!isEmpty(res) && res.result) {
     const dayList = res.result

package/src/newModules/energyConsumption/EnergyConsumptionChart.tsx

@@ -184,7 +184,7 @@ const EnergyConsumptionChart = (props: { theme?: ThemeType }) => {
                 </View>
             ) : (
                 state.chartData.length > 0 && !state.loading &&
-                <NewBarChart height={400} data={state.chartData} price={state.price}
+                <NewBarChart height={cx(400)} data={state.chartData} price={state.price}
                              unit={unit}/>
             )
           }

package/src/newModules/mood/Interface.ts

@@ -87,6 +87,7 @@ export interface LightCategory {
   isMatterLight?: boolean;
   isCeilingFan?: boolean;
   isUVCFan?: boolean;
+  isSolarLight?: boolean;
 }
 export interface DefMoodOption extends LightCategory{
   isSupportColor: boolean;

package/src/newModules/mood/MoodActions.ts

@@ -128,17 +128,9 @@ export const getRemoteMoodList = async (
         data: result.data.map((item, index) => remoteMoodInfo2MoodUIState(item, index, option)),
       };
     }
-    const moodUIData = res.data.map((item, index) => remoteMoodInfo2MoodUIState(item, index, option)).filter(item => {
-      if (!option.isSupportTemperature) {
-        const isContainTemperature = item.mainLamp?.nodes?.some(node => !node.isColorNode && node.colorTemp > 0) || false
-        return !isContainTemperature;
-      } else {
-        return true
-      }
-    });
     return {
       success: true,
-      data: moodUIData,
+      data: res.data.map((item, index) => remoteMoodInfo2MoodUIState(item, index, option)),
     };
   } else {
     const res = await NativeApi.getJson(devId, moodFeatureId);
@@ -187,7 +179,7 @@ export const useMoodScene = (params: MoodPageParams): [MoodInfo, (moodInfo: Mood
       const { mainLamp, secondaryLamp } = moodInfo
       if (params.isMixLight || mainLamp?.nodes?.length) {
         const mainHex = getMoodDp(params.isCeilingLight ? {...moodInfo, id: mainLamp.id!} : moodInfo, params);
-        mainDps[params.mainDp] = mainHex
+        mainDps[params.mainDp] = params.isSolarLight ? ('01' + mainHex.substring(2)) : mainHex
         mainDps[params.mainWorkMode] = WorkMode.Scene;
         mainDps[params.mainSwitch] = true;
       }
@@ -207,7 +199,7 @@ export const useMoodScene = (params: MoodPageParams): [MoodInfo, (moodInfo: Mood
         }
         setDps(secondaryDps).then()
       }
-      mainLamp[params.switchLedDp] = true 
+      mainLamp[params.switchLedDp] = true
     }
     return setDps(mainDps)
   };

package/src/newModules/mood/MoodInfo.ts

@@ -206,6 +206,13 @@ function getOnlyRGBDefSceneList(): RemoteMoodInfo[] {
       t: 0,
       e: false,
     },
+    {
+      n: I18n.getLang('mesh_device_detail_lighting_white_mode'),
+      i: '0646460100000000000003e8000046460100000000000003e8019046460100000000000003e803e8',
+      s: '',
+      t: 0,
+      e: false,
+    },
     ...defColorSceneList,
   ];
 }