Browse Source

모델명 분기 누락 처리, 테스트 코드 제거.

jslee(madeinlab) 3 years ago
parent
commit
57aff37227

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

@@ -130,7 +130,7 @@ public class SetAddress extends Activity
                 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) {
+                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_D101_I_OCF) {
                     setContentView(R.layout.activity_set_address_d101);
                 }
                 else if (ModelType == Version.MODEL_TYPE.IHN_D101K || ModelType == Version.MODEL_TYPE.IHN_D101K_I) {
@@ -229,7 +229,7 @@ public class SetAddress extends Activity
         else if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101K || ModelType == Version.MODEL_TYPE.IHN_1010GL
                 || ModelType == Version.MODEL_TYPE.IHN_D101_I || ModelType == Version.MODEL_TYPE.IHN_D101K_I || ModelType == Version.MODEL_TYPE.IHN_1010GL_I
                 || ModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443 || ModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410
-                || ModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
+                || ModelType == Version.MODEL_TYPE.IHN_D101_I_OCF || ModelType == Version.MODEL_TYPE.IHN_D101_I_LX2)
         {
             initView_D101();
         }
@@ -629,7 +629,7 @@ public class SetAddress extends Activity
             {
                 String title = "Inspection mode";
                 String message = "Set as production inspection?\n";
-                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
                         || ModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443 || ModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410
@@ -1032,7 +1032,7 @@ public class SetAddress extends Activity
             mDong = "101";   // 동정보 입력
             mHo = "101";   // 호정보 입력
 
-            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) {
                 mWallpadDeviceSet.Set_DoorCameraType(WallpadDeviceSet.DOORTYPE_IOT_SMART);   // 스마트 IoT 현관카메라

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

@@ -527,7 +527,7 @@ public class CheckSensorFragment extends Fragment {
 
         initSensorView();
 
-        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)) {
             closeThread = new CloseThread();
@@ -1065,7 +1065,7 @@ public class CheckSensorFragment extends Fragment {
 
 
 
-        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
@@ -1340,7 +1340,7 @@ public class CheckSensorFragment extends Fragment {
 
         int idx = detectingType - SENSOR_TYPE_BASE;
         if (DEBUG)  Log.d(TAG, "idx : " + idx);
-        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

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

@@ -273,7 +273,7 @@ public class SettingDebuggingFragment extends Fragment implements SwitchButton.S
 
             addControllerVO(Const.CONTROLLER_TYPE_CALLAPP_TIMEOUT_ONOFF);
 
-            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);

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

@@ -2105,7 +2105,7 @@ public class wallpaddbmgr {
                 );
             }
         }
