|
@@ -269,6 +269,8 @@ public class MainActivity extends WpadActivity {
|
|
|
public static int nDistributionPanelType = Version.DISTRIBUTION_MODEL.OTHER;
|
|
|
public static int nEnergyProductionUse;
|
|
|
|
|
|
+ public static int nShadingType;
|
|
|
+
|
|
|
private VentiAPI mVentilAPI = null;
|
|
|
private KnxVentiAPI mKnxVentilAPI = null;
|
|
|
DataClasses.Venti VentilStatus;
|
|
@@ -508,6 +510,7 @@ public class MainActivity extends WpadActivity {
|
|
|
int gateway = wds.GetGatewayModelKindInfo();
|
|
|
nDistributionPanelType = wds.Get_DistributionPannelType_Info();
|
|
|
nEnergyProductionUse = wds.Get_Energy_Devices_Info();
|
|
|
+ nShadingType = wds.Get_Shading_Use();
|
|
|
wds.closeDB();
|
|
|
|
|
|
if (gateway == Version.GATEWAY_MODEL.IGW_200) {
|
|
@@ -1821,8 +1824,10 @@ public class MainActivity extends WpadActivity {
|
|
|
|
|
|
|
|
|
case API_Menu.SubMenuCtrl.Curtain:
|
|
|
- SetTitleText(API_Menu.SubMenuCtrl.Name_Curtain);
|
|
|
- curTainV1MainScreen = new CurTainV1MainScreen(this, ScreenLayout, wpapi, OPERATION_MODE);
|
|
|
+ String name = API_Menu.SubMenuCtrl.Name_Curtain;
|
|
|
+ if(nShadingType == WallpadDeviceSet.RollScreen) name = "롤스크린";
|
|
|
+ SetTitleText(name);
|
|
|
+ curTainV1MainScreen = new CurTainV1MainScreen(this, ScreenLayout, wpapi, OPERATION_MODE, nShadingType);
|
|
|
super.setCurrentScreen(curTainV1MainScreen);
|
|
|
setTopBoilerBtnVisible(false);
|
|
|
setAIRBackBtnVisible(false);
|
|
@@ -2126,7 +2131,7 @@ public class MainActivity extends WpadActivity {
|
|
|
int[] nLightType = mWallpadDeviceSet.Get_Light_info();
|
|
|
int[] nDoorlockType = mWallpadDeviceSet.Get_DoorLock_Info();
|
|
|
int[] nVentilType = mWallpadDeviceSet.Get_Ventil_Info();
|
|
|
- boolean bShadingEnable = mWallpadDeviceSet.Get_Shading_Use();
|
|
|
+ int bShadingEnable = mWallpadDeviceSet.Get_Shading_Use();
|
|
|
int nHeatingUsage = mWallpadDeviceSet.Get_Temper_Info();
|
|
|
int nGasValveUsage = mWallpadDeviceSet.Get_GAS_Info();
|
|
|
boolean bElecCooktopUsage = mWallpadDeviceSet.Get_ElectricRange_Use();
|
|
@@ -2213,9 +2218,11 @@ public class MainActivity extends WpadActivity {
|
|
|
nChildCnt++;
|
|
|
}
|
|
|
|
|
|
- if (bShadingEnable) {
|
|
|
+ if (bShadingEnable!=WallpadDeviceSet.DO_NOT_USE) {
|
|
|
|
|
|
- arrayList.add(API_Menu.SubMenuCtrl.Name_Curtain);
|
|
|
+ String name = API_Menu.SubMenuCtrl.Name_Curtain;
|
|
|
+ if(bShadingEnable == WallpadDeviceSet.RollScreen) name = "롤스크린";
|
|
|
+ arrayList.add(name);
|
|
|
nChildCnt++;
|
|
|
}
|
|
|
|
|
@@ -2379,7 +2386,13 @@ public class MainActivity extends WpadActivity {
|
|
|
*/
|
|
|
else if (arrayList.get(i).equals(API_Menu.SubMenuCtrl.Name_Curtain)) {
|
|
|
tempMenuListDataClass.idMappingTable[i].Id = API_Menu.SubMenuCtrl.Curtain;
|
|
|
- tempMenuListDataClass.idMappingTable[i].Name = API_Menu.SubMenuCtrl.Name_Curtain;
|
|
|
+ String name = API_Menu.SubMenuCtrl.Name_Curtain;
|
|
|
+ tempMenuListDataClass.idMappingTable[i].Name = name;
|
|
|
+ }
|
|
|
+ else if (arrayList.get(i).equals("롤스크린")) {
|
|
|
+ tempMenuListDataClass.idMappingTable[i].Id = API_Menu.SubMenuCtrl.Curtain;
|
|
|
+ String name = "롤스크린";
|
|
|
+ tempMenuListDataClass.idMappingTable[i].Name = name;
|
|
|
}
|
|
|
else if (arrayList.get(i).equals(API_Menu.SubMenuCtrl.Name_InnerAirQuality)) {
|
|
|
tempMenuListDataClass.idMappingTable[i].Id = API_Menu.SubMenuCtrl.Inner_AirQuality;
|