Ver Fonte

모델명 변경 ㅓ리

jslee(madeinlab) há 3 anos atrás
pai
commit
5214ecd01d
56 ficheiros alterados com 409 adições e 194 exclusões
  1. BIN
      ManagerSetting/libs/WallPadSupport.jar
  2. 2 2
      ManagerSetting/src/main/java/com/artncore/managersetting/dao/MainDatabaseManager.java
  3. 2 2
      ManagerSetting/src/main/java/com/artncore/managersetting/ui/activities/SetAddress.java
  4. 2 2
      ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/AdminPasswordResetFragment.java
  5. 5 5
      ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/AdminSettingFragment.java
  6. 1 1
      ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/CheckControllerFragment.java
  7. 1 1
      ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/SettingAdditionalFunctionFragment.java
  8. 3 3
      ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/SettingControllerFragment.java
  9. 2 2
      ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/SettingEMLivingRegiFrag.java
  10. 1 1
      ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/SettingEnergyManagementFragment.java
  11. 2 2
      ManagerSetting/src/main/java/kr/co/icontrols/v40ioctl/V40IF.java
  12. BIN
      WallPadAPI/libs/WallPadSupport.jar
  13. 5 5
      WallPadAPI/src/main/java/com/artncore/WallPadDataMgr/WallpadDeviceSet.java
  14. 1 1
      WallPadAPI/src/main/java/com/artncore/WallPadDataMgr/wallpaddbmgr.java
  15. 4 4
      WallPadAPI/src/main/java/com/artncore/wallpadapi/WallPadAPI.java
  16. BIN
      WallPadCall/libs/WallPadSupport.jar
  17. BIN
      WallPadConfig/libs/WallPadSupport.jar
  18. 2 2
      WallPadConfig/src/main/java/kr/co/icontrols/v40ioctl/V40IF.java
  19. 2 2
      WallPadConfig/src/main/java/kr/co/icontrols/v40ioctl/V40IOInterface.java
  20. 2 2
      WallPadConfig/src/main/java/kr/co/icontrols/v40ioctl/V40IOInterface2.java
  21. 3 3
      WallPadConfig/src/main/java/kr/co/icontrols/wallpadconfig/screen/ConfigSettingMainScreen.java
  22. BIN
      WallPadDevService/libs/WallPadSupport.jar
  23. 2 2
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/ServiceMain.java
  24. 2 2
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/DriverInterOpAPI.java
  25. 2 2
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/SmartKeyRfDoor_Controller.java
  26. 2 2
      WallPadDevService/src/main/java/kr/co/icontrols/v40ioctl/V40IOInterface.java
  27. 2 2
      WallPadDevService/src/main/java/kr/co/icontrols/v40ioctl/V40IOInterface2.java
  28. BIN
      WallPadHomeCtrl/libs/WallPadSupport.jar
  29. 1 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/MainActivity.java
  30. 2 2
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_aircon/KnxSystemAirconMainScreen.java
  31. 3 0
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_aircon/KnxSystemAirconPopupScreen.java
  32. 3 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_heating/HeatingV2MainScreen.java
  33. 113 57
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_light/LightKnxMainScreen.java
  34. 148 32
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_light/LightKnxPopupRoomScreen.java
  35. 6 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HeatingV2TestScreen.java
  36. 6 2
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/KnxSystemAirconMainTestScreen.java
  37. BIN
      WallPadMain/libs/WallPadSupport.jar
  38. 2 0
      WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/IOInterface.java
  39. 6 6
      WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/MainActivity.java
  40. 2 2
      WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/manual/MANUAL_MAIN.java
  41. 3 3
      WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/menu/CallSubMenuScreen.java
  42. 2 2
      WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/screen/MAIN.java
  43. 4 4
      WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/IconManager.java
  44. 2 2
      WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/ShortcutBox.java
  45. 18 0
      WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/WallPadiMAPUpgrade.java
  46. 20 20
      WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/iMapServer.java
  47. 1 1
      WallPadMultiControlService/src/main/java/kr/co/icontrols/wallpadmulticontrolservice/DataSenderService.java
  48. BIN
      WallPadOutmodeRun/libs/WallPadSupport.jar
  49. 1 1
      WallPadOutmodeRun/src/main/java/kr/co/icontrols/wallpadoutmoderun/screen/OutModeSecurityRun.java
  50. BIN
      WallPadSecurity/libs/WallPadSupport.jar
  51. 1 1
      WallPadSecurity/src/main/java/kr/co/icontrols/wallpadsecurity/manual/SetLinkCtr_Manual.java
  52. 1 1
      WallPadSecurity/src/main/java/kr/co/icontrols/wallpadsecurity/screen/PopupOutModeWaiting.java
  53. 3 3
      WallPadSecurity/src/main/java/kr/co/icontrols/wallpadsecurity/screen/SecurityMainScreen.java
  54. 2 2
      WallPadSecurity/src/main/java/kr/co/icontrols/wallpadsecurity/screen/SetLinkCtrlMainScreen.java
  55. BIN
      WallPadSupport/jar/WallPadSupport.jar
  56. 9 0
      WallPadSupport/src/main/java/kr/co/icontrols/wallpadsupport/Version.java

BIN
ManagerSetting/libs/WallPadSupport.jar


+ 2 - 2
ManagerSetting/src/main/java/com/artncore/managersetting/dao/MainDatabaseManager.java

