@ledvance/ui-biz-bundle 1.1.120 → 1.1.122

package/package.json

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

package/src/newModules/energyConsumption/EnergyConsumptionPage.tsx

@@ -122,7 +122,7 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
   }, [state.totalElectricity, state.energyGeneration.totalElectricity])
 
   useUpdateEffect(() =>{
-    if(totalElectricity > 0 && timeZoneCity){
+    if(totalElectricity >= 0 && timeZoneCity){
       const letOut = carbonDioxideEmission(timeZoneCity, countryAndRegion) || 0
       state.co2Saved = localeNumber((letOut * totalElectricity) / 1000, 4)
     }

package/src/newModules/energyConsumption/component/EnergyModal.tsx

@@ -12,7 +12,7 @@ import ThemeType from '@ledvance/base/src/config/themeType'
 import dayjs from "dayjs";
 import {EnergyHistory} from "../EnergyConsumptionActions";
 
-const { convertX: cx, height } = Utils.RatioUtils
+const { convertX: cx, height, statusBarHeight } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
 
 export const UnitList = [
@@ -264,7 +264,7 @@ const EnergyModal = (props: EnergyModalProps) => {
           </View>
         ),
         wrapperStyle: {
-          height: height - cx(40),
+          height: height - statusBarHeight - cx(40),
           backgroundColor: props.theme?.global.background
         },
         footer: (<View style={{ backgroundColor: props.theme?.global.background}}></View>),
@@ -326,7 +326,7 @@ const EnergyModal = (props: EnergyModalProps) => {
             <Text style={{ color: props.theme?.button.primary, fontSize: cx(16) }}>{props.confirmText}</Text>
           </TouchableOpacity>
         </View>
-        <View style={{ height: height - cx(100), paddingHorizontal: cx(16), backgroundColor: props.theme?.global.background }}>
+        <View style={{ height: height - statusBarHeight - cx(100), paddingHorizontal: cx(16), backgroundColor: props.theme?.global.background }}>
           {getContent()}
         </View>
       </ScrollView>

package/src/newModules/mood/MoodActions.ts

@@ -98,8 +98,8 @@ export const getRemoteMoodList = async (
 ) => {
   const isFeature = !(option.isCeilingLight || option.isStringLight || option.isStripLight);
   const moodFeatureId = isFeature ? (option.isMixLight ? MixLightSceneListFeatureId : SceneFeatureId) : (option.isCeilingLight ? SceneFeatureId : featureId)
+  const defScene = getDefMoodList(option)
   if (isRefresh){
-    const defScene = getDefMoodList(option)
     const res = await setRemoteMoodList(devId, isFeature, defScene, featureId)
     if (res.success){
       return {
@@ -117,7 +117,7 @@ export const getRemoteMoodList = async (
       const result = await setRemoteMoodList(
         devId,
         isFeature,
-        getDefMoodList(option),
+        defScene,
         moodFeatureId
       );
       if (!result.success) {
@@ -125,7 +125,7 @@ export const getRemoteMoodList = async (
       }
       return {
         success: true,
-        data: result.data.map((item, index) => remoteMoodInfo2MoodUIState(item, index, option)),
+        data: defScene.map((item, index) => remoteMoodInfo2MoodUIState(item, index, option)),
       };
     }
     return {
@@ -144,12 +144,11 @@ export const getRemoteMoodList = async (
       };
     } else {
       if (res.msg?.includes('资源未找到') || !isNormalData) {
-        const defaultScene = getDefMoodList(option);
-        const res = await setRemoteMoodList(devId, isFeature, defaultScene, moodFeatureId);
+        const res = await setRemoteMoodList(devId, isFeature, defScene, moodFeatureId);
         if (res.success) {
           return {
             success: true,
-            data: defaultScene.map((item, index) =>
+            data: defScene.map((item, index) =>
               remoteMoodInfo2MoodUIState(item, index, option)
             ),
           };