Переглянути джерело

방이름 변경 관련 수정

jslee(madeinlab) 3 роки тому
батько
коміт
376e81ccf7
22 змінених файлів з 130 додано та 136 видалено
  1. 1 1
      WallPadCall/src/main/java/kr/co/icontrols/callengine/pstn/PSTNController.java
  2. 2 0
      WallPadCall/src/main/java/kr/co/icontrols/callengine/pstn/PSTNSerialManager.java
  3. 2 0
      WallPadCall/src/main/java/kr/co/icontrols/callengine/subphone/SubPhoneSerialManager.java
  4. 2 0
      WallPadCall/src/main/java/kr/co/icontrols/callengine/subwallpad/SubWallPadSerialManager.java
  5. 5 3
      WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/MainActivity.java
  6. 4 2
      WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/declare/Global.java
  7. 1 1
      WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/subwallpadscreen/TalkFront_SubWallPad.java
  8. 1 1
      WallPadEnergyCtrl/src/main/java/kr/co/icontrols/wallpadenergyctrl/screen/VIPIcEnergyMgrScreen.java
  9. 4 2
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/MainActivity.java
  10. 6 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/data/AirconData.java
  11. 6 0
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/data/HeatingData.java
  12. 4 0
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/data/LightData.java
  13. 1 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_aircon/KnxSystemAirconMainScreen.java
  14. 1 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_heating/HeatingV2MainScreen.java
  15. 5 4
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_light/LightKnxMainScreen.java
  16. 6 0
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HeatingV2PopupTestScreen.java
  17. 6 0
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HeatingV2TestScreen.java
  18. 7 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/KnxSystemAirconMainTestScreen.java
  19. 6 0
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/KnxSystemAirconPopupTestScreen.java
  20. 7 5
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/LightKnxMainTestScreen.java
  21. 7 5
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/LightKnxPopupTestScreen.java
  22. 46 108
      WallPadMultiControlService/src/main/java/kr/co/icontrols/wallpadmulticontrolservice/DataSenderService.java

+ 1 - 1
WallPadCall/src/main/java/kr/co/icontrols/callengine/pstn/PSTNController.java