@@ -1585,7 +1585,7 @@ public class MainDatabaseManager {
                         break;
 
                     case SETTING_ITEM_SUB_DEVICE_DOOR_CAMERA:
-                        if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I
+                        if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I || ModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
                                 || ModelType == Version.MODEL_TYPE.IHN_D101K || ModelType == Version.MODEL_TYPE.IHN_D101K_I
                                 || ModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
                         {
@@ -1730,7 +1730,7 @@ public class MainDatabaseManager {
 
                     case SETTING_ITEM_SUB_DEVICE_ENERGY_DEVICES:
                         if (ModelType == Version.MODEL_TYPE.IHN_1020GL
-                                || ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I
+                                || ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I || ModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
                                 || ModelType == Version.MODEL_TYPE.IHN_D101K || ModelType == Version.MODEL_TYPE.IHN_D101K_I
                                 || ModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
                         {

+ 2 - 2
ManagerSetting/src/main/java/com/artncore/managersetting/ui/activities/SetAddress.java

@@ -127,7 +127,7 @@ public class SetAddress extends Activity
                 else if (ModelType == Version.MODEL_TYPE.IHN_1020B_C) {
                     setContentView(R.layout.activity_set_address_a20_1280x800);
                 }
-                else if (ModelType == Version.MODEL_TYPE.IHN_1010 || ModelType == Version.MODEL_TYPE.IHN_1010_I) {
+                else if (ModelType == Version.MODEL_TYPE.IHN_1010 || ModelType == Version.MODEL_TYPE.IHN_1010_I || ModelType == Version.MODEL_TYPE.IHN_1010_I_LX2) {
                     setContentView(R.layout.activity_set_address_1010);
                 }
                 else if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I || ModelType == Version.MODEL_TYPE.IHN_D101_I_OCF) {
@@ -223,7 +223,7 @@ public class SetAddress extends Activity
         if (ModelType == Version.MODEL_TYPE.IHN_1020GL) {
             initView_GLE();
         }
-        else if (ModelType == Version.MODEL_TYPE.IHN_1010 || ModelType == Version.MODEL_TYPE.IHN_1010_I) {
+        else if (ModelType == Version.MODEL_TYPE.IHN_1010 || ModelType == Version.MODEL_TYPE.IHN_1010_I || ModelType == Version.MODEL_TYPE.IHN_1010_I_LX2) {
             initView_1010();
         }
         else if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101K || ModelType == Version.MODEL_TYPE.IHN_1010GL

+ 2 - 2
ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/AdminPasswordResetFragment.java

@@ -85,7 +85,7 @@ public class AdminPasswordResetFragment extends Fragment {
         btnWebReset.setOnClickListener(mButtonClick);
 
         sdbMent = (TextView)view.findViewById(R.id.sdb_password_init_ment);
-        if (Version.getModelType() != Version.MODEL_TYPE.IHN_D101 && Version.getModelType() != Version.MODEL_TYPE.IHN_D101K
+        if (Version.getModelType() != Version.MODEL_TYPE.IHN_D101 && Version.getModelType() != Version.MODEL_TYPE.IHN_D101K && Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I_LX2
                 && Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I && Version.getModelType() != Version.MODEL_TYPE.IHN_D101K_I
                 && Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I_OCF) {
             sdbMent.setVisibility(View.INVISIBLE);
@@ -161,7 +161,7 @@ public class AdminPasswordResetFragment extends Fragment {
                         dialog.dismiss();
 
                         // 분전반 에너지미터 비밀번호 초기화
-                        if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+                        if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                                 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                                 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF) {
                             /*if(sdbMent.getCurrentTextColor() == Color.BLACK)

+ 5 - 5
ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/AdminSettingFragment.java

@@ -120,7 +120,7 @@ public class AdminSettingFragment extends Fragment implements AdminSubMenu.SubMe
         }
         else {
             int modelType = Version.getModelType();
-            if (modelType == Version.MODEL_TYPE.IHN_1010 || modelType == Version.MODEL_TYPE.IHN_1010_I) {
+            if (modelType == Version.MODEL_TYPE.IHN_1010 || modelType == Version.MODEL_TYPE.IHN_1010_I || modelType == Version.MODEL_TYPE.IHN_1010_I_LX2) {
                 inputmenuItem = new String[menuItem.length-1]; // 1010의 경우에만 서브월패드 설정 화면 나오도록 함.
                 Log.d(TAG, "[onViewCreated] inputmenuItem.length [" + inputmenuItem.length + "]");
 
@@ -205,7 +205,7 @@ public class AdminSettingFragment extends Fragment implements AdminSubMenu.SubMe
 
             case SUB_MENU_IDX_LIVEM_CONCENT_REGI_SETTING:
             {
-                if (modelType == Version.MODEL_TYPE.IHN_D101 || modelType == Version.MODEL_TYPE.IHN_D101_I
+                if (modelType == Version.MODEL_TYPE.IHN_D101 || modelType == Version.MODEL_TYPE.IHN_D101_I || modelType == Version.MODEL_TYPE.IHN_D101_I_LX2
                         || modelType == Version.MODEL_TYPE.IHN_D101K || modelType == Version.MODEL_TYPE.IHN_D101K_I
                         || modelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
                 {
@@ -213,7 +213,7 @@ public class AdminSettingFragment extends Fragment implements AdminSubMenu.SubMe
                     getActivity().getSupportFragmentManager().beginTransaction()
                             .replace(R.id.menu_content, fragment).commit();
                 }
-                else if (modelType == Version.MODEL_TYPE.IHN_1010 || modelType == Version.MODEL_TYPE.IHN_1010_I) {
+                else if (modelType == Version.MODEL_TYPE.IHN_1010 || modelType == Version.MODEL_TYPE.IHN_1010_I || modelType == Version.MODEL_TYPE.IHN_1010_I_LX2) {
                     SettingSubWpdSettingFragment fragment = new SettingSubWpdSettingFragment();
                     getActivity().getSupportFragmentManager().beginTransaction()
                             .replace(R.id.menu_content, fragment).commit();
@@ -228,9 +228,9 @@ public class AdminSettingFragment extends Fragment implements AdminSubMenu.SubMe
 
             case SUB_MENU_IDX_SUBWPD_SETTING:
             {
-                if (modelType == Version.MODEL_TYPE.IHN_D101 || modelType == Version.MODEL_TYPE.IHN_D101_I
+                if (modelType == Version.MODEL_TYPE.IHN_D101 || modelType == Version.MODEL_TYPE.IHN_D101_I || modelType == Version.MODEL_TYPE.IHN_D101_I_LX2
                         || modelType == Version.MODEL_TYPE.IHN_D101K || modelType == Version.MODEL_TYPE.IHN_D101K_I
-                        || modelType == Version.MODEL_TYPE.IHN_1010 || modelType == Version.MODEL_TYPE.IHN_1010_I
+                        || modelType == Version.MODEL_TYPE.IHN_1010 || modelType == Version.MODEL_TYPE.IHN_1010_I || modelType == Version.MODEL_TYPE.IHN_1010_I_LX2
                         || modelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
                 {
                     SettingDebuggingFragment fragment = new SettingDebuggingFragment();

+ 1 - 1
ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/CheckControllerFragment.java

@@ -324,7 +324,7 @@ public class CheckControllerFragment extends Fragment {
         addControllerVO(Const.CONTROLLER_TYPE_BATH_PHONE);
         addControllerVO(Const.CONTROLLER_TYPE_KICHEN_TV);
 
-        if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I
+        if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I || ModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
                 || ModelType == Version.MODEL_TYPE.IHN_D101K || ModelType == Version.MODEL_TYPE.IHN_D101K_I
                 || ModelType == Version.MODEL_TYPE.IHN_D101_I_OCF) {
             addControllerVO(Const.CONTROLLER_TYPE_SMART_DIST);

+ 1 - 1
ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/SettingAdditionalFunctionFragment.java

@@ -189,7 +189,7 @@ public class SettingAdditionalFunctionFragment extends Fragment
             }
             //addControllerVO(ADDITIONAL_TYPE_HANDICAPPED); //장애인모드로써 평상시에는 사용하지 않음. 나중에 기능 추가되면 그떄 주석 해제 예정
             addControllerVO(ADDITIONAL_TYPE_CARGUEST);
-            if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I
+            if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I || ModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
                     || ModelType == Version.MODEL_TYPE.IHN_D101K || ModelType == Version.MODEL_TYPE.IHN_D101K_I
                     || ModelType == Version.MODEL_TYPE.IHN_D101_I_OCF) {
                 addControllerVO(ADDITIONAL_TYPE_BAND_LOCATION); // 일산3구역현장 - 밴드 위치 알림

+ 3 - 3
ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/SettingControllerFragment.java

@@ -255,7 +255,7 @@ public class SettingControllerFragment extends Fragment implements ControllerLis
                             typeCurrent = 3;
                         }*/
                     }
-                    else if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I
+                    else if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I || ModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
                             || ModelType == Version.MODEL_TYPE.IHN_D101K || ModelType == Version.MODEL_TYPE.IHN_D101K_I
                             || ModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
                     {
@@ -307,7 +307,7 @@ public class SettingControllerFragment extends Fragment implements ControllerLis
                 itemList.add(mActivity.getString(R.string.contoller_light_type_hdc_intlight_normal));
                 itemList.add(mActivity.getString(R.string.contoller_light_type_hdc_intlight_add_batchlight));
             }
-            else if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I
+            else if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I || ModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
                     || ModelType == Version.MODEL_TYPE.IHN_D101K || ModelType == Version.MODEL_TYPE.IHN_D101K_I
                     || ModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
             {
@@ -1298,7 +1298,7 @@ public class SettingControllerFragment extends Fragment implements ControllerLis
                             else if (itemName.equals("현산향일체형조명일괄소등병합형")) typeName = Const.LIGHT_CONTROLLER_TYPE_HDC_INTLIGHT_ADD_BATCHLIGHT;
                             else if (itemName.equals("스마트분전반조명")) typeName = Const.LIGHT_CONTROLLER_TYPE_SMART_DISTRIBUTION;
                         }
-                        else if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I
+                        else if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I || ModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
                                 || ModelType == Version.MODEL_TYPE.IHN_D101K || ModelType == Version.MODEL_TYPE.IHN_D101K_I
                                 || ModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
                         {

+ 2 - 2
ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/SettingEMLivingRegiFrag.java

@@ -153,7 +153,7 @@ public class SettingEMLivingRegiFrag extends Fragment implements SwitchButton.Sw
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-        if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I
+        if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I || ModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
                 || ModelType == Version.MODEL_TYPE.IHN_D101K || ModelType == Version.MODEL_TYPE.IHN_D101K_I
                 || ModelType == Version.MODEL_TYPE.IHN_D101_I_OCF) {
             mRootView= (View) inflater.inflate(R.layout.setting_em_livingroom_regi_container, container, false);
@@ -169,7 +169,7 @@ public class SettingEMLivingRegiFrag extends Fragment implements SwitchButton.Sw
         if (savedInstanceState != null) {}
 
         ScrollView mScrollView = null;
-        if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I
+        if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I || ModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
                 || ModelType == Version.MODEL_TYPE.IHN_D101K || ModelType == Version.MODEL_TYPE.IHN_D101K_I
                 || ModelType == Version.MODEL_TYPE.IHN_D101_I_OCF) {
             mScrollView = (ScrollView) view.findViewById(R.id.sv_em_livingroom_regi);

+ 1 - 1
ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/SettingEnergyManagementFragment.java

@@ -179,7 +179,7 @@ public class SettingEnergyManagementFragment extends Fragment
                 addControllerVO(ENERGY_TYPE_IDLE_POWER_SAVING_SWITCH); //대기전력 차단스위치
                 addControllerVO(ENERGY_TYPE_ENERGY_MODULE); //에너지 모듈
             }
-            else if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I
+            else if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I || ModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
                     || ModelType == Version.MODEL_TYPE.IHN_D101K || ModelType == Version.MODEL_TYPE.IHN_D101K_I
                     || ModelType == Version.MODEL_TYPE.IHN_D101_I_OCF) {
                 addControllerVO(ENERGY_TYPE_DISTRIBUTION_BOARD); // 분전반

+ 2 - 2
ManagerSetting/src/main/java/kr/co/icontrols/v40ioctl/V40IF.java

@@ -388,7 +388,7 @@ public class V40IF {
     public boolean setCameraConfigure(int nValue) {
         try {
             Log.i(TAG, "[setCameraConfigure] nValue [" + nValue+ "]");
-            if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+            if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                     || Version.getModelType() == MODEL_TYPE.IHN_1010GL || Version.getModelType() == MODEL_TYPE.IHN_1010GL_I
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_6410
@@ -424,7 +424,7 @@ public class V40IF {
     public boolean setCameraSUBConfigure(int nValue) {
         try {
             Log.i(TAG, "[setCameraSUBConfigure] nValue [" + nValue+ "]");
-            if (Version.getModelType() == MODEL_TYPE.IHN_1010_I || Version.getModelType() == MODEL_TYPE.IHN_1010 ) {
+            if (Version.getModelType() == MODEL_TYPE.IHN_1010_I || Version.getModelType() == MODEL_TYPE.IHN_1010 || Version.getModelType() == MODEL_TYPE.IHN_1010_I_LX2) {
                 if (Build.VERSION.SDK_INT > 23) {
                     if (mV40IOIF_NOUGAT == null) {
                         Log.i(TAG, "[setCameraSUBConfigure] mV40IOIF_NOUGAT is null!!");

BIN
WallPadAPI/libs/WallPadSupport.jar


+ 5 - 5
WallPadAPI/src/main/java/com/artncore/WallPadDataMgr/WallpadDeviceSet.java

@@ -140,7 +140,7 @@ public class WallpadDeviceSet extends wallpaddbmgr {
 				else if(GetData[1].indexOf("스마트분전반조명") > 0)  returnData[1] = LIGHT_TYPE_SMART_DISTRIBUTION;
 				else returnData[1] = LIGHT_TYPE_HDC_INTLIGHT_ADD_BATCHLIGHT;
 			}
-			else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I
+			else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I || mModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
 					|| mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
 					|| mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
 					|| mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410
@@ -262,7 +262,7 @@ public class WallpadDeviceSet extends wallpaddbmgr {
 		int[] returnData = {1, BATCH_TYPE_SMART, 3, 4};
 		Log.w(TAG, "[Get_BatchSW_Info] "+ Arrays.toString(GetData));
 
-		if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I
+		if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I || mModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
 				|| mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
 				|| mModelType == Version.MODEL_TYPE.IHN_1020GL
 				|| mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
@@ -298,7 +298,7 @@ public class WallpadDeviceSet extends wallpaddbmgr {
 				return returnData;
 			}
 
-			if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I
+			if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I || mModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
 					|| mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
 					|| mModelType == Version.MODEL_TYPE.IHN_1020GL
 					|| mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
@@ -1100,7 +1100,7 @@ public class WallpadDeviceSet extends wallpaddbmgr {
 						|| mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410) {
 					UpdateSettingData("subdev_list", "분전반", 0, "1(1:"+"분전반" + "(" + "사용안함" + ")종류(" + "사용안함" + ")");
 				}
-				else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I
+				else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I || mModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
 						|| mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
 						|| mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF) {
 					UpdateSettingData("subdev_list", "분전반", 0, "1(1:" + "분전반" + "(" + "사용함" + ")종류(" + "스마트분전반" + ")");
@@ -3263,7 +3263,7 @@ public class WallpadDeviceSet extends wallpaddbmgr {
 
 					//return Version.GATEWAY_MODEL.IGW_200;
 				}
-				else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I
+				else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I || mModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
 						|| mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
 						|| mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
 						|| mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410

+ 1 - 1
WallPadAPI/src/main/java/com/artncore/WallPadDataMgr/wallpaddbmgr.java

@@ -2188,7 +2188,7 @@ public class wallpaddbmgr {
                 }
             }
         }
-        else if (mModelType == Version.MODEL_TYPE.IHN_1010 || mModelType == Version.MODEL_TYPE.IHN_1010_I) {
+        else if (mModelType == Version.MODEL_TYPE.IHN_1010 || mModelType == Version.MODEL_TYPE.IHN_1010_I || mModelType == Version.MODEL_TYPE.IHN_1010_I_LX2) {
             for (int i = 0; i < iHN1010_DevicesSettingInitData.length; i++) {
                 Log.d(TAG, mModelType+"_DevicesSettingInitData! "+i);
                 InsertinitDeviceData("subdev_list"

+ 4 - 4
WallPadAPI/src/main/java/com/artncore/wallpadapi/WallPadAPI.java

@@ -164,7 +164,7 @@ public class WallPadAPI {
      */
     public int SetBatchSwitchStatus(boolean onoff) {
         try {
-            if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I
+            if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I || mModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
                     || mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
                     || mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
             {
@@ -273,7 +273,7 @@ public class WallPadAPI {
     public int GetBatchSwitchStatus() {
         int ret = -100;
         try {
-            if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I
+            if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I || mModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
                     || mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
                     || mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
             {
@@ -484,7 +484,7 @@ public class WallPadAPI {
                         return ret;
                     }
                 }
-                else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I
+                else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I || mModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
                         || mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
                         || mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
                         || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410
@@ -598,7 +598,7 @@ public class WallPadAPI {
                         return ret;
                     }
                 }
-                else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I
+                else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I || mModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
                         || mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
                         || mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
                         || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410

BIN
WallPadCall/libs/WallPadSupport.jar


BIN
WallPadConfig/libs/WallPadSupport.jar


+ 2 - 2
WallPadConfig/src/main/java/kr/co/icontrols/v40ioctl/V40IF.java

@@ -413,7 +413,7 @@ public class V40IF {
 
     public void Emergency_Type_Set() {
         WpdInterfaceOpen();
-        if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+        if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF) {
             Log.d(TAG, "[Emergency_Type_Set] V40 - D101 mode");
@@ -440,7 +440,7 @@ public class V40IF {
         WpdInterfaceOpen();
         WpdInterfaceControl(IOCTL_LEDNEMR_ONOFF, 0);
 
-        if (Version.getModelType() != Version.MODEL_TYPE.IHN_D101 && Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I
+        if (Version.getModelType() != Version.MODEL_TYPE.IHN_D101 && Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I && Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I_LX2
                 && Version.getModelType() != Version.MODEL_TYPE.IHN_D101K && Version.getModelType() != Version.MODEL_TYPE.IHN_D101K_I
                 && Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I_OCF) {
             WpdInterfaceControl(IOCTL_EMR_OFF, 0);

+ 2 - 2
WallPadConfig/src/main/java/kr/co/icontrols/v40ioctl/V40IOInterface.java

@@ -68,7 +68,7 @@ public class V40IOInterface {
 
 	public void Emergency_Type_Set() {
 		WpdInterfaceOpen();
-		if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+		if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
 				|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
 				|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF) {
 			Log.d(TAG, "[Emergency_Type_Set] V40 - D101 mode");
@@ -95,7 +95,7 @@ public class V40IOInterface {
 		WpdInterfaceOpen();
 		WpdInterfaceControl(IOCTL_LEDNEMR_ONOFF, 0);
 
-		if (Version.getModelType() != Version.MODEL_TYPE.IHN_D101 && Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I
+		if (Version.getModelType() != Version.MODEL_TYPE.IHN_D101 && Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I && Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I_LX2
 				&& Version.getModelType() != Version.MODEL_TYPE.IHN_D101K && Version.getModelType() != Version.MODEL_TYPE.IHN_D101K_I
 				&& Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I_OCF) {
 			WpdInterfaceControl(IOCTL_EMR_OFF, 0);

+ 2 - 2
WallPadConfig/src/main/java/kr/co/icontrols/v40ioctl/V40IOInterface2.java

@@ -238,7 +238,7 @@ public class V40IOInterface2 {
 
 	public void Emergency_Type_Set() {
 		WpdInterfaceOpen();
-		if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+		if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
 				|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
 				|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF) {
 			Log.d(TAG, "[Emergency_Type_Set] V40 - D101 mode");
@@ -265,7 +265,7 @@ public class V40IOInterface2 {
 		WpdInterfaceOpen();
 		WpdInterfaceControl(IOCTL_LEDNEMR_ONOFF, 0);
 
-		if (Version.getModelType() != Version.MODEL_TYPE.IHN_D101 && Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I
+		if (Version.getModelType() != Version.MODEL_TYPE.IHN_D101 && Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I && Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I_LX2
 				&& Version.getModelType() != Version.MODEL_TYPE.IHN_D101K && Version.getModelType() != Version.MODEL_TYPE.IHN_D101K_I
 				&& Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I_OCF) {
 			WpdInterfaceControl(IOCTL_EMR_OFF, 0);

+ 3 - 3
WallPadConfig/src/main/java/kr/co/icontrols/wallpadconfig/screen/ConfigSettingMainScreen.java

@@ -334,7 +334,7 @@ public class ConfigSettingMainScreen extends WpadScreen {
 				SettingData.add(data);
 			}
 
-			if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+			if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
 					|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
 					|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF)
 			{
@@ -422,7 +422,7 @@ public class ConfigSettingMainScreen extends WpadScreen {
 				}
 			}
 
-			if ((Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+			if ((Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
 					|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
 					|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF)
 					&& (nDistributionPanelType == Version.DISTRIBUTION_MODEL.SMART_DIST))
@@ -915,7 +915,7 @@ public class ConfigSettingMainScreen extends WpadScreen {
 		if (Version.getModelType() == Version.MODEL_TYPE.IHN_1020GL) {
 			mIntLightCheckHandler.sendEmptyMessage(0);
 		}
-		else if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+		else if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
 				|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
 				|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF)
 		{

BIN
WallPadDevService/libs/WallPadSupport.jar


+ 2 - 2
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/ServiceMain.java

@@ -1002,7 +1002,7 @@ public class ServiceMain extends Service {
 					///////////////////////////////////////////
 
 					// 0. 로딩여부 판단
-					if (!(mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I
+					if (!(mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I || mModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
 							|| mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
 							|| mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
 							|| mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410
@@ -1796,7 +1796,7 @@ public class ServiceMain extends Service {
 
 					"</drivermap> </lookup_tables>";
 		}
-		else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I
+		else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I || mModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
 				|| mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
 				|| mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
 		{

+ 2 - 2
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/DriverInterOpAPI.java

@@ -510,7 +510,7 @@ public class DriverInterOpAPI {
             IGW_Controller = ServiceMain.iGW200D_Controller;
             Driver_Title   = define.DRIVER_TITLE_IGW200D;
         }
-        else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I
+        else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I || mModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
                 || mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
                 || mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
                 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410
@@ -561,7 +561,7 @@ public class DriverInterOpAPI {
             IGW_Controller = ServiceMain.iGW200D_Controller;
             Driver_Title   = define.DRIVER_TITLE_IGW200D;
         }
-        else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I
+        else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I || mModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
                 || mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
                 || mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
                 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410

+ 2 - 2
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/SmartKeyRfDoor_Controller.java

@@ -3662,7 +3662,7 @@ public class SmartKeyRfDoor_Controller extends DeviceManager {
             driverInterOpAPI.SmartIotDCam_CtrLed(true);
         }
         else {
-            if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+            if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF)
             {
@@ -3694,7 +3694,7 @@ public class SmartKeyRfDoor_Controller extends DeviceManager {
                         }
                     }
                     else {
-						if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+						if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                                 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                                 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF) {
 							driverInterOpAPI.IGW_SetLedOnOff(false);

+ 2 - 2
WallPadDevService/src/main/java/kr/co/icontrols/v40ioctl/V40IOInterface.java

@@ -71,7 +71,7 @@ public class V40IOInterface {
 
 	public void Emergency_Type_Set() {
 		WpdInterfaceOpen();
-		if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+		if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
 				|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
 				|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF) {
 			Log.d(TAG, "[Emergency_Type_Set] V40 - D101 mode");
@@ -98,7 +98,7 @@ public class V40IOInterface {
 		WpdInterfaceOpen();
 		WpdInterfaceControl(IOCTL_LEDNEMR_ONOFF, 0);
 
-		if (Version.getModelType() != Version.MODEL_TYPE.IHN_D101 && Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I
+		if (Version.getModelType() != Version.MODEL_TYPE.IHN_D101 && Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I && Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I_LX2
 				&& Version.getModelType() != Version.MODEL_TYPE.IHN_D101K && Version.getModelType() != Version.MODEL_TYPE.IHN_D101K_I
 				&& Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I_OCF) {
 			WpdInterfaceControl(IOCTL_EMR_OFF, 0);

+ 2 - 2
WallPadDevService/src/main/java/kr/co/icontrols/v40ioctl/V40IOInterface2.java

@@ -71,7 +71,7 @@ public class V40IOInterface2 {
 
     public void Emergency_Type_Set() {
         WpdInterfaceOpen();
-        if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+        if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF) {
             Log.d(TAG, "[Emergency_Type_Set] V40 - D101 mode");
@@ -98,7 +98,7 @@ public class V40IOInterface2 {
         WpdInterfaceOpen();
         WpdInterfaceControl(IOCTL_LEDNEMR_ONOFF, 0);
 
-        if (Version.getModelType() != Version.MODEL_TYPE.IHN_D101 && Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I
+        if (Version.getModelType() != Version.MODEL_TYPE.IHN_D101 && Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I && Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I_LX2
                 && Version.getModelType() != Version.MODEL_TYPE.IHN_D101K && Version.getModelType() != Version.MODEL_TYPE.IHN_D101K_I
                 && Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I_OCF) {
             WpdInterfaceControl(IOCTL_EMR_OFF, 0);

BIN
WallPadHomeCtrl/libs/WallPadSupport.jar


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

@@ -2403,7 +2403,7 @@ public class MainActivity extends WpadActivity {
 				nChildCnt++;
 			}
 
-			if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+			if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
 					|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
 					|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF)
 			{

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

@@ -188,7 +188,7 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
             ViewRegistration(getLayout(), TitleBtn, Common.ImgPosion.GetX(left + 10), Common.ImgPosion.GetY(top + 10));
             TitleBtn.setTouchDelayMs(Common.BTN_DELAY_SHOWPOPUP);
 
-            int[] mTitleFontSize = {Common.fontsize._36, Common.fontsize._44};
+            int[] mTitleFontSize = {Common.fontsize._30, Common.fontsize._44};
             TitleText = new WpadTextView(getContext(), false, mTitleSize[UX_MODE][0], mTitleSize[UX_MODE][1], Gravity.CENTER, Color.BLACK, mTitleFontSize[UX_MODE], true, ID.KnxSystemAirconMain.text.ROOM_TITLE_1 + index);
             //ViewRegistration(getLayout(), TitleText, left+10, top+10);
             ViewRegistration(getLayout(), TitleText, Common.ImgPosion.GetX(left + 10), Common.ImgPosion.GetY(top + 10) - UX_MODE * 2);
@@ -298,7 +298,7 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
         DebugLogOutput("[Create] - Step1 : Data Create");
         OPERATION_MODE = operationMode;
         //for test
-        //OPERATION_MODE = Common.MODE_BUSINESS_SAMPLE;
+        OPERATION_MODE = Common.MODE_BUSINESS_SAMPLE;
         //
         if (roomNameList==null) mRoomNameList = mDefaultRoomNameList;
         else mRoomNameList = roomNameList;

+ 3 - 0
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_aircon/KnxSystemAirconPopupScreen.java

@@ -373,6 +373,7 @@ public class KnxSystemAirconPopupScreen extends WpadScreen {
                 Sound().Play(SND.effect.TOUCH_LATCHED);
                 edit_state = EDIT_STATE.Normal;
                 setEditStatus();
+                Device_NowAllSet();  //방이동시 변경사항 적용.
 
                 mCurrentOriginRoomIndex--;
                 if (mCurrentOriginRoomIndex < 0)
@@ -385,6 +386,7 @@ public class KnxSystemAirconPopupScreen extends WpadScreen {
                 Sound().Play(SND.effect.TOUCH_LATCHED);
                 edit_state = EDIT_STATE.Normal;
                 setEditStatus();
+                Device_NowAllSet();  //방이동시 변경사항 적용.
 
                 mCurrentOriginRoomIndex++;
                 if (mCurrentOriginRoomIndex >= (int) mData.airconData.Device.info.InsideAirconCount)
@@ -394,6 +396,7 @@ public class KnxSystemAirconPopupScreen extends WpadScreen {
                 Draw_Update((byte) mCurrentRoomIndex);
             } else if (nTargetId == ID.KNxSystemAirconPopup.button.ONOFF) {
                 // 각방 ON/OFF 클릭
+                Sound().Play(SND.effect.TOUCH_LATCHED);
                 byte hOnOff = mData.airconData.Device.Aircon[mCurrentRoomIndex].OnOff;
                 if (hOnOff == KnxSystemAircon.ONOFF.AirconOFF)
                     hOnOff = KnxSystemAircon.ONOFF.AirconON;

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

@@ -86,6 +86,7 @@ public class HeatingV2MainScreen extends WpadScreen {
     private final static int ROOM_CNT_EASYMODE = 4;
     private final static int ROOM_CNT_NORMAL = 6;
     private final int[] ROOM_POS = {0,1,2,3,4,5,6,7,8,9,10,11,12};
+    //private final int[] ROOM_POS = {7,6,5,4,3,2,1,0,8,9,10,11,12};
 
 
     int nDistributionPanelType = Version.DISTRIBUTION_MODEL.OTHER;
@@ -225,7 +226,7 @@ public class HeatingV2MainScreen extends WpadScreen {
             ViewRegistration(getLayout(), BTN_TITLE, Common.ImgPosion.GetX(left+10), Common.ImgPosion.GetY(top+10));
             BTN_TITLE.setTouchDelayMs(Common.BTN_DELAY_SHOWPOPUP);
 
-            int[] mTitleFontSize = {Common.fontsize._35, Common.fontsize._44};
+            int[] mTitleFontSize = {Common.fontsize._30, Common.fontsize._44};
             TXT_TITLE = new WpadTextView(getContext(), false, mTitleSize[UX_MODE][0], mTitleSize[UX_MODE][1], Gravity.CENTER, Color.BLACK, mTitleFontSize[UX_MODE], true, ID.heatingV2main.text.ROOM_TITLE_1 + index);
             //ViewRegistration(getLayout(), TitleText, left+10, top+10);
             ViewRegistration(getLayout(), TXT_TITLE, Common.ImgPosion.GetX(left+10), Common.ImgPosion.GetY(top+10) - UX_MODE*2);
@@ -350,6 +351,7 @@ public class HeatingV2MainScreen extends WpadScreen {
         mContext = context;
         DebugLogOutput("[HeatingV2MainScreen] - Step1 : Data Create");
         OPERATION_MODE = operationMode;
+        //OPERATION_MODE = Common.MODE_BUSINESS_SAMPLE;
         WallpadDeviceSet wds = new WallpadDeviceSet(getContext());
         nDistributionPanelType = wds.Get_DistributionPannelType_Info();
         wds.closeDB();

+ 113 - 57
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_light/LightKnxMainScreen.java

@@ -27,6 +27,7 @@ import com.artncore.wallpadapi.WallPadAPI;
 import com.artncore.wallpadapi.WallPadDevAPI;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 
 import kr.co.icontrols.wallpadhomectrl.MainActivity;
 import kr.co.icontrols.wallpadhomectrl.R;
@@ -49,6 +50,8 @@ public class LightKnxMainScreen extends WpadScreen {
         if (Common.DEBUG_LOG_ON) Log.d(TAG, s);
     }
 
+    Context mContext;
+
     /**
      * 조명개수에 따른 좌표를 정의한다.
      */
@@ -166,7 +169,7 @@ public class LightKnxMainScreen extends WpadScreen {
     private Data_KnxLiv mData = null;
     private boolean NewLivingAPIUse = true;
     boolean livingEm_Kitchen_Use = false;
-    ArrayList<String> mRoomName;
+    private String [] astrRoomTitle = null;             // 각방 명칭
 
     int TotalPage = 1;
     int NowPage = 1;
@@ -180,15 +183,9 @@ public class LightKnxMainScreen extends WpadScreen {
     private final int[] ROOM_POS = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20};
     //private final int[] ROOM_POS = {10,11,12,13,14,15,16,7,8,9,0,1,2,3,4,5,6,17,18,19,20};
 
-    private String[] mDefaultRoomNameList = new String[]{"거실", "거실", "침실4", "침실1", "파우더룸", "침실2", "주방1", "침실3",
+    private String[] mKNXDefaultRoomNameList = new String[]{"거실", "거실", "침실4", "침실1", "파우더룸", "침실2", "주방1", "침실3",
             "복도1", "욕실1", "욕실2","보조주방","욕실3","욕실4","욕실5","복도2", "현관", "신발장", "창고", "주방2", "간이주방", "서재1", "작업실","드레스룸3","추가룸1","추가룸2","추가룸3","추가룸4","추가룸5"};
 
-
-    private String[] mDefaultRoomNameList_PH = new String[]{"거실", "거실", "침실4", "침실1", "파우더룸", "침실2", "주방1", "침실3",
-            "복도1", "욕실1", "욕실2","보조주방","욕실3","욕실4","욕실5","복도2", "현관", "신발장", "창고", "주방2", "간이주방", "임시","임시","임시","임시"};
-
-
-
     // [Class]
 
     /**
@@ -251,8 +248,13 @@ public class LightKnxMainScreen extends WpadScreen {
             ViewRegistration(getLayout(), RoomTitleBg, Common.ImgPosion.GetX(left + 10), Common.ImgPosion.GetY(top + 10));
 
             // 방 이름 텍스트
-            RoomTitleText = new WpadTextView(getContext(), false, 221, 56, Gravity.CENTER, Color.BLACK, Common.fontsize._26_DEFAULT, true, ID.KnxLight.text.Room_TITLE_1 + index);
+            RoomTitleText = new WpadTextView(getContext(), false, 221, 56, Gravity.CENTER, Color.BLACK, Common.fontsize._30, true, ID.KnxLight.text.Room_TITLE_1 + index);
             ViewRegistration(getLayout(), RoomTitleText, Common.ImgPosion.GetX(left + 10), Common.ImgPosion.GetY(top + 10));
+            RoomTitleText.setTextSize(0, Common.fontsize._30);
+            if(roomName.length() == 6)
+            {
+                RoomTitleText.setTextSize(0, Common.fontsize._26_DEFAULT);
+            }
             RoomTitleText.setText(roomName);
 
             OnOffBtn = new WpadImageView(getContext(), TOUCH_KIND.BUTTON, 120, 120, mOffImg[type], mOnImg[type], ID.KnxLight.button.Light_Btn_1 + index);
@@ -297,6 +299,7 @@ public class LightKnxMainScreen extends WpadScreen {
         ((MainActivity) getContext()).getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
         //bEasyModeUse = ((MainActivity) context).GetEasyModeUXUse();
+        mContext = context;
         DebugLogOutput("[Create] - bEasyModeUse [" + bEasyModeUse + "]");
 
         // 0. 화면 ID -> DB 저장 --> GlobalScreen(조그 다이얼 Bar 안나오도록 함)
@@ -310,12 +313,9 @@ public class LightKnxMainScreen extends WpadScreen {
         wd.SetCurrentScreenIDValue(API_Menu.SubMenuCtrl.HDC_LivingLamp);
         Log.d(TAG, "[Step 0] - now db val = " + wd.GetCurrentScreenIDValue());
 
-
         wallpaddbmgr.AddressSet addc = wd.getAddressMGR(); // DB에서 동호 정보 받아옴
         wd.closeDB();
 
-
-
         // 동, 호, ip 정보 저장
         myIP = addc.IPAddress;
         myDong = addc.Dong;
@@ -324,6 +324,7 @@ public class LightKnxMainScreen extends WpadScreen {
         // 1. Data Create
         DebugLogOutput("[Create] - Step1 : Data Create");
         OPERATION_MODE = operationMode;
+        OPERATION_MODE = Common.MODE_BUSINESS_SAMPLE;
         mData = new Data_KnxLiv();
 
         // 2. Device API Load & Update
@@ -369,8 +370,12 @@ public class LightKnxMainScreen extends WpadScreen {
                 }
             }
         }
+
         //EMcount 개수만큼 방이름을 만든다.
-        mRoomName = new ArrayList<String>();
+        if (getRoomName==null) astrRoomTitle = mKNXDefaultRoomNameList;
+        else astrRoomTitle = getRoomName;
+
+        Log.i(TAG, "[HeatingV2MainScreen] astrRoomTitle: " + Arrays.toString(astrRoomTitle));
         Log.i(TAG, "AllEMcount = " + AllEMcount);
         Set_TotalPageNum(AllEMcount);
 
@@ -402,8 +407,6 @@ public class LightKnxMainScreen extends WpadScreen {
         ViewRegistration(getLayout(), PageNumText, Common.ImgPosion.GetX(508), Common.ImgPosion.GetY(670));
         PageNumText.setText(NowPage + "/" + TotalPage);
 
-        //mRoomName = getRoomName;
-
         // 5. Draw_Update
         DebugLogOutput("[Create] - Step5 : Draw_Update");
 
@@ -439,6 +442,97 @@ public class LightKnxMainScreen extends WpadScreen {
         }
     }
 
+    @Override
+    protected void onClose() {
+        super.onClose();
+        ((MainActivity) getContext()).getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
+        if (KnxApi != null) {
+            Device_BrRegistration(false);
+            if (MainActivity.getHideMenuOn()) {
+                if (transactionDisplay != null) transactionDisplay.Close();
+            }
+        }
+
+        WallpadStatusData wd = new WallpadStatusData(this.getContext());
+        Log.d(TAG, "close db val = " + wd.GetCurrentScreenIDValue());
+
+        wd.SetCurrentScreenIDValue(0);
+        Log.d(TAG, "change close db val = " + wd.GetCurrentScreenIDValue());
+
+        wd.closeDB();
+    }
+
+    @Override
+    public void Close() {
+        super.Close();
+    }
+
+    /**
+     * 팝업종료시 데이터가 있을시 호출됨
+     */
+    @Override
+    protected void onPopupResult(Intent intent) {
+        if (intent != null) {
+            int Screen = intent.getIntExtra("SCREEN", -1);
+            if (Screen == ID.screen.LightKnxPopupRoomScreen) {
+                boolean bRefresh = intent.getBooleanExtra("REFRESH", false);
+                if (bRefresh) {
+                    WallpadStatusData wallpadStatusData = new WallpadStatusData(getContext().getApplicationContext());
+                    boolean bChangeUser = wallpadStatusData.GetRoomNameChangeByUser(define.ROOM_NAME_LIGHT);
+                    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++) {
+                            drawEntireRoomTitle(i);
+                        }
+                        ((MainActivity)mContext).mRoomNameList_Heating = astrRoomTitle;
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * {@link #lightRooms} 에 대한 기본적인 범위체크를 한다.
+     *
+     * @param index - (int) 체크할 인덱스
+     * @return (boolean) true : 정상, false : 범위이탈
+     */
+    private boolean checkRoomIndex(int index) {
+        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;
+        return true;
+    }
+
+    /**
+     * 방명칭을 개별적으로 화면에 반영한다.
+     *
+     * @param index - (int) 변경할 룸의 인덱스
+     * param TitleStr - (String) 변경할 명칭
+     */
+    private void drawRoomTitle(int index, String value) {
+        if(!checkRoomIndex(index)) return;
+        lightRooms[index].RoomTitleText.setText(value);
+        lightRooms[index].RoomTitleText.setTextSize(0, Common.fontsize._30);
+        if(value.length() == 6)
+        {
+            lightRooms[index].RoomTitleText.setTextSize(0, Common.fontsize._26_DEFAULT);
+        }
+    }
+
+    /**
+     * 방명칭 전체를 화면에 업데이트한다.
+     */
+    private void drawEntireRoomTitle(int idx) {
+        if (mData == null) return;
+        int newIndex = ROOM_POS[idx];
+        drawRoomTitle(idx, astrRoomTitle[newIndex]);
+    }
+
     // =================================================================================================
     // [[ BroadcastReceiver ]] region
     // =================================================================================================
@@ -476,39 +570,6 @@ public class LightKnxMainScreen extends WpadScreen {
             setFinishTimerReset();
         }
     }
-
-    @Override
-    protected void onClose() {
-        super.onClose();
-        ((MainActivity) getContext()).getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-
-        // 등록된 BR 을 해제 한다.
-        /*if(OPERATION_MODE != Common.MODE_BUSINESS_SAMPLE)
-        {
-            KnxLivApi.SetControlMode(false);
-        }*/
-
-        if (KnxApi != null) {
-            Device_BrRegistration(false);
-            if (MainActivity.getHideMenuOn()) {
-                if (transactionDisplay != null) transactionDisplay.Close();
-            }
-        }
-
-        WallpadStatusData wd = new WallpadStatusData(this.getContext());
-        Log.d(TAG, "close db val = " + wd.GetCurrentScreenIDValue());
-
-        wd.SetCurrentScreenIDValue(0);
-        Log.d(TAG, "change close db val = " + wd.GetCurrentScreenIDValue());
-
-        wd.closeDB();
-    }
-
-    @Override
-    public void Close() {
-        super.Close();
-    }
-
     private void setOnOff_BadRoom_EnergyMeter(int index){
         boolean OnOff = false;
         for (int i = 0; i < mData.BadRoom_EnergyMeter[index].Info.LightCount; i++) {
@@ -566,7 +627,7 @@ public class LightKnxMainScreen extends WpadScreen {
                 // 타겟 룸인덱스
                 data.putExtra("ROOM_INDEX", index);
                 // 룸명칭 리스트
-                data.putStringArrayListExtra("ROOM_NAME_ARRAY", mRoomName);
+                data.putExtra("ROOM_NAME_ARRAY", astrRoomTitle);
 
                 ((MainActivity) (getContext())).StartPopup(ID.screen.LightKnxPopupRoomScreen, data);
             } else if ((TargetId >= ID.KnxLight.button.Light_Btn_1) && (TargetId <= ID.KnxLight.button.Light_Btn_1 + AllEMcount)) {
@@ -1013,8 +1074,6 @@ public class LightKnxMainScreen extends WpadScreen {
         }
     }
 
-
-
     // =================================================================================================
     // [[ Light UI 등록 ]] region
     // =================================================================================================
@@ -1082,8 +1141,7 @@ public class LightKnxMainScreen extends WpadScreen {
                         //left = (mPos[posIndex][createLight][0]);
                         //top = (mPos[posIndex][createLight][1]);
                     }
-                    String name = mDefaultRoomNameList[createLight];
-                    mRoomName.add(name);
+                    String name = astrRoomTitle[createLight];
                     Log.d(TAG, "[Registration_Light_New] - name[" + name + "] = ");
 
                     lightRooms[pos] = new LightRoom(ROOM_POS[0], left, top, createLight, name, EM_TYPE);
@@ -1112,8 +1170,7 @@ public class LightKnxMainScreen extends WpadScreen {
                             left = (mPos[posIndex][pos][0]);
                             top = (mPos[posIndex][pos][1]);
                         }
-                        String name = mDefaultRoomNameList[i+1];
-                        mRoomName.add(name);
+                        String name = astrRoomTitle[i+1];
                         Log.d(TAG, "[Registration_Light_New] - name[" + (i + 1) + "] = " + name);
 
                         lightRooms[pos] = new LightRoom(ROOM_POS[i + LivingLightCount], left, top, createLight, name, EM_TYPE);
@@ -1144,8 +1201,7 @@ public class LightKnxMainScreen extends WpadScreen {
                             top = (mPos[posIndex][pos][1]);
                         }
 
-                        String name = mDefaultRoomNameList[i+BadLightCount+1];
-                        mRoomName.add(name);
+                        String name = astrRoomTitle[i+BadLightCount+1];
                         Log.d(TAG, "[Registration_Light_New] - name[" + (i + 1) + "] = " + name);
 
                         lightRooms[pos] = new LightRoom(ROOM_POS[i + LivingLightCount + BadLightCount], left, top, createLight, name, SWITCH_TYPE);

+ 148 - 32
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_light/LightKnxPopupRoomScreen.java

@@ -7,13 +7,18 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
+import android.text.InputFilter;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.SeekBar;
+import android.widget.Toast;
 
 import com.artncore.WallPadDataMgr.WallpadDeviceSet;
 import com.artncore.WallPadDataMgr.WallpadStatusData;
@@ -29,6 +34,7 @@ import com.util.LogUtil;
 
 import java.util.ArrayList;
 
+import kr.co.icontrols.wallpadhomectrl.MainActivity;
 import kr.co.icontrols.wallpadhomectrl.PopupActivity;
 import kr.co.icontrols.wallpadhomectrl.R;
 import kr.co.icontrols.wallpadhomectrl.declare.Common;
@@ -67,6 +73,8 @@ public class LightKnxPopupRoomScreen extends WpadScreen {
     private WpadImageView AllOnBtn, AllOffBtn;                  // 전체켜기 / 끄기
     private WpadImageView Light1, Light2, Light3, Light4, Light5, Light6, Light7, Light8;
     private WpadImageView[] LightImageArray = new WpadImageView[]{Light1, Light2, Light3, Light4, Light5, Light6, Light7, Light8};
+    private WpadImageView EditBtn;                                         // 방명칭 편집 버튼
+    private EditText nameEditText; 									       // 방명칭 편집 에디트박스
 
     // [Text]
     private WpadTextView TitleText;                             // 방이름
@@ -74,9 +82,27 @@ public class LightKnxPopupRoomScreen extends WpadScreen {
 
     // [Variables]
     private int OPERATION_MODE = -1;
-    private ArrayList<String> mRoomNameList = null;             // 각방 명칭
+    private String[] mRoomNameList = null;             // 각방 명칭             // 각방 명칭
     private Data_KnxLiv mData = null;           // 데이터
 
+    WallpadStatusData wallpadStatusData = null;
+    private String originRoomName = "";
+
+    private InputMethodManager inputMethodManager;
+
+    private EDIT_STATE edit_state = EDIT_STATE.Normal;
+
+    public enum EDIT_STATE {
+        Normal(0),
+        Edit(1),
+        Other(100);
+        private int mIdx;
+
+        private EDIT_STATE(int idx) {
+            this.mIdx = idx;
+        }
+    }
+
     private int mCurrentRoomIndex = 0;
     private int mRoomIndex = 0;
     public int AllEMcount = 0;
@@ -92,11 +118,8 @@ public class LightKnxPopupRoomScreen extends WpadScreen {
     //private final int[] ROOM_POS = {10,11,12,13,14,15,16,7,8,9,0,1,2,3,4,5,6,17,18,19,20};
 
 
-    private String[] mDefaultRoomNameList = new String[]{"거실", "거실", "침실4", "침실1", "파우더룸", "침실2", "주방1", "침실3",
-            "복도1", "욕실1", "욕실2","보조주방","욕실3","욕실4","욕실5","복도2", "현관", "신발장", "창고", "주방2", "간이주방"};
-
-    private String[] mDefaultRoomNameList_PH = new String[]{"거실", "거실", "침실4", "침실1", "파우더룸", "침실2", "주방1", "침실3",
-            "복도1", "욕실1", "욕실2","보조주방","욕실3","욕실4","욕실5","복도2", "현관", "신발장", "창고", "주방2", "간이주방", "임시","임시","임시","임시"};
+    private String[] mKNXDefaultRoomNameList = new String[]{"거실", "거실", "침실4", "침실1", "파우더룸", "침실2", "주방1", "침실3",
+            "복도1", "욕실1", "욕실2","보조주방","욕실3","욕실4","욕실5","복도2", "현관", "신발장", "창고", "주방2", "간이주방", "서재1", "작업실","드레스룸3","추가룸1","추가룸2","추가룸3","추가룸4","추가룸5"};
 
 
     /**
@@ -208,9 +231,7 @@ public class LightKnxPopupRoomScreen extends WpadScreen {
 
         WallpadStatusData wd = new WallpadStatusData(this.getContext());
         Log.d(TAG, "[Step 0] - prev db val = " + wd.GetCurrentScreenIDValue());
-
         wallpaddbmgr.AddressSet addc = wd.getAddressMGR(); // DB에서 동호 정보 받아옴
-
         wd.closeDB();
 
         // 동, 호, ip 정보 저장
@@ -218,30 +239,21 @@ public class LightKnxPopupRoomScreen 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;
-        //OPERATION_MODE = Common.MODE_BUSINESS_SAMPLE;
+        OPERATION_MODE = Common.MODE_BUSINESS_SAMPLE;
         mData = new Data_KnxLiv();
-
-
+        if (wallpadStatusData == null) wallpadStatusData = new WallpadStatusData(context);
 
         // 2. Device API Load & Update
         DebugLogOutput("[Create] - Step2 : Device API Load & Update");
         if (OPERATION_MODE == Common.MODE_NOMAL) {
-            DebugLogOutput("OPERATION_MODE = MODE_NOMAL");
             if (Device_ApiLoad(wpapi) >= 0) Device_Update(false, Common.INDEX_ALL);
         } else if (OPERATION_MODE == Common.MODE_BUSINESS_SAMPLE) {
-            DebugLogOutput("OPERATION_MODE = MODE_BUSINESS_SAMPLE");
             // 샘플 데이터 로드
             LoadSampleData_NewLiv();
         } else {
-            DebugLogOutput("OPERATION_MODE = Other (" + OPERATION_MODE + " ... Change Mode -> MODE_NOMAL");
             OPERATION_MODE = Common.MODE_NOMAL;
         }
 
@@ -251,18 +263,15 @@ public class LightKnxPopupRoomScreen extends WpadScreen {
         String[] strValue = devSet.GetSettingData("UI순서");
         devSet.closeDB();
 
-        // 현대건설 더 펜트하우스 서버에서 설정된 UI 순서를 이용하도록 한다.
+        //서버에서 설정된 UI 순서를 이용하도록 한다.
         if( strValue != null ) {
             String strLight = strValue[1].substring( (strValue[1].indexOf("조명(") + 3) , (strValue[1].indexOf(")난방(")));
             //String strHeating = strValue[1].substring( (strValue[1].indexOf("난방(") + 3) , (strValue[1].indexOf(")에어컨(")));
             //String strAircon = strValue[1].substring( (strValue[1].indexOf("에어컨(") + 4) , (strValue[1].indexOf("))")));
-            //DebugLogOutput("[Create] - room name strlight "  + strLight);
-            //DebugLogOutput("[Create] - room name strHeating "  + strHeating);
-            //DebugLogOutput("[Create] - room name strAircon "  + strAircon);
 
             int strLightCount = Integer.valueOf(strLight.substring(0, strLight.indexOf(":")));
 
-            if(strLightCount==(mData.MasterController.Info.Bad_EnergyMeterCount + mData.MasterController.Info.Liv_EnergyMeterCount)){
+            if(strLightCount==(mData.MasterController.Info.Light_SwitchCount + mData.MasterController.Info.Bad_EnergyMeterCount + mData.MasterController.Info.Liv_EnergyMeterCount)){
                 //개수가 일치하는 경우에 적용
                 strLight = strLight.substring(strLight.indexOf(":")+1);
                 String[] strDataSeq = strLight.split("_");
@@ -284,12 +293,11 @@ public class LightKnxPopupRoomScreen extends WpadScreen {
             Log.d(TAG, "mCurrentRoomIndex = " + mCurrentRoomIndex);
 
             // 방명칭
-            mRoomNameList = intent.getStringArrayListExtra("ROOM_NAME_ARRAY");
-            if (mRoomNameList == null) {
-                Log.d(TAG, "mRoomNameList = null");
-            } else {
-                for (int i = 0; i < mRoomNameList.size(); i++)
-                    Log.d(TAG, "mRoomNameList[" + i + "] " + mRoomNameList.get(i));
+            String[] RoomNameArray = null;
+            RoomNameArray = intent.getStringArrayExtra("ROOM_NAME_ARRAY");
+            if (RoomNameArray != null) {
+                mRoomNameList = RoomNameArray;
+                originRoomName = mRoomNameList[mCurrentRoomIndex];
             }
         }
 
@@ -330,6 +338,31 @@ public class LightKnxPopupRoomScreen extends WpadScreen {
         TitleText = new WpadTextView(context, false, 322, 90, Gravity.CENTER, Color.WHITE, Common.fontsize._36, true, ID.lightKnxPopupRoom.text.TITLE);
         ViewRegistration(getLayout(), TitleText, Common.PopupNomalMarginLEFT(465), Common.PopupNomalMarginTOP(62));
 
+        if (MainActivity.bRoomNameEditUse) {
+            nameEditText = new EditText(context);
+            RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(WpadScale.getWidth(282), WpadScale.getHeight(59));
+            params.setMargins(WpadScale.getWidth(Common.PopupNomalMarginLEFT(482)), WpadScale.getHeight(Common.PopupNomalMarginTOP(79)), 0, 0);
+            nameEditText.setLayoutParams(params);
+            nameEditText.setGravity(Gravity.CENTER_VERTICAL | Gravity.CENTER);
+            nameEditText.setTextSize(TypedValue.COMPLEX_UNIT_PX, (float) Common.fontsize._26_DEFAULT);
+            nameEditText.setTextColor(Color.BLACK);
+            nameEditText.setSingleLine(true);
+
+            int maxLength = 6;
+            InputFilter[] filterArray = new InputFilter[1];
+            filterArray[0] = new InputFilter.LengthFilter(maxLength);
+            nameEditText.setFilters(filterArray);
+            layout.addView(nameEditText);
+            nameEditText.setVisibility(View.INVISIBLE);
+
+            EditBtn = new WpadImageView(context, TOUCH_KIND.BUTTON, 78, 78, R.drawable.btn_edit_normal, R.drawable.btn_edit_pressed, ID.heatingV2Popup.button.EDIT);
+            int leftMargin = Common.PopupAlarmMarginLEFT(153);
+            if (PopupActivity.getManualUse()) leftMargin = Common.PopupAlarmMarginLEFT(269);
+            ViewRegistration(layout, EditBtn, leftMargin, Common.PopupNomalMarginTOP(68));
+
+            inputMethodManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+        }
+
         //SeekBar 등록
         Registration_SeekBar();
 
@@ -352,6 +385,7 @@ public class LightKnxPopupRoomScreen extends WpadScreen {
         super.onClose();
         // 등록된 BR 을 해제 한다.
         if (KnxApi != null) Device_BrRegistration(false);
+        if (wallpadStatusData != null) wallpadStatusData.closeDB();
         Log.i(TAG, "[END   - Screen] ********************************************");
     }
 
@@ -363,6 +397,7 @@ public class LightKnxPopupRoomScreen extends WpadScreen {
         super.onOutSideTouchExit();
         // (영업샘플모드) 변경 데이터 전달
         if (OPERATION_MODE == Common.MODE_BUSINESS_SAMPLE) Sample_setPopupResult();
+        if (edit_state == EDIT_STATE.Normal) setPopupResult();
     }
 
     // =================================================================================================
@@ -588,11 +623,14 @@ public class LightKnxPopupRoomScreen extends WpadScreen {
             if (TargetId == ID.lightKnxPopupRoom.button.EXIT) {
                 DebugLogOutput("onTouchEvent [EXIT] BUTTON !!!");
                 Sound().Play(SND.effect.TOUCH_LATCHED);
-                if (OPERATION_MODE == Common.MODE_BUSINESS_SAMPLE) Sample_setPopupResult();
+                //if (OPERATION_MODE == Common.MODE_BUSINESS_SAMPLE) Sample_setPopupResult();
+                if (edit_state == EDIT_STATE.Normal) setPopupResult();
                 super.finish();
             } else if (TargetId == ID.lightKnxPopupRoom.button.ROOMSEL_LEFT) {
                 DebugLogOutput("onTouchEvent [ROOMSEL_LEFT] BUTTON !!!");
                 Sound().Play(SND.effect.TOUCH_LATCHED);
+                edit_state = EDIT_STATE.Normal;
+                setEditStatus();
 
                 mRoomIndex--;
                 if (mRoomIndex < 0) mRoomIndex = AllEMcount - 1;
@@ -605,6 +643,8 @@ public class LightKnxPopupRoomScreen extends WpadScreen {
             } else if (TargetId == ID.lightKnxPopupRoom.button.ROOMSEL_RIGHT) {
                 DebugLogOutput("onTouchEvent [ROOMSEL_RIGHT] BUTTON !!!");
                 Sound().Play(SND.effect.TOUCH_LATCHED);
+                edit_state = EDIT_STATE.Normal;
+                setEditStatus();
 
                 mRoomIndex++;
                 if (mRoomIndex >= AllEMcount) mRoomIndex = 0;
@@ -657,6 +697,10 @@ public class LightKnxPopupRoomScreen extends WpadScreen {
                 Log.d(TAG, "[onTouchEvent] MANUAL BUTTON");
                 Sound().Play(SND.effect.TOUCH_LATCHED);
                 ((PopupActivity) (getContext())).StartManual(ID.MANUAL.MANUAL_EtcMultiLightPop);
+            } else if (TargetId == ID.heatingV2Popup.button.EDIT) {
+                Log.d(TAG, "[onTouchEvent] EDIT BUTTON");
+                Sound().Play(SND.effect.TOUCH_LATCHED);
+                editRoomName();
             }
         }
     }
@@ -846,7 +890,9 @@ public class LightKnxPopupRoomScreen extends WpadScreen {
      */
     private void Draw_TitleChange(int index) {
         if ((index < 0) || (index > 31)) return;
-        TitleText.setText(mDefaultRoomNameList[index]);
+        //TitleText.setText(mKNXDefaultRoomNameList[index]);
+        TitleText.setText(mRoomNameList[index]);
+
     }
 
 
@@ -939,6 +985,66 @@ public class LightKnxPopupRoomScreen extends WpadScreen {
         }
     }
 
+
+    /**
+     * 룸 명칭을 편집한다.
+     */
+    private void editRoomName() {
+        Log.d(TAG, "[editRoomName] edit_state [" + edit_state + "]");
+        if (edit_state == EDIT_STATE.Normal) {
+            edit_state = EDIT_STATE.Edit;
+            setEditStatus();
+        } else if (edit_state == EDIT_STATE.Edit) {
+
+            String editNameRoom = nameEditText.getText().toString();
+            if (editNameRoom.equals("")) {
+                Sound().Play(SND.effect.TOUCH_UNLATCHED);
+                Toast.makeText(getContext(), "방 명칭을 정확히 입력하세요.", Toast.LENGTH_SHORT).show();
+            } else {
+                edit_state = EDIT_STATE.Normal;
+                setEditStatus();
+                if (!editNameRoom.equals(originRoomName)) {
+                    if (!wallpadStatusData.GetRoomNameChangeByUser(define.ROOM_NAME_LIGHT))
+                        wallpadStatusData.SetRoomNameChangeByUser(1, define.ROOM_NAME_LIGHT); // 사용자에 의해 방명칭 수정시 1로 저장 (추후 방명칭 변경 여부 판단 기준)
+                }
+                mRoomNameList[mCurrentRoomIndex] = editNameRoom;
+                if (wallpadStatusData.SetDevRoomNameList(mRoomNameList, define.ROOM_NAME_LIGHT) < 0) {
+                    wallpadStatusData.GetDevRoomNameList(define.ROOM_NAME_LIGHT);
+                    int nRet = wallpadStatusData.SetDevRoomNameList(mRoomNameList, define.ROOM_NAME_LIGHT);
+                    Log.d(TAG, "[editRoomName] nRet [" + nRet + "]");
+                }
+                TitleText.setText(editNameRoom);
+                setPopupResult();
+                inputMethodManager.hideSoftInputFromWindow(nameEditText.getWindowToken(), 0);
+            }
+        } else {
+            Log.w(TAG, "[editRoomName] Not invalid EDIT_STATE [" + edit_state + "]");
+        }
+    }
+
+    private void setEditStatus() {
+        Log.d(TAG, "[setEditStatus] edit_state [" + edit_state + "]");
+        if (edit_state == EDIT_STATE.Normal) {
+            if (EditBtn != null) EditBtn.setImageChange(R.drawable.btn_edit_normal, R.drawable.btn_edit_pressed);
+            if (nameEditText != null) nameEditText.setVisibility(View.INVISIBLE);
+            if (TitleText != null) {
+                TitleText.setVisibility(View.VISIBLE);
+                TitleText.bringToFront();
+            }
+        } else if (edit_state == EDIT_STATE.Edit) {
+            if (EditBtn != null) EditBtn.setImageChange(R.drawable.btn_edit_ok_normal, R.drawable.btn_edit_ok_pressed);
+            if (nameEditText != null) {
+                nameEditText.setText(TitleText.getText().toString());
+                nameEditText.setVisibility(View.VISIBLE);
+                nameEditText.bringToFront();
+            }
+            if (TitleText != null) TitleText.setVisibility(View.INVISIBLE);
+        } else {
+            Log.w(TAG, "[setEditStatus] Not invalid EDIT_STATE [" + edit_state + "]");
+        }
+    }
+
+
     // =================================================================================================
     // [[ Device ]] region
     // =================================================================================================
@@ -1245,6 +1351,16 @@ public class LightKnxPopupRoomScreen extends WpadScreen {
         return LightOnOff;
     }
 
+    private void setPopupResult() {
+        Intent data = new Intent();
+
+        // SCREEN
+        data.putExtra("SCREEN", ID.screen.LightKnxPopupRoomScreen);
+        data.putExtra("REFRESH", true);
+
+        super.setPopupResult(data);
+    }
+
 
     // =================================================================================================
     // [[ Sample ]] region

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

@@ -224,7 +224,7 @@ public class HeatingV2TestScreen extends WpadScreen {
             ViewRegistration(getLayout(), BTN_TITLE, Common.ImgPosion.GetX(left+10), Common.ImgPosion.GetY(top+10));
             BTN_TITLE.setTouchDelayMs(Common.BTN_DELAY_SHOWPOPUP);
 
-            int[] mTitleFontSize = {Common.fontsize._35, Common.fontsize._44};
+            int[] mTitleFontSize = {Common.fontsize._30, Common.fontsize._44};
             TXT_TITLE = new WpadTextView(getContext(), false, mTitleSize[UX_MODE][0], mTitleSize[UX_MODE][1], Gravity.CENTER, Color.BLACK, mTitleFontSize[UX_MODE], true, ID.heatingV2main.text.ROOM_TITLE_1 + index);
             ViewRegistration(getLayout(), TXT_TITLE, Common.ImgPosion.GetX(left+10), Common.ImgPosion.GetY(top+10) - UX_MODE*2);
 
@@ -956,6 +956,11 @@ public class HeatingV2TestScreen extends WpadScreen {
     private void drawRoomTitle(int index, String value) {
         if(!checkRoomIndex(index)) return;
         roomView[index].TXT_TITLE.setText(value);
+        roomView[index].TXT_TITLE.setTextSize(0, Common.fontsize._30);
+        if(value.length() == 6)
+        {
+            roomView[index].TXT_TITLE.setTextSize(0, Common.fontsize._26_DEFAULT);
+        }
     }
 
     /**

+ 6 - 2
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/KnxSystemAirconMainTestScreen.java

@@ -200,7 +200,7 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
             ViewRegistration(getLayout(), TitleBtn, Common.ImgPosion.GetX(left + 10), Common.ImgPosion.GetY(top + 10));
             TitleBtn.setTouchDelayMs(Common.BTN_DELAY_SHOWPOPUP);
 
-            int[] mTitleFontSize = {Common.fontsize._36, Common.fontsize._44};
+            int[] mTitleFontSize = {Common.fontsize._30, Common.fontsize._44};
             TitleText = new WpadTextView(getContext(), false, mTitleSize[UX_MODE][0], mTitleSize[UX_MODE][1], Gravity.CENTER, Color.BLACK, mTitleFontSize[UX_MODE], true, ID.KnxSystemAirconMain.text.ROOM_TITLE_1 + index);
             //ViewRegistration(getLayout(), TitleText, left+10, top+10);
             ViewRegistration(getLayout(), TitleText, Common.ImgPosion.GetX(left + 10), Common.ImgPosion.GetY(top + 10) - UX_MODE * 2);
@@ -1139,7 +1139,11 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
     private void Draw_TitleChange(int index, String value)
     {
         if(!Draw_RangeChecker(index)) return;
-        roomView[index].TitleText.setText(value);
+        roomView[index].TitleText.setTextSize(0, Common.fontsize._30);
+        if(value.length() == 6)
+        {
+            roomView[index].TitleText.setTextSize(0, Common.fontsize._26_DEFAULT);
+        }
     }
 
     // =================================================================================================

BIN
WallPadMain/libs/WallPadSupport.jar


+ 2 - 0
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/IOInterface.java

@@ -251,6 +251,7 @@ public class IOInterface {
 
                 case MODEL_TYPE.IHN_D101:
                 case MODEL_TYPE.IHN_D101_I:
+                case MODEL_TYPE.IHN_D101_I_LX2:
                 case MODEL_TYPE.IHN_D101K:
                 case MODEL_TYPE.IHN_D101K_I:
                 case MODEL_TYPE.IHN_1010GL:
@@ -263,6 +264,7 @@ public class IOInterface {
 
                 case MODEL_TYPE.IHN_1010:
                 case MODEL_TYPE.IHN_1010_I:
+                case MODEL_TYPE.IHN_1010_I_LX2:
                 case MODEL_TYPE.IHN_T1010:
                 case MODEL_TYPE.IHN_T1010_I:
                 case MODEL_TYPE.IHN_HS101:

+ 6 - 6
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/MainActivity.java

@@ -437,7 +437,7 @@ public class MainActivity extends WpadActivity {
     public void initLivinglightPreset() {
         WallpadStatusData mWallpadStatusData = new WallpadStatusData(this);
         try {
-            if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+            if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == MODEL_TYPE.IHN_D101_I_LX2
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                     || Version.getModelType() == MODEL_TYPE.IHN_D101_I_OCF) {
                 Log.i(TAG, "[initLivinglightPreset] Initialize preset for IHN-D101");
@@ -470,7 +470,7 @@ public class MainActivity extends WpadActivity {
                     }
                 }
             }
-            else if (Version.getModelType() == MODEL_TYPE.IHN_1010 || Version.getModelType() == MODEL_TYPE.IHN_1010_I) {
+            else if (Version.getModelType() == MODEL_TYPE.IHN_1010 || Version.getModelType() == MODEL_TYPE.IHN_1010_I || Version.getModelType() == MODEL_TYPE.IHN_1010_I_LX2) {
                 Log.i(TAG, "[initLivinglightPreset] Initialize preset for IHN-1010(-I)");
                 if (getKCCDimmingCtrl()) {
                     for (int i = 1; i < 5; i++) {
@@ -1835,7 +1835,7 @@ public class MainActivity extends WpadActivity {
             else if (msg.what == 1) {
             	// 현산향 
             	AutoIGALStatusReleaseSinario();
-                if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+                if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == MODEL_TYPE.IHN_D101_I_LX2
                         || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                         || Version.getModelType() == MODEL_TYPE.IHN_D101_I_OCF) {
                     mSdb_LivingRoomLightAPI = mWallPadAPI.Get_Sdb_LivingRoomLightAPI();
@@ -4379,7 +4379,7 @@ public class MainActivity extends WpadActivity {
 										case WallpadStatusData.MCALLR_LIGHT_ON:
 											//에너지 미터인 경우 안방 조명을 켜도록 하고
 											//에너지 미터가 안 달린 경우 거실 조명을 켜도록 한다
-                                            if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+                                            if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == MODEL_TYPE.IHN_D101_I_LX2
                                                     || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                                                     || Version.getModelType() == MODEL_TYPE.IHN_D101_I_OCF) {
                                                 // 안방조명에 1번 조명만 제어하도록 한다
@@ -9833,9 +9833,9 @@ public class MainActivity extends WpadActivity {
 
     private boolean checkTranslucentGlassUsage() {
         try {
-            if (Version.getModelType() == MODEL_TYPE.IHN_D101 || Version.getModelType() == MODEL_TYPE.IHN_D101_I
+            if (Version.getModelType() == MODEL_TYPE.IHN_D101 || Version.getModelType() == MODEL_TYPE.IHN_D101_I || Version.getModelType() == MODEL_TYPE.IHN_D101_I_LX2
                     || Version.getModelType() == MODEL_TYPE.IHN_D101K || Version.getModelType() == MODEL_TYPE.IHN_D101K_I
-                    || Version.getModelType() == MODEL_TYPE.IHN_1010 || Version.getModelType() == MODEL_TYPE.IHN_1010_I
+                    || Version.getModelType() == MODEL_TYPE.IHN_1010 || Version.getModelType() == MODEL_TYPE.IHN_1010_I || Version.getModelType() == MODEL_TYPE.IHN_1010_I_LX2
                     || Version.getModelType() == MODEL_TYPE.IHN_1010GL || Version.getModelType() == MODEL_TYPE.IHN_1010GL_I
                     || Version.getModelType() == MODEL_TYPE.IHN_1010GL_I_2443 || Version.getModelType() == MODEL_TYPE.IHN_1010GL_I_6410
                     || Version.getModelType() == MODEL_TYPE.IHN_T1010 || Version.getModelType() == MODEL_TYPE.IHN_T1010_I

+ 2 - 2
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/manual/MANUAL_MAIN.java

@@ -121,7 +121,7 @@ public class MANUAL_MAIN extends WpadScreen {
                 IMG_GUIDE_02_MAINSCREEN = new WpadImageView(context, TOUCH_KIND.NONE, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.IMAGES.GUIDE_02_MAINSCREEN_IHND101).W, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.IMAGES.GUIDE_02_MAINSCREEN_IHND101).H, R.drawable.img_manual_example_main_ihnd101, 0, ID.MANUAL.MANUALMAIN.ELEMENTS.IMAGES.GUIDE_02_MAINSCREEN_IHND101);
                 ViewRegistration(layout, IMG_GUIDE_02_MAINSCREEN, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.IMAGES.GUIDE_02_MAINSCREEN_IHND101).X, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.IMAGES.GUIDE_02_MAINSCREEN_IHND101).Y);
             }
-            else if (Version.getModelType() == Version.MODEL_TYPE.IHN_1010 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I) {
+            else if (Version.getModelType() == Version.MODEL_TYPE.IHN_1010 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_LX2) {
                 IMG_GUIDE_02_MAINSCREEN = new WpadImageView(context, TOUCH_KIND.NONE, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.IMAGES.GUIDE_02_MAINSCREEN_IHN1010).W, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.IMAGES.GUIDE_02_MAINSCREEN_IHN1010).H, R.drawable.img_manual_example_main_ihn1010, 0, ID.MANUAL.MANUALMAIN.ELEMENTS.IMAGES.GUIDE_02_MAINSCREEN_IHN1010);
                 ViewRegistration(layout, IMG_GUIDE_02_MAINSCREEN, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.IMAGES.GUIDE_02_MAINSCREEN_IHN1010).X, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.IMAGES.GUIDE_02_MAINSCREEN_IHN1010).Y);
             }
@@ -144,7 +144,7 @@ public class MANUAL_MAIN extends WpadScreen {
                 ViewRegistration(layout, TXT_GUIDE_02_INFO_MAINSCREEN, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.TEXTS.GUIDE_02_INFO_MAINSCREEN_IHND101).X, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.TEXTS.GUIDE_02_INFO_MAINSCREEN_IHND101).Y);
                 TXT_GUIDE_02_INFO_MAINSCREEN.setText(strGuide02MainScreen_IHND101);
             }
-            else if (Version.getModelType() == Version.MODEL_TYPE.IHN_1010 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I) {
+            else if (Version.getModelType() == Version.MODEL_TYPE.IHN_1010 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_LX2) {
                 TXT_GUIDE_02_INFO_MAINSCREEN = new WpadTextView(context, false, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.TEXTS.GUIDE_02_INFO_MAINSCREEN_IHN1010).W, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.TEXTS.GUIDE_02_INFO_MAINSCREEN_IHN1010).H, Gravity.LEFT, Color.WHITE, nManualInfoFontSize, false, ID.MANUAL.MANUALMAIN.ELEMENTS.TEXTS.GUIDE_02_INFO_MAINSCREEN_IHN1010);
                 ViewRegistration(layout, TXT_GUIDE_02_INFO_MAINSCREEN, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.TEXTS.GUIDE_02_INFO_MAINSCREEN_IHN1010).X, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.TEXTS.GUIDE_02_INFO_MAINSCREEN_IHN1010).Y);
                 TXT_GUIDE_02_INFO_MAINSCREEN.setText(strGuide02MainScreen_IHN1010);

+ 3 - 3
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/menu/CallSubMenuScreen.java

@@ -92,7 +92,7 @@ public class CallSubMenuScreen {
 			if (retArray != null) {
 				if (retArray[0] == COMPONENT_USE) {
 					Common.DebugLog("Get_Light_info :" + retArray[1] );
-					if (Version.getModelType() == MODEL_TYPE.IHN_D101 || Version.getModelType() == MODEL_TYPE.IHN_D101_I
+					if (Version.getModelType() == MODEL_TYPE.IHN_D101 || Version.getModelType() == MODEL_TYPE.IHN_D101_I || Version.getModelType() == MODEL_TYPE.IHN_D101_I_LX2
 							|| Version.getModelType() == MODEL_TYPE.IHN_D101K || Version.getModelType() == MODEL_TYPE.IHN_D101K_I
 							|| Version.getModelType() == MODEL_TYPE.IHN_D101_I_OCF) {
 						if (UseIparkEnergy == 1) {
@@ -166,7 +166,7 @@ public class CallSubMenuScreen {
 			retArray = devDB.Get_DoorLock_Info();
 			if (retArray != null) {
 				if (retArray[0] == COMPONENT_USE) {
-					if (Version.getModelType() == MODEL_TYPE.IHN_D101 || Version.getModelType() == MODEL_TYPE.IHN_D101_I
+					if (Version.getModelType() == MODEL_TYPE.IHN_D101 || Version.getModelType() == MODEL_TYPE.IHN_D101_I || Version.getModelType() == MODEL_TYPE.IHN_D101_I_LX2
 							|| Version.getModelType() == MODEL_TYPE.IHN_D101K || Version.getModelType() == MODEL_TYPE.IHN_D101K_I
 							|| Version.getModelType() == MODEL_TYPE.IHN_D101_I_OCF) {
 						if (retArray[1] == WallpadDeviceSet.DOORLOCK_TYPE_RF) {
@@ -288,7 +288,7 @@ public class CallSubMenuScreen {
 		boolean retChange = false;
 		Log.d(TAG, "-----CheckMultiSwitchConcent ");
 
-		if (Version.getModelType() != Version.MODEL_TYPE.IHN_D101 && Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I
+		if (Version.getModelType() != Version.MODEL_TYPE.IHN_D101 && Version.getModelType() != Version.MODEL_TYPE.IHN_D101_I && Version.getModelType() != MODEL_TYPE.IHN_D101_I_LX2
 				&& Version.getModelType() != Version.MODEL_TYPE.IHN_D101K && Version.getModelType() != Version.MODEL_TYPE.IHN_D101K_I
 				&& Version.getModelType() != MODEL_TYPE.IHN_D101_I_OCF) {
 			WallpadDeviceSet devDB = new WallpadDeviceSet(mContext);

+ 2 - 2
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/screen/MAIN.java

@@ -319,7 +319,7 @@ public class MAIN extends WpadScreen {
                     BTN_LIGHT_PRESET_04.setTouchDelayMs(500);
                 }
             }
-            else if (Version.getModelType() == Version.MODEL_TYPE.IHN_1010 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I) {
+            else if (Version.getModelType() == Version.MODEL_TYPE.IHN_1010 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_LX2) {
                 if (getKCCDimmingCtrl()) {
                     Log.w(TAG, "[registerLightCtrlBTN] Register 4 preset buttons!! -> IHN_1010(-I)");
                     BTN_LIGHT_PRESET_01_DIMMING = new WpadImageView(mContext, TOUCH_KIND.BUTTON, getPosition(ID.SCREENS.MAIN.ELEMENTS.BTNS.LIGHT_PRESET_01_DIMMING).W, getPosition(ID.SCREENS.MAIN.ELEMENTS.BTNS.LIGHT_PRESET_01_DIMMING).H, new int[] { R.drawable.main_btn_preset01_dim_normal_normal, R.drawable.main_btn_preset01_dim_normal_pressed }, new int[] { R.drawable.main_btn_preset01_dim_normal_selected, R.drawable.main_btn_preset01_dim_normal_pressed }, ID.SCREENS.MAIN.ELEMENTS.BTNS.LIGHT_PRESET_01_DIMMING);
@@ -507,7 +507,7 @@ public class MAIN extends WpadScreen {
                 if (loadHDCLivingLightController(mWallPadAPI) >= 0) updateHDCLivingLightStatus(false);
                 else HDCLivingLightDriverCheckHandler.sendEmptyMessage(0);
             }
-            else if (Version.getModelType() == Version.MODEL_TYPE.IHN_1010 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I) {
+            else if (Version.getModelType() == Version.MODEL_TYPE.IHN_1010 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_LX2) {
                 if (getKCCDimmingCtrl()) {
                     mMultiSwitchData = new MultiSwitchAPI.Data();
                     if (loadMultiSwitchController(mWallPadAPI) >= 0) updateMultiSwitchStatus(false, (byte) 0x00);

+ 4 - 4
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/IconManager.java

@@ -338,7 +338,7 @@ public class IconManager {
              */
 
             // 거실조명 or 조명
-            if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+            if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF) {
                 if (Common.CurrentDistributionPanelType == Version.DISTRIBUTION_MODEL.KNX_DIST) {
@@ -744,7 +744,7 @@ public class IconManager {
 
                 if (bCtrlUse) {
                     // 거실조명 or 조명
-                    if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+                    if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                             || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                             || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF) {
                         mIconInfoTable.addIconInfo(ID.ICONS.MENUS.CTRL_LIVINGLIGHT.getID(), ID.ICONS.MENUS.CTRL_LIVINGLIGHT.getNameKR(), ID.LINKEDSCREEN.SubMenuCtrl.HDC_LivingLamp,
@@ -1087,7 +1087,7 @@ public class IconManager {
 
                 if (bCtrlUse) {
                     // 거실조명 or 조명
-                    if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+                    if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                             || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                             || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF) {
                         mIconInfoTable.addIconInfo(ID.ICONS.MENUS.CTRL_LIVINGLIGHT.getID(), ID.ICONS.MENUS.CTRL_LIVINGLIGHT.getNameKR(), ID.LINKEDSCREEN.SubMenuCtrl.HDC_LivingLamp,
@@ -1667,7 +1667,7 @@ public class IconManager {
              */
 
             // 거실조명 or 조명
-            if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+            if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF) {
                 mIconInfoTable.addIconInfo(ID.ICONS.MENUS.CTRL_LIVINGLIGHT.getID(), ID.ICONS.MENUS.CTRL_LIVINGLIGHT.getNameKR(), ID.LINKEDSCREEN.SubMenuCtrl.HDC_LivingLamp,

+ 2 - 2
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/ShortcutBox.java

@@ -535,7 +535,7 @@ public class ShortcutBox {
                 Log.i(TAG, "[getEntireShortcutData] naVentilEnable[" + i + "] = " + naVentilEnable[i]);
             }
 
-			if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+			if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
 					|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
 					|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF) {
                 // 엘리베이터
@@ -665,7 +665,7 @@ public class ShortcutBox {
                     retAllWidget[i] = allWidget[i];
                 }
             }
-            else if (Version.getModelType() == Version.MODEL_TYPE.IHN_1010 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I) {
+            else if (Version.getModelType() == Version.MODEL_TYPE.IHN_1010 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_LX2) {
                 // 엘리베이터
                 if (strElevEnable!=null && strElevEnable.contains("사용함")) {
                     allWidget[nWidgetCnt++] = new IconUnitInfo(ID.SHORTCUTS.IDS.ELEVATOR, ID.SHORTCUTS.NAMES.ELEVATOR, ID.LINKEDSCREEN.OtherFunc.ELEVATOR_CALL,

+ 18 - 0
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/WallPadiMAPUpgrade.java

@@ -537,9 +537,11 @@ public class WallPadiMAPUpgrade {
     public static final String IHN_1040_ID = "IHN1040";   // 보급형(엔트리급) 월패드
     public static final String IHN_1050_ID = "IHN1050";   // 대우건설향 월패드
 	public static final String IHN_D101_I_ID = "IHND101-I";   // 조그월패드 (중국생산)
+	public static final String IHN_D101_I_LX2_ID = "IHND101-I-LX";   // 조그월패드 (중국생산)
 	public static final String IHN_D101K_I_ID = "IHND101K-I";   // 카카오 조그월패드 (중국생산)
 	public static final String IHN_D101_I_OCF_ID = "IHND101-I-OCF";   // 조그월패드 (OCF 월패드, 중국생산)
 	public static final String IHN_1010_I_ID = "IHN1010-I";   // 대외향 월패드 (중국생산)
+	public static final String IHN_1010_I_LX2_ID = "IHN1010-I-LX2";   // 대외향 월패드 고급주택(중국생산)
 	public static final String IHN_1010GL_I_ID = "IHN1010GL-I";   // 연합사업지용 월패드 (중국생산)
 	public static final String IHN_1010GL_I_2443_ID = "IHN1010GL-I-2443";   // 현산향 2443 대체품 월패드 (중국생산)
 	public static final String IHN_1010GL_I_6410_ID = "IHN1010GL-I-6410";   // 현산향 6410 대체품 월패드 (중국생산)
@@ -602,6 +604,14 @@ public class WallPadiMAPUpgrade {
 						return false;
 					}
 				}
+				else if(Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2) {
+					// V40 플랫폼 업그레이드
+					if (!(astrFileName[1].equals(DEV_V40_ARCH_ID) || astrFileName[1].equals(DEV_A40i_ARCH_ID)) || !astrFileName[2].equals(IHN_D101_I_LX2_ID)  || (astrFileName[3].length() != 14)) {
+						Log.d( TAG ,  "[checkDownloadFilename] astrFileName[1] : + " + astrFileName[1] + ", DEV_V40_ARCH_ID :" + DEV_V40_ARCH_ID);
+						Log.d( TAG ,  "[checkDownloadFilename] astrFileName[3].length() : + " + astrFileName[3].length());
+						return false;
+					}
+				}
 				else if(Version.getModelType() == Version.MODEL_TYPE.IHN_D101K) {
 					// V40 플랫폼 업그레이드
 					if (!(astrFileName[1].equals(DEV_V40_ARCH_ID) || astrFileName[1].equals(DEV_A40i_ARCH_ID)) || !astrFileName[2].equals(IHN_D101K_ID)  || (astrFileName[3].length() != 14)) {
@@ -642,6 +652,14 @@ public class WallPadiMAPUpgrade {
 						return false;
 					}
 				}
+				else if(Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_LX2) {
+					// V40 플랫폼 업그레이드
+					if (!(astrFileName[1].equals(DEV_V40_ARCH_ID) || astrFileName[1].equals(DEV_A40i_ARCH_ID)) || !astrFileName[2].equals(IHN_1010_I_LX2_ID)  || (astrFileName[3].length() != 14)) {
+						Log.d( TAG ,  "[checkDownloadFilename] astrFileName[1] : + " + astrFileName[1] + ", DEV_V40_ARCH_ID :" + DEV_V40_ARCH_ID);
+						Log.d( TAG ,  "[checkDownloadFilename] astrFileName[3].length() : + " + astrFileName[3].length());
+						return false;
+					}
+				}
                 else if(Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL) {
                     // V40 플랫폼 업그레이드
                     if (!(astrFileName[1].equals(DEV_V40_ARCH_ID) || astrFileName[1].equals(DEV_A40i_ARCH_ID)) || !astrFileName[2].equals(IHN_1010GL_ID)  || (astrFileName[3].length() != 14)) {

+ 20 - 20
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/iMapServer.java

@@ -882,7 +882,7 @@ public class iMapServer extends Service {
                                     // 센서 체크하고
                                     // 현관폰으로 사운드 출력하고
                                     boolean bSensorOk = false;
-                                    if (Version.getModelType() == MODEL_TYPE.IHN_D101 || Version.getModelType() == MODEL_TYPE.IHN_D101_I
+                                    if (Version.getModelType() == MODEL_TYPE.IHN_D101 || Version.getModelType() == MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                                             || Version.getModelType() == MODEL_TYPE.IHN_D101K || Version.getModelType() == MODEL_TYPE.IHN_D101K_I
                                             || Version.getModelType() == MODEL_TYPE.IHN_1010GL || Version.getModelType() == MODEL_TYPE.IHN_1010GL_I
                                             || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_6410
@@ -1187,7 +1187,7 @@ public class iMapServer extends Service {
                     // 센서 체크하는 부분이 들어가야 함
                     Common.SendAppFinishReqBR(getApplicationContext());
 
-                    if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+                    if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                             || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                             || Version.getModelType() == MODEL_TYPE.IHN_1010GL || Version.getModelType() == MODEL_TYPE.IHN_1010GL_I
                             || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_6410
@@ -1444,7 +1444,7 @@ public class iMapServer extends Service {
 
             mWallPadAPI.SetDevService_DoorCamUseOnOff(true);
 
-            if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+            if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                     || Version.getModelType() == MODEL_TYPE.IHN_1010GL || Version.getModelType() == MODEL_TYPE.IHN_1010GL_I
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_6410
@@ -1546,7 +1546,7 @@ public class iMapServer extends Service {
                 LogUtil.errorLogInfo("", TAG, e);
             }
 
-            if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+            if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                     || Version.getModelType() == MODEL_TYPE.IHN_1010GL || Version.getModelType() == MODEL_TYPE.IHN_1010GL_I
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_6410
@@ -2333,7 +2333,7 @@ public class iMapServer extends Service {
                                 if (ModelType == MODEL_TYPE.IHN_1020GL) {
                                     mIGW200.ctrlDeviceIO(IGW200dAPI.OUTPUT.DOOR_POWER, true);
                                     mIGW200.ctrlDeviceIO(IGW200dAPI.OUTPUT.BELL_CONT, true);
-                                } else if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+                                } else if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                                         || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                                         || Version.getModelType() == MODEL_TYPE.IHN_1010GL || Version.getModelType() == MODEL_TYPE.IHN_1010GL_I
                                         || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_6410
@@ -2454,7 +2454,7 @@ public class iMapServer extends Service {
 
                         if (MgrAppRun) return;
 
-                        if (Version.getModelType() == MODEL_TYPE.IHN_1010 || Version.getModelType() == MODEL_TYPE.IHN_1010_I) {
+                        if (Version.getModelType() == MODEL_TYPE.IHN_1010 || Version.getModelType() == MODEL_TYPE.IHN_1010_I || Version.getModelType() == MODEL_TYPE.IHN_1010_I_LX2) {
                             WallPadInterface mWallPadInterface = new WallPadInterface();
                             int sensorMag = mWallPadInterface.DoControl(WallPadInterface.IOCTL_SENSOR_MAG0_STATE, 0);
                             if (sensorMag == 0) return;
@@ -2544,7 +2544,7 @@ public class iMapServer extends Service {
                             return;
                         }
 
-                        if (Version.getModelType() == MODEL_TYPE.IHN_1010 || Version.getModelType() == MODEL_TYPE.IHN_1010_I) {
+                        if (Version.getModelType() == MODEL_TYPE.IHN_1010 || Version.getModelType() == MODEL_TYPE.IHN_1010_I || Version.getModelType() == MODEL_TYPE.IHN_1010_I_LX2) {
                             WallPadInterface mWallPadInterface = new WallPadInterface();
                             int sensorMag = mWallPadInterface.DoControl(WallPadInterface.IOCTL_SENSOR_MOTIN_STATE, 0);
                             if (sensorMag == 0) return;
@@ -2579,7 +2579,7 @@ public class iMapServer extends Service {
                             return;
                         }
 
-                        if (Version.getModelType() == MODEL_TYPE.IHN_1010 || Version.getModelType() == MODEL_TYPE.IHN_1010_I) {
+                        if (Version.getModelType() == MODEL_TYPE.IHN_1010 || Version.getModelType() == MODEL_TYPE.IHN_1010_I || Version.getModelType() == MODEL_TYPE.IHN_1010_I_LX2) {
                             WallPadInterface mWallPadInterface = new WallPadInterface();
                             int sensorMag = mWallPadInterface.DoControl(WallPadInterface.IOCTL_SENSOR_MOTOUT_STATE, 0);
                             if (sensorMag == 0) return;
@@ -2901,7 +2901,7 @@ public class iMapServer extends Service {
         mWallPadAPI = new WallPadAPI(this.getApplicationContext());
         if (Version.getModelType() == MODEL_TYPE.IHN_1020GL)
             IGW200APICheckHandler.sendEmptyMessage(0);
-        if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+        if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                 || Version.getModelType() == MODEL_TYPE.IHN_1010GL || Version.getModelType() == MODEL_TYPE.IHN_1010GL_I
                 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_6410
@@ -3431,7 +3431,7 @@ public class iMapServer extends Service {
                                 retXML = iCMDProcLivingLightControl(doc);
                             }
                         } else if (cmd.equalsIgnoreCase("remote_access_electric")) {
-                            if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I
+                            if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                                     || ModelType == Version.MODEL_TYPE.IHN_D101K || ModelType == Version.MODEL_TYPE.IHN_D101K_I
                                     || ModelType == MODEL_TYPE.IHN_D101_I_OCF) {
                                 retXML = iCMDProcSDPConcentControl(doc);
@@ -3495,7 +3495,7 @@ public class iMapServer extends Service {
                         } else if (cmd.equalsIgnoreCase("remote_access_onepass")) {
                             retXML = iCMDProcOnePass(elelist);
                         } else if (cmd.equalsIgnoreCase("remote_entire_access_light_control")) {
-                            if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+                            if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                                     || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                                     || Version.getModelType() == MODEL_TYPE.IHN_D101_I_OCF) {
                                 retXML = iCMDProcEntireLightControl(doc); // 전체 조명 제어
@@ -4166,7 +4166,7 @@ public class iMapServer extends Service {
                                     Iintent.putExtra(define.NOTIBR_KIND, define.NOTIFY_SET_KITCHENTV_VOLUME);
                                     sendBroadcast(Iintent);
                                 } else if (devname.equals("현관카메라")) {
-                                    if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+                                    if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == MODEL_TYPE.IHN_D101_I_LX2
                                             || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                                             || Version.getModelType() == MODEL_TYPE.IHN_1010GL || Version.getModelType() == MODEL_TYPE.IHN_1010GL_I
                                             || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_6410
@@ -5598,7 +5598,7 @@ public class iMapServer extends Service {
                 }
                 else if (devlist[i].equals("light")) {
                     try {
-                        if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+                        if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == MODEL_TYPE.IHN_D101_I_LX2
                                 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                                 || Version.getModelType() == MODEL_TYPE.IHN_D101_I_OCF) {
                             if (bLightCMDUseAsSmartLight) {
@@ -5645,7 +5645,7 @@ public class iMapServer extends Service {
                 else if (devlist[i].equals("livinglight")) {
                     try {
                         int[] lightinfo = devSet.Get_Light_info();
-                        if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+                        if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == MODEL_TYPE.IHN_D101_I_LX2
                                 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                                 || Version.getModelType() == MODEL_TYPE.IHN_D101_I_OCF) {
                             if (bLightCMDUseAsSmartLight) {
@@ -5761,7 +5761,7 @@ public class iMapServer extends Service {
                                 strResult += "         <devinfo name=\"electric\" value=\"" + BadConcentCount + "\" floor=\"" + ho + "\"/>\r\n";
                             }
                         } else {
-                            if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+                            if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == MODEL_TYPE.IHN_D101_I_LX2
                                     || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                                     || Version.getModelType() == MODEL_TYPE.IHN_D101_I_OCF) {
                                 int nOutlet = 0;
@@ -5837,7 +5837,7 @@ public class iMapServer extends Service {
                                         if (KnxApi.data.LivingRoom_EnergyMeter.Info.LightCount > 0)
                                             LivingLightCount = 1;
                                     }
-                                    int AllEMcount = LivingLightCount + KnxApi.data.MasterController.Info.Bad_EnergyMeterCount; // + KnxApi.data.MasterController.Info.Liv_EnergyMeterCount;
+                                    int AllEMcount = LivingLightCount + KnxApi.data.MasterController.Info.Bad_EnergyMeterCount + KnxApi.data.MasterController.Info.Light_SwitchCount; // + KnxApi.data.MasterController.Info.Liv_EnergyMeterCount;
                                     strResult += "         <devinfo name=\"smartlight\" value=\"" + AllEMcount + "\" order=\"" + strLight + "\" floor=\"" + ho + "\"/>\r\n";
                                 }
                             }
@@ -7144,7 +7144,7 @@ public class iMapServer extends Service {
                                 } else {
                                     SendBR = false;
                                 }
-                            } else if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+                            } else if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                                     || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                                     || Version.getModelType() == MODEL_TYPE.IHN_1010GL || Version.getModelType() == MODEL_TYPE.IHN_1010GL_I
                                     || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_6410
@@ -7196,7 +7196,7 @@ public class iMapServer extends Service {
                                     } else {
                                         SendBR = false;
                                     }
-                                } else if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+                                } else if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == MODEL_TYPE.IHN_D101_I_LX2
                                         || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                                         || Version.getModelType() == MODEL_TYPE.IHN_1010GL || Version.getModelType() == MODEL_TYPE.IHN_1010GL_I
                                         || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_6410
@@ -14508,7 +14508,7 @@ public class iMapServer extends Service {
     private void startDistributionPanel() {
         try {
             // 영업샘플 모드 판단
-            if (Version.getModelType() == MODEL_TYPE.IHN_D101 || Version.getModelType() == MODEL_TYPE.IHN_D101_I
+            if (Version.getModelType() == MODEL_TYPE.IHN_D101 || Version.getModelType() == MODEL_TYPE.IHN_D101_I || Version.getModelType() == MODEL_TYPE.IHN_D101_I_LX2
                     || Version.getModelType() == MODEL_TYPE.IHN_D101K || Version.getModelType() == MODEL_TYPE.IHN_D101K_I
                     || Version.getModelType() == MODEL_TYPE.IHN_D101_I_OCF) {
                 Log.i(TAG, "[startDistributionPanel] Normal working or Business sample mode!!!");
@@ -16084,7 +16084,7 @@ public class iMapServer extends Service {
     public void checkDoorCamConfig() {
         try {
             if (Build.VERSION.SDK_INT > 23) {
-                if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+                if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == MODEL_TYPE.IHN_D101_I_LX2
                         || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                         || Version.getModelType() == MODEL_TYPE.IHN_1010GL || Version.getModelType() == MODEL_TYPE.IHN_1010GL_I
                         || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_6410

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

@@ -2155,7 +2155,7 @@ public class DataSenderService extends Service {
                                 if (mKnxAPI.data.LivingRoom_EnergyMeter.Info.LightCount > 0)
                                     LivingLightCount = 1;
                             }
-                            int AllEMcount = LivingLightCount + mKnxAPI.data.MasterController.Info.Bad_EnergyMeterCount; // + KnxApi.data.MasterController.Info.Liv_EnergyMeterCount;
+                            int AllEMcount = LivingLightCount + mKnxAPI.data.MasterController.Info.Bad_EnergyMeterCount + mKnxAPI.data.MasterController.Info.Light_SwitchCount;;
                             strResult += "         <devinfo name=\"smartlight\" value=\"" + AllEMcount + "\" order=\"" + strLight + "\" floor=\"" + index + "\"/>\r\n";
                         }
                     } catch (Exception ek) {

BIN
WallPadOutmodeRun/libs/WallPadSupport.jar


+ 1 - 1
WallPadOutmodeRun/src/main/java/kr/co/icontrols/wallpadoutmoderun/screen/OutModeSecurityRun.java

@@ -73,7 +73,7 @@ public class OutModeSecurityRun extends WpadScreen{
             if (Version.getModelType() == Version.MODEL_TYPE.IHN_1020GL) {
                 Common.command_iGW200(this.getContext(), Common.IGW200_SENSOR_CHECK);
             }
-            else if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+            else if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_6410

BIN
WallPadSecurity/libs/WallPadSupport.jar


+ 1 - 1
WallPadSecurity/src/main/java/kr/co/icontrols/wallpadsecurity/manual/SetLinkCtr_Manual.java

@@ -58,7 +58,7 @@ public class SetLinkCtr_Manual extends WpadScreen {
                     "난방일시정지/외출 해제 : 체크하시면 외출 복귀 시 난방이 평상시 상태로 복귀됩니다." + "\r\n" +
                     "환기동작 : 체크하시면 외출 복귀 시 환기가 동작됩니다." + "\r\n";
 
-            if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+            if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF)
             {

+ 1 - 1
WallPadSecurity/src/main/java/kr/co/icontrols/wallpadsecurity/screen/PopupOutModeWaiting.java

@@ -673,7 +673,7 @@ public class PopupOutModeWaiting extends WpadScreen
 			}
 			return false;
 		}
-		else if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+		else if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
 				|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
 				|| Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I
 				|| Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_6410

+ 3 - 3
WallPadSecurity/src/main/java/kr/co/icontrols/wallpadsecurity/screen/SecurityMainScreen.java

@@ -126,7 +126,7 @@ public class SecurityMainScreen extends WpadScreen {
                     int[] BatchInfo = devSet.Get_BatchSW_Info();
                     devSet.closeDB();
 
-                    if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+                    if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                             || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                             || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I
                             || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_6410
@@ -189,7 +189,7 @@ public class SecurityMainScreen extends WpadScreen {
                 }
                 else return false;
             }
-            else if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+            else if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_6410
@@ -410,7 +410,7 @@ public class SecurityMainScreen extends WpadScreen {
                 }
                 else return false;
             }
-            else if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+            else if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I
                     || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_6410

+ 2 - 2
WallPadSecurity/src/main/java/kr/co/icontrols/wallpadsecurity/screen/SetLinkCtrlMainScreen.java

@@ -196,7 +196,7 @@ public class SetLinkCtrlMainScreen extends WpadScreen{
 			if (wdb != null) {
 				// 방범센서설정 체크
 				if (Version.getModelType() != Version.MODEL_TYPE.IHN_1020GL) {
-					if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+					if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
 							|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
 							|| Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I
 							|| Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_6410
@@ -264,7 +264,7 @@ public class SetLinkCtrlMainScreen extends WpadScreen{
 
 				// 웰컴조명
 				if ((nDistributionPanelType == Version.DISTRIBUTION_MODEL.SMART_DIST)
-						&& (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+						&& (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
 						|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
 						|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF)) {
 					ComeBackList.add(MODE_TEXT.WELCOME_LIGHT_D101);

BIN
WallPadSupport/jar/WallPadSupport.jar


+ 9 - 0
WallPadSupport/src/main/java/kr/co/icontrols/wallpadsupport/Version.java

@@ -267,6 +267,12 @@ public class Version {
         /** 대외향 6410 대체 월패드 (중국생산보드) */
         public final static int IHN_1010_I_6410 = PLATFORM_TYPE.A40i + DEVICE_TYPE.WALLPAD + 670;
 
+        /** 현산향 - 조그휠 월패드 (고급주택형)*/
+        public final static int IHN_D101_I_LX2 = PLATFORM_TYPE.A40i + DEVICE_TYPE.WALLPAD + 680;
+
+        /** 대외고급형 - 월패드 (고급주택형)*/
+        public final static int IHN_1010_I_LX2 = PLATFORM_TYPE.A40i + DEVICE_TYPE.WALLPAD + 690;
+
 
 
         /** 로비폰 */
@@ -345,6 +351,8 @@ public class Version {
         else if (ModelName.equals("ILP-300FR-2443")) mModelType = MODEL_TYPE.ILP_300FR_2443;
         else if (ModelName.equals("ILP-300-6410")) mModelType = MODEL_TYPE.ILP_300_6410;
         else if (ModelName.equals("ILP-300FR-6410")) mModelType = MODEL_TYPE.ILP_300FR_6410;
+        else if (ModelName.equals("IHN-D101-I_LX2")) mModelType = MODEL_TYPE.IHN_D101_I_LX2;
+        else if (ModelName.equals("IHN-1010-I_LX2")) mModelType = MODEL_TYPE.IHN_1010_I_LX2;
         else mModelType = MODEL_TYPE.OTHER;
 
         return mModelType;
@@ -426,6 +434,7 @@ public class Version {
             case MODEL_TYPE.IHN_D101K:
             case MODEL_TYPE.IHN_D101K_I:
             case MODEL_TYPE.IHN_D101_I_OCF:
+            case MODEL_TYPE.IHN_D101_I_LX2:
             case MODEL_TYPE.IHN_1010GL_I_2443:
             case MODEL_TYPE.IHN_1010GL_I_6410:
                 return true;