@ledvance/group-ui-biz-bundle 1.0.86 → 1.0.88

package/package.json

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

package/src/modules/childLock/ChildLockPage.tsx

@@ -17,7 +17,7 @@ interface ChildLockConfig {
   childLock: boolean
 }
 
-export function useChildLock(): [boolean, (v: boolean) => Promise<Result<any>>] {
+export function useChildLock(): [boolean, (v: boolean, extraDps?: any, extraConfig?: any) => Promise<Result<any>>] {
   return useFeatureHook<ChildLockConfig, boolean>('childLock', false)
 }
 
@@ -88,7 +88,9 @@ const ChildLockPage = (props: { theme?: ThemeType }) => {
       <Spacer style={{ flex: 1 }} height={0} width={0} />
       <SwitchButton value={childLock} onValueChange={async v => {
         state.loading = true
-        await setChildLock(v)
+        await setChildLock(v, undefined, {
+          'controlLock': v
+        })
         state.loading = false
       } } />
     </View>

package/src/modules/energyConsumption/EnergyConsumptionActions.ts

@@ -78,10 +78,6 @@ const getDpResultByYearMonth = async (deviceIdGroup: string[], addEleDpCode: str
   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 promiseGroup = deviceIdGroup.map(devId => getDataWithSpecified(devId, addEleDpCode, startDay, endDay, 'sum').catch(error => ({error})))
   const res = await Promise.all(promiseGroup);
   // @ts-ignore
@@ -140,7 +136,7 @@ const getDpResultByDate = async (deviceIdGroup: string[], addEleDpCode: string,
         mergedData[day] += Number(isNumber(dayNum) ? dayNum : 0)
       })
     }
-  })
+  });
 
 
   const list: Array<OverviewItem> = []

package/src/modules/energyConsumption/EnergyConsumptionChart.tsx

@@ -183,7 +183,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/modules/flags/FlagActions.ts

@@ -75,7 +75,8 @@ export const useFlag: UseFlagType = (params) => {
         if (params.isStringLight){
           dps[getGlobalParamsDp('rgbic_linerlight_scene')] = moodDp
         }else{
-          dps[getGlobalParamsDp('scene_data')] = moodDp
+          const newMoodDp = params.isSolarLight ? ('01'+moodDp.substring(2)) : moodDp
+          dps[getGlobalParamsDp('scene_data')] = newMoodDp
         }
         dps[getGlobalParamsDp('work_mode')] = WorkMode.Scene
       }else{

package/src/modules/flags/FlagPage.tsx

@@ -30,6 +30,7 @@ export interface FlagPageProps {
   isStringLight?: boolean
   isCeilingLight?: boolean
   isMatterLight?: boolean
+  isSolarLight?: boolean
   isSupportTemperature?: boolean
   isSupportBrightness?: boolean
   switchLedCode: string

package/src/modules/mood_new/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/modules/mood_new/MoodActions.ts

@@ -70,8 +70,8 @@ export function useMoodScene(params: MoodPageParams): [SceneDataType, (value: Sc
         if (mainLamp?.nodes?.length) {
           const mainDp = getMoodDp(params.isCeilingLight ? ({...moodInfo.scene, id: mainLamp.id!}) : moodInfo.scene, params)
           if (mainDp && params.mainDp) {
-            dps[params.mainDp] = mainDp
-            dps[params.mainSwitch] = true 
+            dps[params.mainDp] = params.isSolarLight ? ('01' + mainDp.substring(2)) : mainDp;
+            dps[params.mainSwitch] = true
             dps[params.mainWorkMode] = WorkMode.Scene
             if (params.isUVCFan){
               dps[getGlobalParamsDp('fan_switch')] = mainLamp.fanEnable

package/src/modules/mood_new/MoodInfo.ts

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