@@ -378,7 +378,7 @@ public class PSTNController {
             if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
 //                ((MainActivity) mContext).sendHandlerMsg(IGW300CMD.AUDIO_PSTN_REJECT, 0, 0);   // 핸들러로 동작시니키, 메시지가 전달되는 지연이 발생한다.
 
-                if (ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101 || ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101_I
+                if (ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101 || ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101_I || ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101_I_LX2
                         || ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101K || ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101K_I
                         || ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101_I_OCF) {
                     ((MainActivity) mContext).sendPSTNRingEndBR();

+ 2 - 0
WallPadCall/src/main/java/kr/co/icontrols/callengine/pstn/PSTNSerialManager.java

@@ -1825,6 +1825,7 @@ public class PSTNSerialManager extends Service {
             switch (nModelType) {
                 case MODEL_TYPE.IHN_D101:
                 case MODEL_TYPE.IHN_D101_I:
+                case MODEL_TYPE.IHN_D101_I_LX2:
                 case MODEL_TYPE.IHN_1010GL:
                 case MODEL_TYPE.IHN_1010GL_I:
                 case MODEL_TYPE.IHN_D101K:
@@ -1837,6 +1838,7 @@ public class PSTNSerialManager extends Service {
 
                 case MODEL_TYPE.IHN_1010:
                 case MODEL_TYPE.IHN_1010_I:
+                case MODEL_TYPE.IHN_1010_I_LX2:
                 case MODEL_TYPE.IHN_1030_I:
                 case MODEL_TYPE.IHN_1040:
                 case MODEL_TYPE.IHN_1040_I:

+ 2 - 0
WallPadCall/src/main/java/kr/co/icontrols/callengine/subphone/SubPhoneSerialManager.java

@@ -2879,6 +2879,7 @@ public class SubPhoneSerialManager extends Service {
             switch (nModelType) {
                 case MODEL_TYPE.IHN_D101:
                 case MODEL_TYPE.IHN_D101_I:
+                case MODEL_TYPE.IHN_D101_I_LX2:
                 case MODEL_TYPE.IHN_1010GL:
                 case MODEL_TYPE.IHN_1010GL_I:
                 case MODEL_TYPE.IHN_D101K:
@@ -2891,6 +2892,7 @@ public class SubPhoneSerialManager extends Service {
 
                 case MODEL_TYPE.IHN_1010:
                 case MODEL_TYPE.IHN_1010_I:
+                case MODEL_TYPE.IHN_1010_I_LX2:
                 case MODEL_TYPE.IHN_1030_I:
                 case MODEL_TYPE.IHN_1040:
                 case MODEL_TYPE.IHN_1040_I:

+ 2 - 0
WallPadCall/src/main/java/kr/co/icontrols/callengine/subwallpad/SubWallPadSerialManager.java

@@ -462,6 +462,7 @@ public class SubWallPadSerialManager extends Service {
             switch (nModelType) {
                 case MODEL_TYPE.IHN_D101:
                 case MODEL_TYPE.IHN_D101_I:
+                case MODEL_TYPE.IHN_D101_I_LX2:
                 case MODEL_TYPE.IHN_1010GL:
                 case MODEL_TYPE.IHN_1010GL_I:
                 case MODEL_TYPE.IHN_D101K:
@@ -474,6 +475,7 @@ public class SubWallPadSerialManager extends Service {
 
                 case MODEL_TYPE.IHN_1010:
                 case MODEL_TYPE.IHN_1010_I:
+                case MODEL_TYPE.IHN_1010_I_LX2:
                 case MODEL_TYPE.IHN_1030_I:
                 case MODEL_TYPE.IHN_1040:
                 case MODEL_TYPE.IHN_1040_I:

+ 5 - 3
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/MainActivity.java

@@ -384,6 +384,7 @@ public class MainActivity extends WpadActivity {
 
             if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101) LOG_INFO("[onCreate] Model Type [IHN_D101]");
             else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I) LOG_INFO("[onCreate] Model Type [IHN_D101-I]");
+            else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_LX2) LOG_INFO("[onCreate] Model Type [IHN_D101-I_LX2]");
             else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_OCF) LOG_INFO("[onCreate] Model Type [IHN_D101-I-OCF]");
             else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010GL) LOG_INFO("[onCreate] Model Type [IHN_1010GL]");
             else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010GL_I) LOG_INFO("[onCreate] Model Type [IHN_1010GL-I]");
@@ -399,6 +400,7 @@ public class MainActivity extends WpadActivity {
                 if (ConfigValues.eWallPadType == WALLPADTYPE.MAIN) LOG_INFO("[onCreate] Model Type [IHN_1010-I]");
                 else LOG_INFO("[onCreate] Model Type [IHN_1010-IS]"); // 서브월패드
             }
+            else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010_I_LX2) LOG_INFO("[onCreate] Model Type [IHN_1010-I-LX2]");
             else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1030_I) LOG_INFO("[onCreate] Model Type [IHN_1030-I]");
             else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1040) LOG_INFO("[onCreate] Model Type [IHN_1040]");
             else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1040_I) LOG_INFO("[onCreate] Model Type [IHN_1040-I]");
@@ -3724,7 +3726,7 @@ public class MainActivity extends WpadActivity {
         try {
             LOG_INFO("[saveFrontPicture]");
             if (mFrontCamera != null) {
-                if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101 || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I
+                if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101 || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_LX2
                         || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K_I
                         || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_OCF) {
                     mFrontCamera.takePicture(null, null, mPicture_IHND101);
@@ -4584,7 +4586,7 @@ public class MainActivity extends WpadActivity {
                 case IGW300CMD.AUDIO_PSTN_WALLPAD:
                     Log.d(TAG, "[MainHandler] AUDIO_PSTN_WALLPAD");
                     Log.d(TAG, "[MainHandler] ConfigValues.DEVICE_MODELTYPE [" + ConfigValues.DEVICE_MODELTYPE + "]");
-                    if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101 || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I
+                    if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101 || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_LX2
                             || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K_I
                             || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_OCF)
                     {
@@ -4623,7 +4625,7 @@ public class MainActivity extends WpadActivity {
 
                 case IGW300CMD.AUDIO_PSTN_REJECT:
                     Log.d(TAG, "[MainHandler] AUDIO_PSTN_REJECT");
-                    if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101 || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I
+                    if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101 || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_LX2
                             || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K_I
                             || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_OCF) {
                         sendPSTNRingEndBR();

+ 4 - 2
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/declare/Global.java

@@ -2084,6 +2084,7 @@ public final class Global {
             switch (nModelType) {
                 case MODEL_TYPE.IHN_D101:
                 case MODEL_TYPE.IHN_D101_I:
+                case MODEL_TYPE.IHN_D101_I_LX2:
                 case MODEL_TYPE.IHN_1010GL:
                 case MODEL_TYPE.IHN_1010GL_I:
                 case MODEL_TYPE.IHN_D101K:
@@ -2096,6 +2097,7 @@ public final class Global {
 
                 case MODEL_TYPE.IHN_1010:
                 case MODEL_TYPE.IHN_1010_I:
+                case MODEL_TYPE.IHN_1010_I_LX2:
                 case MODEL_TYPE.IHN_1030_I:
                 case MODEL_TYPE.IHN_1040:
                 case MODEL_TYPE.IHN_1040_I:
@@ -2131,7 +2133,7 @@ public final class Global {
         try {
             Log.i(TAG, "[applyDerivedType] nModelType [" + nModelType + "]");
             // 모델에 따른 설정정보를 정의한다.
-            if (nModelType == MODEL_TYPE.IHN_D101 || nModelType == MODEL_TYPE.IHN_D101_I
+            if (nModelType == MODEL_TYPE.IHN_D101 || nModelType == MODEL_TYPE.IHN_D101_I || nModelType == MODEL_TYPE.IHN_D101_I_LX2
                     || nModelType == MODEL_TYPE.IHN_D101K || nModelType == MODEL_TYPE.IHN_D101K_I
                     || nModelType == MODEL_TYPE.IHN_1010GL || nModelType == MODEL_TYPE.IHN_1010GL_I
                     || nModelType == MODEL_TYPE.IHN_1010GL_I_2443 || nModelType == MODEL_TYPE.IHN_1010GL_I_6410
@@ -2140,7 +2142,7 @@ public final class Global {
                 ConfigValues.bSubPhoneEnable = true;
                 ConfigValues.bWallPadCameraEnable = false;
             }
-            else if (nModelType == MODEL_TYPE.IHN_1010 || nModelType == MODEL_TYPE.IHN_1010_I
+            else if (nModelType == MODEL_TYPE.IHN_1010 || nModelType == MODEL_TYPE.IHN_1010_I || nModelType == MODEL_TYPE.IHN_1010_I_LX2
                     || nModelType == MODEL_TYPE.IHN_1030_I
                     || nModelType == MODEL_TYPE.IHN_1040 || nModelType == MODEL_TYPE.IHN_1040_I
                     || nModelType == MODEL_TYPE.IHN_1050 || nModelType == MODEL_TYPE.IHN_1050_I

+ 1 - 1
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/subwallpadscreen/TalkFront_SubWallPad.java

@@ -600,7 +600,7 @@ public class TalkFront_SubWallPad  extends WpadScreen implements SubWallPadEvent
         try {
             Log.d(TAG, "[showFrontCam] bOn [" + bOn + "], bBell [" + bBell + "]");
             MainActivity.mIOInterface.ctrlFrontCamPower(bOn);
-            if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010 || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010_I) {
+            if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010 || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010_I || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010_I_LX2) {
                 MainActivity.mIOInterface.selectFrontCam(bOn);
             }
             else {

+ 1 - 1
WallPadEnergyCtrl/src/main/java/kr/co/icontrols/wallpadenergyctrl/screen/VIPIcEnergyMgrScreen.java

@@ -327,7 +327,7 @@ public class VIPIcEnergyMgrScreen extends WpadScreen {
         // 2.2 영업샘플 모드 판단
         if (Common.GetDeviceSampleMode(context) == true) {
             //영업샘플 모드임!
-            OPERATION_MODE = Common.MODE_BUSINESS_SAMPLE;
+            //OPERATION_MODE = Common.MODE_BUSINESS_SAMPLE;
             DebugLogOutput("OPERATION_MODE = MODE_BUSINESS_SAMPLE");
 
         } else {

+ 4 - 2
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/MainActivity.java

@@ -412,8 +412,10 @@ public class MainActivity extends WpadActivity {
 		deviceSet.closeDB();
 		Log.d(TAG, "[Create] bRoomNameEditUse [" + bRoomNameEditUse + "]");
 
-		if (bRoomNameEditUse) GetRoomNameV2(); // 방명칭 수정 시나리오 적용
-		else GetRoomName();
+		GetRoomNameV2(); // 방명칭 수정 시나리오 적용
+
+		//if (bRoomNameEditUse) GetRoomNameV2(); // 방명칭 수정 시나리오 적용
+		//else GetRoomName();
 		//mMultiConentCheckHandler.sendEmptyMessage(0); // 멀티스위치 콘센트 유무 확인
 
 		// 4. Layout registration

+ 6 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/data/AirconData.java

@@ -11,6 +11,7 @@ public class AirconData implements Parcelable {
     private boolean support_fan;
     private boolean support_heating;
     private String data_seq;
+    private String title_name;
 
     protected AirconData(Parcel in) {
         aircon_status = in.readInt();
@@ -20,6 +21,7 @@ public class AirconData implements Parcelable {
         support_fan = in.readByte() != 0;
         support_heating = in.readByte() != 0;
         data_seq = in.readString();
+        title_name = in.readString();
     }
 
     public static final Creator<AirconData> CREATOR = new Creator<AirconData>() {
@@ -55,7 +57,9 @@ public class AirconData implements Parcelable {
     public String getData_seq() {
         return data_seq;
     }
-
+    public String getTitle_name() {
+        return title_name;
+    }
 
     @Override
 
@@ -78,5 +82,6 @@ public class AirconData implements Parcelable {
         dest.writeByte((byte) (support_fan ? 1 : 0));
         dest.writeByte((byte) (support_heating ? 1 : 0));
         dest.writeString(data_seq);
+        dest.writeString(title_name);
     }
 }

+ 6 - 0
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/data/HeatingData.java

@@ -13,6 +13,7 @@ public class HeatingData implements Parcelable {
     private boolean support_outsidetempuse;
     private boolean support_boiler;
     private String data_seq;
+    private String title_name;
 
     protected HeatingData(Parcel in) {
         support_setpoint05 = in.readByte() != 0;
@@ -24,6 +25,7 @@ public class HeatingData implements Parcelable {
         support_outsidetempuse = in.readByte() != 0;
         support_boiler = in.readByte() != 0;
         data_seq = in.readString();
+        title_name = in.readString();
     }
 
     public static final Creator<HeatingData> CREATOR = new Creator<HeatingData>() {
@@ -65,6 +67,9 @@ public class HeatingData implements Parcelable {
     public String getData_seq() {
         return data_seq;
     }
+    public String getTitle_name() {
+        return title_name;
+    }
 
 
     @Override
@@ -90,6 +95,7 @@ public class HeatingData implements Parcelable {
         dest.writeByte((byte) (support_outsidetempuse ? 1 : 0));
         dest.writeByte((byte) (support_boiler ? 1 : 0));
         dest.writeString(data_seq);
+        dest.writeString(title_name);
     }
 
 }

+ 4 - 0
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/data/LightData.java

@@ -12,6 +12,7 @@ public class LightData {
     private boolean liv_info_install;
     private int liv_info_lightcount;
     private String data_seq;
+    private String title_name;
 
     public boolean getMaster_info_fault() {
         return master_info_fault;
@@ -37,6 +38,9 @@ public class LightData {
     public String getData_seq() {
         return data_seq;
     }
+    public String getTitle_name() {
+        return title_name;
+    }
 
     @Override
 

+ 1 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_aircon/KnxSystemAirconMainScreen.java

@@ -610,13 +610,13 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
                     boolean bChangeManager = wallpadStatusData.GetRoomNameChangeByManager(define.ROOM_NAME_SYSTEMAIRCON);
                     if (bChangeUser || bChangeManager) {
                         mRoomNameList = wallpadStatusData.GetDevRoomNameList(define.ROOM_NAME_SYSTEMAIRCON);
-                        wallpadStatusData.closeDB();
                         for (int i = 0; i < mRoomNameList.length; i++) {
 //                            Log.d(TAG, "[onPopupResult] astrRoomTitle [" + i + "] = " + astrRoomTitle[i]);
                             Draw_TitleUpdate(i);
                         }
                         ((MainActivity)mContext).mRoomNameList_SystemAircon = mRoomNameList;
                     }
+                    wallpadStatusData.closeDB();
                 }
             }
         }

+ 1 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_heating/HeatingV2MainScreen.java

@@ -648,13 +648,13 @@ public class HeatingV2MainScreen extends WpadScreen {
                     boolean bChangeManager = wallpadStatusData.GetRoomNameChangeByManager(define.ROOM_NAME_HEATING);
                     if (bChangeUser || bChangeManager) {
                         astrRoomTitle = wallpadStatusData.GetDevRoomNameList(define.ROOM_NAME_HEATING);
-                        wallpadStatusData.closeDB();
                         for (int i = 0; i < astrRoomTitle.length; i++) {
 //                            Log.d(TAG, "[onPopupResult] astrRoomTitle [" + i + "] = " + astrRoomTitle[i]);
                             drawEntireRoomTitle(i);
                         }
                         ((MainActivity)mContext).mRoomNameList_Heating = astrRoomTitle;
                     }
+                    wallpadStatusData.closeDB();
                 }
                 if (OPERATION_MODE == Common.MODE_BUSINESS_SAMPLE) {
                     boolean bSample = intent.getBooleanExtra("SAMPLE_CTRL", false);

+ 5 - 4
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_light/LightKnxMainScreen.java

@@ -483,12 +483,12 @@ public class LightKnxMainScreen extends WpadScreen {
                     boolean bChangeManager = wallpadStatusData.GetRoomNameChangeByManager(define.ROOM_NAME_LIGHT);
                     if (bChangeUser || bChangeManager) {
                         astrRoomTitle = wallpadStatusData.GetDevRoomNameList(define.ROOM_NAME_LIGHT);
-                        wallpadStatusData.closeDB();
-                        for (int i = 0; i < astrRoomTitle.length; i++) {
+                        for (int i = 0; i < AllEMcount; i++) {
                             drawEntireRoomTitle(i);
                         }
                         ((MainActivity)mContext).mRoomNameList_Heating = astrRoomTitle;
                     }
+                    wallpadStatusData.closeDB();
                 }
             }
         }
@@ -504,7 +504,7 @@ public class LightKnxMainScreen extends WpadScreen {
         if (index < 0) return false;
         if (lightRooms == null) return false;
         if (lightRooms.length <= index) return false;
-        if (index < ((CurrentPageNum * 6) - 6) || ((CurrentPageNum * 6) - 1) < index) return false;
+        if (index < ((CurrentPageNum * 8) - 8) || ((CurrentPageNum * 8) - 1) < index) return false;
         return true;
     }
 
@@ -892,7 +892,8 @@ public class LightKnxMainScreen extends WpadScreen {
             }
             for (int j = startIdx; j < startIdx+ROOM_CNT; j++) {
                 if(j>=roomCount)    break;
-                lightRooms[j].setVisible(true);
+                if (lightRooms[j] != null)
+                    lightRooms[j].setVisible(true);
             }
 /*
             if (startIdx > 0 && startIdx % ROOM_CNT == 0) {

+ 6 - 0
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HeatingV2PopupTestScreen.java

@@ -195,6 +195,12 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
                 ROOM_POS[i] = Integer.valueOf(strDataSeq[i])-1;
             }
 
+            String titleName = heatingData.getTitle_name();
+            String[] strTitleName = titleName.split("_");
+            for (int i = 0; i < strDataSeq.length; i++) {
+                mRoomNameList[i] = strTitleName[i];
+            }
+
             DataClasses.HeatingV2.Info info = mData.heatingV2.Device.info;
             info.Support.MinSetTemp = 5;              // 지원하는 최저설정온도
             info.Support.MaxSetTemp = 40;             // 지원하는 최대설정온도

+ 6 - 0
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HeatingV2TestScreen.java

@@ -344,6 +344,12 @@ public class HeatingV2TestScreen extends WpadScreen {
                 }
             }
 
+            String titleName = heatingData.getTitle_name();
+            String[] strTitleName = titleName.split("_");
+            for (int i = 0; i < strDataSeq.length; i++) {
+                astrRoomTitle[i] = strTitleName[i];
+            }
+
             DataClasses.HeatingV2.Info info = mData.heatingV2.Device.info;
             info.Support.MinSetTemp     = 5;              // 지원하는 최저설정온도
             info.Support.MaxSetTemp     = 40;             // 지원하는 최대설정온도

+ 7 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/KnxSystemAirconMainTestScreen.java

@@ -305,6 +305,12 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
                 ROOM_POS[i] = Integer.valueOf(strDataSeq[i])-1;
             }
 
+            String titleName = airconData.getTitle_name();
+            String[] strTitleName = titleName.split("_");
+            for (int i = 0; i < strDataSeq.length; i++) {
+                mRoomNameList[i] = strTitleName[i];
+            }
+
             KnxSystemAircon.Info info = mData.systemAircon.Device.info;
             info.Support.MinSetTemp = 16; // 지원하는 최저 설정온도
             info.Support.MaxSetTemp = 30; // 지원하는 최대 설정온도
@@ -551,7 +557,7 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
                 updateData();
             }
         };
-        timer.schedule(TT, delay, 4000); //Timer 실행
+        timer.schedule(TT, delay, 3000); //Timer 실행
     }
 
 

+ 6 - 0
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/KnxSystemAirconPopupTestScreen.java

@@ -133,6 +133,12 @@ public class KnxSystemAirconPopupTestScreen extends WpadScreen {
                 ROOM_POS[i] = Integer.valueOf(strDataSeq[i])-1;
             }
 
+            String titleName = airconData.getTitle_name();
+            String[] strTitleName = titleName.split("_");
+            for (int i = 0; i < strDataSeq.length; i++) {
+                mRoomNameList[i] = strTitleName[i];
+            }
+
             KnxSystemAircon.Info info = mData.systemAircon.Device.info;
             info.Support.MinSetTemp = 16; // 지원하는 최저 설정온도
             info.Support.MaxSetTemp = 30; // 지원하는 최대 설정온도

+ 7 - 5
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/LightKnxMainTestScreen.java

@@ -293,6 +293,13 @@ public class LightKnxMainTestScreen extends WpadScreen {
             for (int i = 0; i < strDataSeq.length; i++) {
                 ROOM_POS[i] = Integer.valueOf(strDataSeq[i])-1;
             }
+
+            String titleName = lightData.getTitle_name();
+            String[] strTitleName = titleName.split("_");
+            for (int i = 0; i < strDataSeq.length; i++) {
+                mDefaultRoomNameList[i] = strTitleName[i];
+            }
+
             JSONArray livDataArray = jsonObject.getJSONArray("liv_data_array");
             JSONArray bedDataArray = jsonObject.getJSONArray("bed_data_array");
             JSONArray switchDataArray = jsonObject.getJSONArray("switch_data_array");
@@ -515,11 +522,6 @@ public class LightKnxMainTestScreen extends WpadScreen {
         myDong = addc.Dong;
         myHo = addc.Ho;
 
-        if (Integer.parseInt(myHo) > 2000) {
-            mDefaultRoomNameList = new String[]{"거실", "거실", "침실4", "침실1", "파우더룸", "침실2", "침실3", "복도1",
-                    "욕실1", "주방1", "세탁실", "욕실2", "간이주방", "욕실3", "테라스", "현관", "신발장", "창고", "화장실", "계단", "테라스", "키친룸", "세탁실", "간이주방", "욕실3"};
-        }
-
         // 1. Data Create
         DebugLogOutput("[Create] - Step1 : Data Create");
         OPERATION_MODE = operationMode;

+ 7 - 5
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/LightKnxPopupTestScreen.java

@@ -214,6 +214,13 @@ public class LightKnxPopupTestScreen extends WpadScreen {
             for (int i = 0; i < strDataSeq.length; i++) {
                 ROOM_POS[i] = Integer.valueOf(strDataSeq[i])-1;
             }
+
+            String titleName = lightData.getTitle_name();
+            String[] strTitleName = titleName.split("_");
+            for (int i = 0; i < strDataSeq.length; i++) {
+                mDefaultRoomNameList[i] = strTitleName[i];
+            }
+
             JSONArray livDataArray = jsonObject.getJSONArray("liv_data_array");
             JSONArray bedDataArray = jsonObject.getJSONArray("bed_data_array");
             JSONArray switchDataArray = jsonObject.getJSONArray("switch_data_array");
@@ -438,11 +445,6 @@ public class LightKnxPopupTestScreen extends WpadScreen {
         myDong = addc.Dong;
         myHo = addc.Ho;
 
-        if(Integer.parseInt(myHo)>2000){
-            mDefaultRoomNameList = new String[]{"거실", "거실", "침실4", "침실1", "파우더룸", "침실2", "침실3", "복도1",
-                    "욕실1", "주방1", "세탁실","욕실2","간이주방","욕실3","테라스","현관", "신발장", "창고", "화장실", "계단", "테라스", "키친룸","세탁실","간이주방","욕실3"};
-        }
-
         // 1. Data Create
         DebugLogOutput("[Create] - Step1 : Data Create");
         OPERATION_MODE = operationMode;

+ 46 - 108
WallPadMultiControlService/src/main/java/kr/co/icontrols/wallpadmulticontrolservice/DataSenderService.java

@@ -1412,7 +1412,9 @@ public class DataSenderService extends Service {
     }
 
     private JSONObject updateLight(int kind, int position) {
+        String [] astrRoomTitle = null;
         String strLight = "1_2_3_4_5_6_7_8_9_10_11_12_13_14_15_16_17_18_19_20";
+        String strRoomTitle = "";
         if (mKnxData == null) {
             deviceApiLoadLight();
             return null;
@@ -1430,6 +1432,17 @@ public class DataSenderService extends Service {
             String[] strValue = devSet.GetSettingData("UI순서");
             devSet.closeDB();
 
+            WallpadStatusData wallpadStatusData = new WallpadStatusData(this.getContext());
+            astrRoomTitle = wallpadStatusData.GetDevRoomNameList(define.ROOM_NAME_LIGHT);
+            wallpadStatusData.closeDB();
+            for (int i = 0; i < astrRoomTitle.length; i++) {
+                if(i==astrRoomTitle.length-1){
+                    strRoomTitle = strRoomTitle+astrRoomTitle[i];
+                }else {
+                    strRoomTitle = strRoomTitle + astrRoomTitle[i] + "_";
+                }
+            }
+
             //서버에서 설정된 UI 순서를 이용하도록 한다.
             if (strValue != null) {
                 strLight = strValue[1].substring((strValue[1].indexOf("조명(") + 3), (strValue[1].indexOf(")난방(")));
@@ -1461,6 +1474,7 @@ public class DataSenderService extends Service {
             responseObject.accumulate("liv_info_install", mKnxData.LivingRoom_EnergyMeter.Info.Install);
             responseObject.accumulate("liv_info_lightcount", livDataCount);
             responseObject.accumulate("data_seq", strLight);
+            responseObject.accumulate("title_name", strRoomTitle);
             JSONArray livDataArray = new JSONArray();
             for (int i = 0; i < livDataCount; i++) {
                 // build jsonObject
@@ -1521,19 +1535,31 @@ public class DataSenderService extends Service {
     }
 
     private JSONObject updateConcent(int kind, int position) {
-        int roomCount = mHeatingV2API.data.Device.info.RoomCount;
         JSONObject jsonObject = new JSONObject();
         return jsonObject;
     }
 
     private JSONObject updateHeating(int kind, int pos) {
         String strHeating = "1_2_3_4_5_6_7_8_9_10_11_12_13_14_15_16_17_18_19_20";
+        String [] astrRoomTitle = null;
+        String strRoomTitle = "";
         int roomCount = mHeatingV2API.data.Device.info.RoomCount;
         try {
             WallpadDeviceSet devSet = new WallpadDeviceSet(this.getContext());
             String[] strValue = devSet.GetSettingData("UI순서");
             devSet.closeDB();
 
+            WallpadStatusData wallpadStatusData = new WallpadStatusData(this.getContext());
+            astrRoomTitle = wallpadStatusData.GetDevRoomNameList(define.ROOM_NAME_HEATING);
+            wallpadStatusData.closeDB();
+            for (int i = 0; i < astrRoomTitle.length; i++) {
+                if(i==astrRoomTitle.length-1){
+                    strRoomTitle = strRoomTitle+astrRoomTitle[i];
+                }else {
+                    strRoomTitle = strRoomTitle + astrRoomTitle[i] + "_";
+                }
+            }
+
             // 현대건설 더 펜트하우스 서버에서 설정된 UI 순서를 이용하도록 한다.
             if (strValue != null) {
                 strHeating = strValue[1].substring((strValue[1].indexOf("난방(") + 3), (strValue[1].indexOf(")에어컨(")));
@@ -1572,6 +1598,8 @@ public class DataSenderService extends Service {
                 jsonObject.accumulate("boiler_error_code", mHeatingV2API.data.Boiler.ErrorCode);
             }
             jsonObject.accumulate("data_seq", strHeating);
+            jsonObject.accumulate("title_name", strRoomTitle);
+
 
             JSONArray dataArray = new JSONArray();
             if (kind == 0) {        //전체 응답
@@ -1685,12 +1713,25 @@ public class DataSenderService extends Service {
 
     private JSONObject updateKnxAircon(int kind, int pos) {
         String strAircon = "1_2_3_4_5_6_7_8_9_10_11_12_13_14_15_16_17_18_19_20";
+        String [] astrRoomTitle = null;
+        String strRoomTitle = "";
         int roomCount = mKnxSystemAirconAPI.data.Device.info.InsideAirconCount;
         try {
             WallpadDeviceSet devSet = new WallpadDeviceSet(this.getContext());
             String[] strValue = devSet.GetSettingData("UI순서");
             devSet.closeDB();
 
+            WallpadStatusData wallpadStatusData = new WallpadStatusData(this.getContext());
+            astrRoomTitle = wallpadStatusData.GetDevRoomNameList(define.ROOM_NAME_SYSTEMAIRCON);
+            wallpadStatusData.closeDB();
+            for (int i = 0; i < astrRoomTitle.length; i++) {
+                if(i==astrRoomTitle.length-1){
+                    strRoomTitle = strRoomTitle+astrRoomTitle[i];
+                }else {
+                    strRoomTitle = strRoomTitle + astrRoomTitle[i] + "_";
+                }
+            }
+
             // 서버에서 설정된 UI 순서를 이용하도록 한다.
             if (strValue != null) {
                 strAircon = strValue[1].substring((strValue[1].indexOf("에어컨(") + 4), (strValue[1].indexOf("))")));
@@ -1716,6 +1757,8 @@ public class DataSenderService extends Service {
             jsonObject.accumulate("menu", JSON.MENU.AIRCON);
             jsonObject.accumulate("aircon_status", mKnxSystemAirconAPI.data.Device.info.AirconStatus);
             jsonObject.accumulate("data_seq", strAircon);
+            jsonObject.accumulate("title_name", strRoomTitle);
+
             JSONArray dataArray = new JSONArray();
             if (kind == 0) {        //전체 응답
                 for (int i = 0; i < roomCount; i++) {
@@ -1875,12 +1918,6 @@ public class DataSenderService extends Service {
         return jsonObject;
     }
 
-    private JSONObject updateCurtain(int kind, int position) {
-        int roomCount = mHeatingV2API.data.Device.info.RoomCount;
-        JSONObject jsonObject = new JSONObject();
-        return jsonObject;
-    }
-
     private JSONObject updateRequest(int menu, int kind, int position) {
         try {
             if (menu == JSON.MENU.LIGHT) {
@@ -1952,7 +1989,6 @@ public class DataSenderService extends Service {
         String strResult = "";
         try {
             WallpadDeviceSet devSet = new WallpadDeviceSet(getApplicationContext());
-            int nResultPanelType = devSet.Get_DistributionPannelType_Info();
             int nConcentEnable = devSet.Get_Concent_Info();   // 콘센트 사용 유무
             String[] strDeviceSeqValue = devSet.GetSettingData("UI순서");
 
@@ -2726,105 +2762,6 @@ public class DataSenderService extends Service {
                     if (mHeating.eachRoom[i].setTemper != mHeatingV2API.data.Device.Room[i].SetTemp) {
                         bChangeUnitState = true;
                     }
-
-                    if (bChangeUnitState == true) {
-                        Log.d(TAG, "[checkChangedHeating] temper old_mode : " + mHeating.eachRoom[i].mode + " , new_mode : " + mHeatingV2API.data.Device.Room[i].Mode);
-                        Log.d(TAG, "[checkChangedHeating] temper old_set : " + mHeating.eachRoom[i].setTemper + " , new_set : " + mHeatingV2API.data.Device.Room[i].SetTemp);
-                        Log.d(TAG, "[checkChangedHeating] temper old_temer : " + old_temer + " , new_temer : " + new_temer);
-                        // 데이터 전송
-                        String mode = "";
-
-                        switch (mHeatingV2API.data.Device.Room[i].Mode) {
-                            case MODE.HeatingON:
-                                mode = "on";
-                                break;
-                            case MODE.HeatingOFF:
-                                mode = "off";
-                                break;
-                            case MODE.Outing:
-                                mode = "away";
-                                break;
-                            case MODE.Sleep:
-                                mode = "sleep";
-                                break;
-                            case MODE.Reservation:
-                                mode = "schedule";
-                                break;
-                            case MODE.Pause:
-                                mode = "pause";
-                                break;
-                            default:
-                                break;
-                        }
-
-                        if (bChangeUnitState) {
-                            Log.i(TAG, "[checkChangedHeating] room[" + i + "] temper changed!!!");
-                            bChangeTotalState = true;
-                        } else {
-                            Log.w(TAG, "[checkChangedHeating] room[" + i + "] temper is not changed!!!");
-                        }
-
-                        JSONArray errorArray = new JSONArray();
-
-                        if (mHeatingV2API.data.Device.Room[i].Error.bRoomComm) {
-                            errorArray.put("thermostat_comm_fail");
-                        }
-                        if (mHeatingV2API.data.Device.Room[i].Error.bRoomTempSensor) {
-                            errorArray.put("thermostat_thermo_sensor_error");
-                        }
-                        if (mHeatingV2API.data.Device.Room[i].Error.bRoomSystem) {
-                            errorArray.put("thermostat_system_error");
-                        }
-                        if (mHeatingV2API.data.Device.Room[i].Error.bMainTempSensor) {
-                            errorArray.put("valve_thermo_sensor_error");
-                        }
-                        if (mHeatingV2API.data.Device.Room[i].Error.bMainSystem) {
-                            errorArray.put("valve_system_error");
-                        }
-                        if (mHeatingV2API.data.Device.Room[i].Error.bBoiler) {
-                            errorArray.put("boiler_error");
-                        }
-                        if (mHeatingV2API.data.Device.Room[i].Error.bLeak) {
-                            errorArray.put("water_leakage_detection");
-                        }
-                        if (mHeatingV2API.data.Device.Room[i].Error.bEtc) {
-                            errorArray.put("etc_error");
-                        }
-
-                        JSONArray reserveArray = new JSONArray();
-                        for (int j = 0; j < 24; j++) {
-                            if (mHeatingV2API.data.Device.Room[i].Reservation.getSchedule(j)) {
-                                reserveArray.put(j);
-                            }
-                        }
-                        // build jsonObject
-                        JSONObject jsonObject = new JSONObject();
-                        try {
-                            String roomName;
-                            if (i == 0) {
-                                roomName = "living_room";
-                            } else {
-                                roomName = "room" + i;
-                            }
-                            jsonObject.accumulate("roomNumber", roomName);
-                            jsonObject.accumulate("mode", mode);
-                            jsonObject.accumulate("valveState", mHeatingV2API.data.Device.Room[i].bValveStatus == true ? "on" : "off");
-                            jsonObject.accumulate("setTemperature", mHeatingV2API.data.Device.Room[i].SetTemp);
-                            jsonObject.accumulate("setUnit", "0.5");
-                            jsonObject.accumulate("currentTemperature", mHeatingV2API.data.Device.Room[i].NowTemp);
-                            jsonObject.accumulate("sleepDuration", getTimeData(mHeatingV2API.data.Device.Room[i].Sleep.getTime()));
-                            jsonObject.accumulate("sleepTemperature", mHeatingV2API.data.Device.Room[i].Sleep.getTempDouble());
-                            jsonObject.accumulate("reservation", reserveArray);
-                            if (errorArray.length() > 0) {
-                                jsonObject.accumulate("errorCode", errorArray);
-                            } else {
-                                jsonObject.accumulate("errorCode", JSONObject.NULL);
-                            }
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-                        SendData("icon", "controller", "heating", "each_control", jsonObject, 2);
-                    }
                 }
 
                 //데이터 저장
@@ -3111,7 +3048,8 @@ public class DataSenderService extends Service {
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-            } else if (strActionName.equals(BrID.BR_HEATING)) {
+            }
+            else if (strActionName.equals(BrID.BR_HEATING)) {
                 //				Log.d(TAG, "*********************   BR DataSenderService BR_HEATING   ********************");
                 checkChangedHeating();
             } else if (strActionName.equals(BrID.BR_AIRCON)) {