|
@@ -234,7 +234,7 @@ public class LightHdcNEachMainScreen extends WpadScreen {
|
|
|
DebugLogOutput("OPERATION_MODE = MODE_NOMAL");
|
|
|
if (Device_ApiLoad(wpapi) >= 0) {
|
|
|
Device_Update(false, DEV_KIND.INTLIGHT, (byte) 0);
|
|
|
- Device_Update(false, DEV_KIND.MULTISWITCH, Common.INDEX_ALL);
|
|
|
+ //Device_Update(false, DEV_KIND.MULTISWITCH, Common.INDEX_ALL);
|
|
|
}
|
|
|
} else if (OPERATION_MODE == Common.MODE_BUSINESS_SAMPLE) {
|
|
|
DebugLogOutput("OPERATION_MODE = MODE_BUSINESS_SAMPLE");
|
|
@@ -1143,11 +1143,15 @@ public class LightHdcNEachMainScreen extends WpadScreen {
|
|
|
}
|
|
|
|
|
|
if (nDevKind == DEV_KIND.MULTISWITCH || nDevKind == DEV_KIND.ALL) {
|
|
|
- for (int i = 0; i < mMultiSWData.DeviceCnt; i++) {
|
|
|
- if (Util_RoomLightStatusCheck((byte) i, DEV_KIND.MULTISWITCH))
|
|
|
- Draw_LightStatusChange(i, true, DEV_KIND.MULTISWITCH);
|
|
|
- else Draw_LightStatusChange(i, false, DEV_KIND.MULTISWITCH);
|
|
|
+ if(mMultiSWData!=null)
|
|
|
+ {
|
|
|
+ for (int i = 0; i < mMultiSWData.DeviceCnt; i++) {
|
|
|
+ if (Util_RoomLightStatusCheck((byte) i, DEV_KIND.MULTISWITCH))
|
|
|
+ Draw_LightStatusChange(i, true, DEV_KIND.MULTISWITCH);
|
|
|
+ else Draw_LightStatusChange(i, false, DEV_KIND.MULTISWITCH);
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1155,8 +1159,9 @@ public class LightHdcNEachMainScreen extends WpadScreen {
|
|
|
* 방명칭 전체를 화면에 업데이트한다.
|
|
|
*/
|
|
|
private void Draw_TitleUpdate() {
|
|
|
- if (roomView == null) return;
|
|
|
-
|
|
|
+ if (roomView == null && mIntLightData ==null && mMultiSWData ==null) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
LivingTitleText.setText(mRoomNameList[0]);
|
|
|
for (int i = 0; i < TotalRoomCount; i++) {
|
|
|
roomView[i].TitleText.setText(mRoomNameList[i + 1]);
|