Selaa lähdekoodia

[조명]
1. 메인화면 아이콘 서치 주소 매칭

DESKTOP-FBA840V\icontrols 4 vuotta sitten
vanhempi
commit
80dc4792c6

+ 3 - 2
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/declare/ID.java

@@ -1681,11 +1681,12 @@ public final class ID {
             public final static int ChangAir_Normal	     = BASE + 61;        // 환기 일반
             public final static int ChangAir_LH		     = BASE + 62;        // 환기 LH
             public final static int ChangAir_Hood	     = BASE + 63;        // 환기 후드
-            public final static int SystemAircon	     = BASE + 71;        // 시스템 에어컨
-            public final static int Curtain			     = BASE + 81;        // 커튼
+            public final static int SystemAircon	         = BASE + 71;        // 시스템 에어컨
+            public final static int Curtain			         = BASE + 81;        // 커튼
             public final static int AirQualty = BASE + 91;				 // 공기질 센서
             public final static int ElecCooktop = BASE + 101;				 // 전기레인지
             public final static int CooktopOutlet = BASE + 111;				 // 쿡탑콘센트
+            public final static int HDCLivingNEach_Lamp     = BASE + 16;     // 혼합형조명 ( 멀티스위치 )
 
         }
 

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

@@ -96,7 +96,8 @@ public class CallSubMenuScreen {
 						}
 					}
 					else if (Version.getModelType() == MODEL_TYPE.IHN_1010GL || Version.getModelType() == MODEL_TYPE.IHN_1010GL_I) {
-						LampID = ID.LINKEDSCREEN.SubMenuCtrl.OutSide_EachLamp;
+						//LampID = ID.LINKEDSCREEN.SubMenuCtrl.OutSide_EachLamp;
+						LampID = ID.LINKEDSCREEN.SubMenuCtrl.HDCLivingNEach_Lamp;
 					}
 					else {
 						if (GetZeroEnergyHouseInfo() == true) {
@@ -842,10 +843,10 @@ public class CallSubMenuScreen {
 				makeHomeCtrlMenuList();
 			}
 
-			if (nScreenID >= ID.LINKEDSCREEN.SubMenuCtrl.HDC_LivingLamp && nScreenID <= ID.LINKEDSCREEN.SubMenuCtrl.OutSide_EachLamp) {
+			if (nScreenID >= ID.LINKEDSCREEN.SubMenuCtrl.HDC_LivingLamp && nScreenID <= ID.LINKEDSCREEN.SubMenuCtrl.HDCLivingNEach_Lamp) {
                 Log.d(TAG, "[callStartHomeCtrlAPK] ===== 1 =====");
                 for (int i = 0; i < m_HomeCtrlMenuList.length; i++) Log.d(TAG, "[callStartHomeCtrlAPK] m_HomeCtrlMenuList[" + i + "] = " +m_HomeCtrlMenuList[i]);
-				int findIdx = findSubMenuListIdx(ID.LINKEDSCREEN.SubMenuCtrl.HDC_LivingLamp, ID.LINKEDSCREEN.SubMenuCtrl.OutSide_EachLamp);
+				int findIdx = findSubMenuListIdx(ID.LINKEDSCREEN.SubMenuCtrl.HDC_LivingLamp, ID.LINKEDSCREEN.SubMenuCtrl.HDCLivingNEach_Lamp);
                 Log.d(TAG, "[callStartHomeCtrlAPK] findIdx [" + findIdx + "]");
                 Log.d(TAG, "[callStartHomeCtrlAPK] ===== 2 =====");
 				if (findIdx >= 0) {