|
@@ -85,6 +85,7 @@ import kr.co.icontrols.wallpadhomectrl.screen.screen_light.LightHdcLivKnxMainScr
|
|
|
import kr.co.icontrols.wallpadhomectrl.screen.screen_light.LightHdcLivMainScreen;
|
|
|
import kr.co.icontrols.wallpadhomectrl.screen.screen_light.LightHdcNEachMainScreen;
|
|
|
import kr.co.icontrols.wallpadhomectrl.screen.screen_light.LightKnxMainScreen;
|
|
|
+import kr.co.icontrols.wallpadhomectrl.screen.screen_multi.VentilationMainTestScreen;
|
|
|
import kr.co.icontrols.wallpadhomectrl.screen.screen_purity.PurityMainScreen;
|
|
|
import kr.co.icontrols.wallpadhomectrl.screen.screen_venti.VentiEasymodeScreen;
|
|
|
import kr.co.icontrols.wallpadhomectrl.screen.screen_venti.VentiMainScreen;
|
|
@@ -1213,6 +1214,8 @@ public class MainActivity extends WpadActivity {
|
|
|
setChangeScreen(API_Menu.SubMenuCtrl.Gas, false);
|
|
|
} else if (mCurrentScreenId == API_Menu.SubMenuCtrl.SystemAircon) {
|
|
|
setChangeScreen(API_Menu.SubMenuCtrl.SystemAircon, false);
|
|
|
+ } else if (mCurrentScreenId == API_Menu.SubMenuCtrl.ChangAir_Normal) {
|
|
|
+ setChangeScreen(API_Menu.SubMenuCtrl.ChangAir_Normal, false);
|
|
|
}
|
|
|
}else {
|
|
|
//다른층
|
|
@@ -1226,6 +1229,8 @@ public class MainActivity extends WpadActivity {
|
|
|
StartMultiControl(ID.screen.GasTestScreen, index+1);
|
|
|
} else if (mCurrentScreenId == API_Menu.SubMenuCtrl.SystemAircon) {
|
|
|
StartMultiControl(ID.screen.SystemAirconTest1Screen, index+1);
|
|
|
+ } else if (mCurrentScreenId == API_Menu.SubMenuCtrl.ChangAir_Normal) {
|
|
|
+ StartMultiControl(ID.screen.VentiMainTestScreen, index+1);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -1752,8 +1757,11 @@ public class MainActivity extends WpadActivity {
|
|
|
if (nDistributionPanelType == Version.DISTRIBUTION_MODEL.KNX_DIST) {
|
|
|
//고급향은 환기가 3개임. KNX 쪽으로 우선 분기를 태움.
|
|
|
SetTitleText(API_Menu.SubMenuCtrl.Name_Venti);
|
|
|
- knxVentiMainScreen = new KnxVentiMainScreen(this, ScreenLayout, wpapi, OPERATION_MODE, nScreenId);
|
|
|
- super.setCurrentScreen(knxVentiMainScreen);
|
|
|
+ //고급향 환기 테스트 때문에 임시로 바꿈.
|
|
|
+ //knxVentiMainScreen = new KnxVentiMainScreen(this, ScreenLayout, wpapi, OPERATION_MODE, nScreenId);
|
|
|
+ //super.setCurrentScreen(knxVentiMainScreen);
|
|
|
+ ventilationMainScreen = new VentilationMainScreen(this, ScreenLayout, wpapi, OPERATION_MODE, nScreenId);
|
|
|
+ super.setCurrentScreen(ventilationMainScreen);
|
|
|
}
|
|
|
else {
|
|
|
SetTitleText(API_Menu.SubMenuCtrl.Name_Venti);
|
|
@@ -1765,6 +1773,8 @@ public class MainActivity extends WpadActivity {
|
|
|
setAIRBackBtnVisible(false);
|
|
|
setKccDimmBtnVisible(false);
|
|
|
setVentilBackBtnVisible(false);
|
|
|
+ setMultiBtnVisible(true);
|
|
|
+
|
|
|
result = true;
|
|
|
}
|
|
|
else {
|
|
@@ -1788,8 +1798,11 @@ public class MainActivity extends WpadActivity {
|
|
|
else {
|
|
|
if (nDistributionPanelType == Version.DISTRIBUTION_MODEL.KNX_DIST) {
|
|
|
SetTitleText(API_Menu.SubMenuCtrl.Name_Venti);
|
|
|
- knxVentiMainScreen = new KnxVentiMainScreen(this, ScreenLayout, wpapi, OPERATION_MODE, nScreenId);
|
|
|
- super.setCurrentScreen(knxVentiMainScreen);
|
|
|
+ //테스트 때문에 바꿈
|
|
|
+ //knxVentiMainScreen = new KnxVentiMainScreen(this, ScreenLayout, wpapi, OPERATION_MODE, nScreenId);
|
|
|
+ //super.setCurrentScreen(knxVentiMainScreen);
|
|
|
+ ventilationMainScreen = new VentilationMainScreen(this, ScreenLayout, wpapi, OPERATION_MODE, nScreenId);
|
|
|
+ super.setCurrentScreen(ventilationMainScreen);
|
|
|
setManualBtnVisible(false, 1019);
|
|
|
}
|
|
|
else {
|
|
@@ -1808,6 +1821,8 @@ public class MainActivity extends WpadActivity {
|
|
|
setAIRBackBtnVisible(false);
|
|
|
setKccDimmBtnVisible(false);
|
|
|
setVentilBackBtnVisible(false);
|
|
|
+ setMultiBtnVisible(true);
|
|
|
+
|
|
|
result = true;
|
|
|
}
|
|
|
}
|
|
@@ -2005,11 +2020,16 @@ public class MainActivity extends WpadActivity {
|
|
|
mCurrentMultiScreenId = ID.screen.HeatingV2TestScreen;
|
|
|
result = true;
|
|
|
break;
|
|
|
- case ID.screen.GasTestScreen: // sub - 공지사항 내용
|
|
|
+ case ID.screen.GasTestScreen: // 가스
|
|
|
HybridCookTopTestScreen hybridCookTopTestScreen = new HybridCookTopTestScreen(this, ScreenLayout, wpapi, OPERATION_MODE);
|
|
|
super.setCurrentScreen(hybridCookTopTestScreen);
|
|
|
result = true;
|
|
|
break;
|
|
|
+ case ID.screen.VentiMainTestScreen: // 환기
|
|
|
+ VentilationMainTestScreen ventilationMainTestScreen = new VentilationMainTestScreen(this, ScreenLayout, wpapi, OPERATION_MODE, nScreenId);
|
|
|
+ super.setCurrentScreen(ventilationMainTestScreen);
|
|
|
+ result = true;
|
|
|
+ break;
|
|
|
|
|
|
default:
|
|
|
result = false;
|