-        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_D101_I_OCF)
         {
             for (int i = 0; i < iHND101_DevicesSettingInitData.length; i++) {
@@ -2614,19 +2614,24 @@ public class wallpaddbmgr {
             InsertinitWidgetData(9, define.ICONS.MENUS.SECURITY_SETARMED.getID());
             InsertinitWidgetData(10, define.ICONS.MENUS.ADD_CCTV.getID());
             InsertinitWidgetData(11, define.ICONS.MENUS.SETTING_CONFIG.getID());
+
+
         }
         else if(mModelType == Version.MODEL_TYPE.IHN_D101_I_LX2){
-            InsertinitWidgetData(0, define.ICONS.MENUS.MAIN_ELEVATOR.getID());
+            //InsertinitWidgetData(0, define.ICONS.MENUS.MAIN_ELEVATOR.getID());
             InsertinitWidgetData(1, define.ICONS.MENUS.TALK_FRONT.getID());
-            InsertinitWidgetData(2, define.ICONS.MENUS.TALK_GUARD.getID());
-            InsertinitWidgetData(3, define.ICONS.MENUS.CTRL_LIVINGLIGHT.getID());
+            //InsertinitWidgetData(2, define.ICONS.MENUS.TALK_GUARD.getID());
+            //InsertinitWidgetData(3, define.ICONS.MENUS.CTRL_LIVINGLIGHT.getID());
+            InsertinitWidgetData(8, define.ICONS.MENUS.CTRL_LIGHT.getID());   // 조명
             InsertinitWidgetData(4, define.ICONS.MENUS.CTRL_HEATING.getID());
             InsertinitWidgetData(5, define.ICONS.MENUS.CTRL_VENT.getID());
+            InsertinitWidgetData(5, define.ICONS.MENUS.CTRL_SYSTEMAIRCON.getID());
+            InsertinitWidgetData(6, define.ICONS.MENUS.CTRL_GAS.getID());
             InsertinitWidgetData(6, define.ICONS.MENUS.ENERGY_SMARTPANEL.getID());
-            InsertinitWidgetData(7, define.ICONS.MENUS.ADD_NOTICE.getID());
-            InsertinitWidgetData(8, define.ICONS.MENUS.ADD_MEMO.getID());
-            InsertinitWidgetData(9, define.ICONS.MENUS.SECURITY_SETARMED.getID());
-            InsertinitWidgetData(10, define.ICONS.MENUS.ADD_CCTV.getID());
+            //InsertinitWidgetData(7, define.ICONS.MENUS.ADD_NOTICE.getID());
+            //InsertinitWidgetData(8, define.ICONS.MENUS.ADD_MEMO.getID());
+            //InsertinitWidgetData(9, define.ICONS.MENUS.SECURITY_SETARMED.getID());
+            //InsertinitWidgetData(10, define.ICONS.MENUS.ADD_CCTV.getID());
             InsertinitWidgetData(11, define.ICONS.MENUS.SETTING_CONFIG.getID());
         }
         else if (mModelType == Version.MODEL_TYPE.IHN_HS101 || mModelType == Version.MODEL_TYPE.IHN_HS101_I) {

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

@@ -619,7 +619,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
@@ -764,7 +764,7 @@ public class DriverInterOpAPI {
      */
     public int setAllLight(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) {
                 int onoff = 0;
@@ -861,7 +861,7 @@ public class DriverInterOpAPI {
      */
     public boolean getAllLight() {
         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) {
                 //Log.i(TAG, "[getAllLight] - IHN_D101");
@@ -966,7 +966,7 @@ public class DriverInterOpAPI {
         try {
             String DriverTitleStr = null;
 
-            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) {
                 //DriverTitleStr = define.DRIVER_TITLE_SDB_LIVINGROOM_LIGHT;
@@ -1059,7 +1059,7 @@ public class DriverInterOpAPI {
         }
 
         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) {
                 // 스마트분전반 - 거실에너지미터 조명 제어
@@ -1252,7 +1252,7 @@ public class DriverInterOpAPI {
      */
     public boolean getLight(byte index) {
         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) {
                 WallpadDeviceSet wds = new WallpadDeviceSet(ServiceMain.svcContext);
@@ -1482,7 +1482,7 @@ public class DriverInterOpAPI {
      */
     public int setSdbAllLightControl(boolean OnOff, byte Dimming, byte Color, boolean ColorControl) {
         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
                     || mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
                     || mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF) {
                 DeviceLog(null ,"setSdbAllLightControl(OnOff:" + OnOff + ", Dimming:" + Dimming + ", Color:" + Color + ", ColorControl:" + ColorControl + ")");
@@ -1521,7 +1521,7 @@ public class DriverInterOpAPI {
 	 */
     public int setSdbEachRoomLightOnOffControl(byte RoomIndex, 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) {
 				DeviceLog(null ,"D101 - setSdbEachRoomLightControl - Start");
@@ -1574,7 +1574,7 @@ public class DriverInterOpAPI {
      */
     public int setSdbEachRoomDimControl(byte RoomIndex, byte LightIndex, byte DimLevel) {
         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) {
                 DeviceLog(null ,"D101 - setSdbEachRoomDimControl - Start");
@@ -1627,7 +1627,7 @@ public class DriverInterOpAPI {
      */
     public int setRealTimeMeterElecAccSave() {
         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) {
                 DeviceLog(null ,"setRealTimeMeterElecAccSave()");

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

@@ -577,7 +577,7 @@ public class MainActivity extends WpadActivity {
 		wds.closeDB();
 
 		//for test
-		nDistributionPanelType = Version.DISTRIBUTION_MODEL.KNX_DIST;
+		//nDistributionPanelType = Version.DISTRIBUTION_MODEL.KNX_DIST;
 
 		if (gateway == Version.GATEWAY_MODEL.IGW_200) {
 			Log.i(TAG, "[onCreate] IGW_200 SET @@@@@@@@@@@@@@@@@@@@");

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

@@ -1242,7 +1242,7 @@ public class SystemAirconMainScreen extends WpadScreen {
             //에어컨 연동상태를 체크해서 에어컨 연동완료 일때만 UI를 그려준다. 그 이전에 alarm 문구 노출.
             info.ToDebugString();
             //for test
-            info.hAirconStatus = DataClasses.SystemAircon.Status.COMPLETE;
+            //info.hAirconStatus = DataClasses.SystemAircon.Status.COMPLETE;
             //end
             if (info.hAirconStatus == DataClasses.SystemAircon.Status.COMPLETE) {
                 TXT_INSTRUCTION.setVisibility(View.GONE);

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

@@ -4002,7 +4002,6 @@ public class MainActivity extends WpadActivity {
 
 
  */
-
             // 공지사항, 택배, 스마트 우편
             WallpadStatusData mWallpadStatusData = new WallpadStatusData(this.getContext());
             try {
@@ -4061,8 +4060,6 @@ public class MainActivity extends WpadActivity {
 
             Log.d(TAG,"[checkEventNotifications] nMissedCallCnt [" + nMissedCallCnt + "], nVisitorPicCnt [" + nVisitorPicCnt + "], nNoticeCnt [" + nNoticeCnt + "], nParcelCnt [" + nParcelCnt + "], nPostCnt [" + nPostCnt + "], nElecVehicleChangingCnt [" + nElecVehicleChangingCnt + "]");
 
-
-
             sendEventNotiBR(nMissedCallCnt, nVisitorPicCnt, nNoticeCnt, nParcelCnt, nPostCnt, nElecVehicleChangingCnt);
             Send_NotiSmartSwitch(MainActivity.nNoticeCnt, MainActivity.nParcelCnt, MainActivity.nVisitorPicCnt);
         } catch (RuntimeException re) {

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

@@ -115,7 +115,7 @@ public class MANUAL_MAIN extends WpadScreen {
             TXT_GUIDE_01_SHORTCUT.setText(strGuide01Shortcut);
 
             // page 2
-            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) {
                 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);
@@ -137,7 +137,7 @@ public class MANUAL_MAIN extends WpadScreen {
             ViewRegistration(layout, TXT_GUIDE_02_TITLE_MAINSCREEN, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.TEXTS.GUIDE_02_TITLE_MAINSCREEN).X, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.TEXTS.GUIDE_02_TITLE_MAINSCREEN).Y);
             TXT_GUIDE_02_TITLE_MAINSCREEN.setText(strGuide02TitleMainScreen);
 
-            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) {
                 TXT_GUIDE_02_INFO_MAINSCREEN = new WpadTextView(context, false, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.TEXTS.GUIDE_02_INFO_MAINSCREEN_IHND101).W, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.TEXTS.GUIDE_02_INFO_MAINSCREEN_IHND101).H, Gravity.LEFT, Color.WHITE, nManualInfoFontSize, false, ID.MANUAL.MANUALMAIN.ELEMENTS.TEXTS.GUIDE_02_INFO_MAINSCREEN_IHND101);

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

@@ -109,7 +109,7 @@ public class IGW300 {
                 WallPadInterface mWallPadInterface = new WallPadInterface();
                 mWallPadInterface.DoControl(WallPadInterface.IOCTL_MOOD_BACKLIGHT_SET, 255);
             }
-            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) {
                 setSendEventBR(WallPadInterface.EVT_BLACKOUT_OCCURRED);
@@ -121,7 +121,7 @@ public class IGW300 {
                 WallPadInterface mWallPadInterface  = new WallPadInterface();
                 mWallPadInterface.DoControl(WallPadInterface.IOCTL_MOOD_BACKLIGHT_SET, 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) {
                 setSendEventBR(WallPadInterface.EVT_BLACKOUT_RELEASED);

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

@@ -424,7 +424,7 @@ public class MobileProcService extends Service {
 				mIntentFilter.addAction(MobileServiceID.BR_LIVING_LIGHT);
 				mIntentFilter.addAction(MobileServiceID.BR_ENERGY_METER);
 			}
-			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) {
 				// 조그 월패드
@@ -473,7 +473,7 @@ public class MobileProcService extends Service {
 					if (mIntLightAPI != null) mIntLightAPI.regChangedBR( MobileServiceID.BR_LIVING_LIGHT);
 					if (mEnergyMeterAPI != null) mEnergyMeterAPI.regChangedBR(MobileServiceID.BR_ENERGY_METER);
 				}
-				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) {
 					if (mSdb_LivingRoomLightAPI != null) mSdb_LivingRoomLightAPI.regChangedBR( MobileServiceID.BR_SDB_LIVING_EVENT );
@@ -563,7 +563,7 @@ public class MobileProcService extends Service {
 				}
 				else Log.w(TAG, "[checkChangedLivingLight] mIntLightAPI is null!!");
 			}
-			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) {
 			}
@@ -1329,7 +1329,7 @@ public class MobileProcService extends Service {
 		XmlBoddy += "      <req_company>" + convertHDCLinkerArrayToString(astrHDCLinkers) + "</req_company>\r\n";
 
 		// 거실조명
-		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) {
 			// 스마트분전반 거실조명 (거실 에너지미터 연동)

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

@@ -8418,6 +8418,7 @@ public class iMapServer extends Service {
             if(knxRoomNameList==null)   knxRoomNameList = defaultNameList;
 
             int BadLightCount = KnxApi.data.MasterController.Info.Bad_EnergyMeterCount;
+            int SwitchCount = KnxApi.data.MasterController.Info.Light_SwitchCount;
             int totalLightCount = LivingLightCount + BadLightCount;
             //mData.MasterController.Info.Light_SwitchCount