|
@@ -52,6 +52,7 @@ import kr.co.icontrols.wallpadhomectrl.declare.ID;
|
|
|
import kr.co.icontrols.wallpadhomectrl.screen.screen_aircon.SystemAirconMainScreen;
|
|
|
import kr.co.icontrols.wallpadhomectrl.screen.screen_airquality.AirQualityMainScreen;
|
|
|
import kr.co.icontrols.wallpadhomectrl.screen.screen_airquality.DustInfoScreen;
|
|
|
+import kr.co.icontrols.wallpadhomectrl.screen.screen_concent.ConcentEnergyMeterScreen;
|
|
|
import kr.co.icontrols.wallpadhomectrl.screen.screen_concent.ConcentHdcNEachMainScreen;
|
|
|
import kr.co.icontrols.wallpadhomectrl.screen.screen_concent.ConcentKnxMainScreen;
|
|
|
import kr.co.icontrols.wallpadhomectrl.screen.screen_concent.ConcentMainScreen;
|
|
@@ -198,6 +199,7 @@ public class MainActivity extends WpadActivity {
|
|
|
private DustInfoScreen dustInfoScreen = null;
|
|
|
private ConcentMainScreen concentMainScreen = null;
|
|
|
private ConcentKnxMainScreen concentKnxMainScreen = null;
|
|
|
+ private ConcentEnergyMeterScreen concentEnergyMeterScreen = null;
|
|
|
|
|
|
private HybridCookTopMainScreen hybridCookTopMainScreen = null;
|
|
|
|
|
@@ -265,6 +267,7 @@ public class MainActivity extends WpadActivity {
|
|
|
// int SmartDistUse = -1;
|
|
|
// boolean KnxDistUse = false;
|
|
|
public static int nDistributionPanelType = Version.DISTRIBUTION_MODEL.OTHER;
|
|
|
+ public static int nEnergyProductionUse;
|
|
|
|
|
|
private VentiAPI mVentilAPI = null;
|
|
|
private KnxVentiAPI mKnxVentilAPI = null;
|
|
@@ -504,6 +507,7 @@ public class MainActivity extends WpadActivity {
|
|
|
WallpadDeviceSet wds = new WallpadDeviceSet(getContext());
|
|
|
int gateway = wds.GetGatewayModelKindInfo();
|
|
|
nDistributionPanelType = wds.Get_DistributionPannelType_Info();
|
|
|
+ nEnergyProductionUse = wds.Get_Energy_Devices_Info(); //에너지 제품군
|
|
|
wds.closeDB();
|
|
|
|
|
|
if (gateway == Version.GATEWAY_MODEL.IGW_200) {
|
|
@@ -1731,7 +1735,9 @@ public class MainActivity extends WpadActivity {
|
|
|
super.setCurrentScreen(concentKnxMainScreen);
|
|
|
setManualBtnVisible(false, 1019);
|
|
|
}
|
|
|
- else {
|
|
|
+
|
|
|
+ else
|
|
|
+ {
|
|
|
SetTitleText(API_Menu.SubMenuCtrl.Name_Concent);
|
|
|
concentMainScreen = new ConcentMainScreen(this, ScreenLayout, wpapi, OPERATION_MODE, mDefaultRoomNameList_Light);
|
|
|
super.setCurrentScreen(concentMainScreen);
|
|
@@ -1746,8 +1752,20 @@ public class MainActivity extends WpadActivity {
|
|
|
|
|
|
case API_Menu.SubMenuCtrl.HDCLivingNEach_Concent:
|
|
|
SetTitleText(API_Menu.SubMenuCtrl.Name_Concent);
|
|
|
- concentHdcNEachMainScreen = new ConcentHdcNEachMainScreen(this, ScreenLayout, wpapi, OPERATION_MODE, mRoomNameList_Light);
|
|
|
- super.setCurrentScreen(concentHdcNEachMainScreen);
|
|
|
+ //여기서 에너지 미터 사용 여부 체크해서 사용하면 에너지 미터 화면을 가져다가 사용하도록 함
|
|
|
+ if(nEnergyProductionUse == WallpadDeviceSet.DO_USE)
|
|
|
+ {
|
|
|
+
|
|
|
+ concentEnergyMeterScreen = new ConcentEnergyMeterScreen(this, ScreenLayout, wpapi, OPERATION_MODE, mDefaultRoomNameList_Light);
|
|
|
+ super.setCurrentScreen(concentEnergyMeterScreen);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ concentHdcNEachMainScreen = new ConcentHdcNEachMainScreen(this, ScreenLayout, wpapi, OPERATION_MODE, mRoomNameList_Light);
|
|
|
+ super.setCurrentScreen(concentHdcNEachMainScreen);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
setTopBoilerBtnVisible(false);
|
|
|
setAIRBackBtnVisible(false);
|
|
|
setKccDimmBtnVisible(false);
|