|
@@ -2339,14 +2339,13 @@ public class MainActivity extends WpadActivity {
|
|
|
int[] nDoorlockType = mWallpadDeviceSet.Get_DoorLock_Info();
|
|
|
int[] nVentilType = mWallpadDeviceSet.Get_Ventil_Info();
|
|
|
int nHeatingUsage = mWallpadDeviceSet.Get_Temper_Info();
|
|
|
- //가스는 설정과 관계없이 true
|
|
|
- //int nGasValveUsage = mWallpadDeviceSet.Get_GAS_Info();
|
|
|
- int nGasValveUsage = WallpadDeviceSet.DO_USE;
|
|
|
+ int nGasValveUsage = mWallpadDeviceSet.Get_GAS_Info();
|
|
|
boolean bElecCooktopUsage = mWallpadDeviceSet.Get_ElectricRange_Use();
|
|
|
boolean bCooktopOutletUsage = mWallpadDeviceSet.Get_CookTopConcent_Use();
|
|
|
int nSystemAirconUsage = mWallpadDeviceSet.Get_AirCON_Info();
|
|
|
int nPurityUsage = mWallpadDeviceSet.Get_Purity_Info();
|
|
|
int nConcentEnable = mWallpadDeviceSet.Get_Concent_Info(); // 콘센트 사용 유무
|
|
|
+ boolean bInterWPMultiCtrlUsage = mWallpadDeviceSet.Get_InterWallPadMultiCtrlUsage(); // 월패드간 제어기기 멀티제어 지원여부
|
|
|
mWallpadDeviceSet.closeDB();
|
|
|
|
|
|
WallpadStatusData mWallpadStatusData = new WallpadStatusData(getContext());
|
|
@@ -2377,7 +2376,7 @@ public class MainActivity extends WpadActivity {
|
|
|
nChildCnt++;
|
|
|
}
|
|
|
|
|
|
- if (nGasValveUsage == WallpadDeviceSet.DO_USE) {
|
|
|
+ if (nGasValveUsage == WallpadDeviceSet.DO_USE || bInterWPMultiCtrlUsage) {
|
|
|
arrayList.add(API_Menu.SubMenuCtrl.Name_Gas);
|
|
|
nChildCnt++;
|
|
|
}
|