Pārlūkot izejas kodu

[WallPadHomeCtrl]
1. 에너지미터와 기본조명 같이 사용 시, 해당 연결된 정보에 따라 올려주도록 수정
2. 버전업
-> 2022.01.12.01 -> 2022.08.22.01
3. 최신 APK 등록

jglee 2 gadi atpakaļ
vecāks
revīzija
523f334d4d

BIN
10_Release/WallPadHomeCtrl.apk


+ 1 - 1
WallPadHomeCtrl/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadhomectrl"
     android:versionCode="17"
-    android:versionName="2022.01.12.01">
+    android:versionName="2022.08.22.01">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

+ 10 - 5
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_light/LightHdcLightEnergyMeterMainScreen.java

@@ -361,7 +361,8 @@ public class LightHdcLightEnergyMeterMainScreen extends WpadScreen {
 
         // 연결된 조명 디바이스 개수 파악
         nIntLightRMCnt = 1;   // 거실조명 릴레이는 1개로 고정
-        mEnergyMeteRMCnt = mEnergyMeterAPI.data.RoomCnt;   // 조명이 있는 멀티스위치 개수 (일단 모두 조명이 있는것으로 가정한다)
+        if(mEnergyMeterAPI!=null && mEnergyMeterAPI.data!=null)
+            mEnergyMeteRMCnt = mEnergyMeterAPI.data.RoomCnt;   // 조명이 있는 멀티스위치 개수 (일단 모두 조명이 있는것으로 가정한다)
         nTotalRMCnt = nIntLightRMCnt + mEnergyMeteRMCnt;
 
         Util_MakeLightDeviceTable();
@@ -1286,11 +1287,15 @@ public class LightHdcLightEnergyMeterMainScreen extends WpadScreen {
         }
 
         if (nDevKind == LightHdcLightEnergyMeterMainScreen.DEV_KIND.MULTISWITCH || nDevKind == LightHdcLightEnergyMeterMainScreen.DEV_KIND.ALL) {
-            for (int i = 0; i < mEnergyMeterData.RoomCnt; i++) {
-                if (Util_RoomLightStatusCheck((byte) i, LightHdcLightEnergyMeterMainScreen.DEV_KIND.MULTISWITCH))
-                    Draw_LightStatusChange(i, true, LightHdcLightEnergyMeterMainScreen.DEV_KIND.MULTISWITCH);
-                else Draw_LightStatusChange(i, false, LightHdcLightEnergyMeterMainScreen.DEV_KIND.MULTISWITCH);
+            if(mEnergyMeterData!=null && mEnergyMeterData.RoomCnt > 0)
+            {
+                for (int i = 0; i < mEnergyMeterData.RoomCnt; i++) {
+                    if (Util_RoomLightStatusCheck((byte) i, LightHdcLightEnergyMeterMainScreen.DEV_KIND.MULTISWITCH))
+                        Draw_LightStatusChange(i, true, LightHdcLightEnergyMeterMainScreen.DEV_KIND.MULTISWITCH);
+                    else Draw_LightStatusChange(i, false, LightHdcLightEnergyMeterMainScreen.DEV_KIND.MULTISWITCH);
+                }
             }
+
         }
     }