|
@@ -8,6 +8,8 @@ import com.artncore.WallPadDataMgr.WallpadStatusData;
|
|
|
import com.artncore.wallpadapi.WallPadAPI;
|
|
|
import com.util.LogUtil;
|
|
|
|
|
|
+import java.util.Arrays;
|
|
|
+
|
|
|
import kr.co.icontrols.wallpadmain.MainActivity;
|
|
|
import kr.co.icontrols.wallpadmain.R;
|
|
|
import kr.co.icontrols.wallpadmain.declare.Common;
|
|
@@ -74,6 +76,8 @@ public class IconManager {
|
|
|
String strElevEnable = null; // 엘리베이터
|
|
|
boolean bNonInternetSupportEnable = false; // 인터넷 미지원 현장 (true : 인터넷 미지원, false : 인터넷 지원) -> 외부인터넷 필요한 기능 사용여부 설정 (날씨, 일정표, 전자액자)
|
|
|
|
|
|
+ boolean bInterWPMultiCtrlUsage = false; // 월패드간 제어기기 멀티제어
|
|
|
+
|
|
|
|
|
|
public IconManager(Context context, WallPadAPI wallpadapi) {
|
|
|
try {
|
|
@@ -214,6 +218,8 @@ public class IconManager {
|
|
|
naKeyType = mWallpadDeviceSet.Get_BLESmartKey_Info(); // 출입키 종류
|
|
|
bNonInternetSupportEnable = mWallpadDeviceSet.Get_NonInternetSupportUse(); // 인터넷 미지원
|
|
|
|
|
|
+ bInterWPMultiCtrlUsage = mWallpadDeviceSet.Get_InterWallPadMultiCtrlUsage(); // 월패드간 제어기기 멀티제어 지원여부
|
|
|
+
|
|
|
if (mWallpadDeviceSet != null) mWallpadDeviceSet.closeDB();
|
|
|
|
|
|
mWallpadStatusData = new WallpadStatusData(mContext);
|
|
@@ -227,44 +233,39 @@ public class IconManager {
|
|
|
Log.i(TAG, "[getSettingInfofromDB] nInterFloorNoiseSensorEnable [" + nInterFloorNoiseSensorEnable + "], bRemoteMeterEnable [" + bRemoteMeterEnable + "], nDistributionPanelType [" + nDistributionPanelType + "], nParkingLocationEnable [" + nParkingLocationEnable + "], nCCTVMonitoringEnable [" + nCCTVMonitoringEnable + "]");
|
|
|
Log.i(TAG, "[getSettingInfofromDB] nElecVehicleChargingEnable [" + nElecVehicleChargingEnable + "], naKeyType [" + naKeyType + "], strElevEnable [" + strElevEnable + "]");
|
|
|
Log.i(TAG, "[getSettingInfofromDB] bMultiSWOutlet [" + bMultiSWOutlet + "], bNonInternetSupportEnable [" + bNonInternetSupportEnable + "], bCookTopOutletEnable [" + bCookTopOutletEnable + "], nSystemAirconEnable [" + nSystemAirconEnable + "], bVisitedVehicleEnable [" + bVisitedVehicleEnable + "]");
|
|
|
- Log.i(TAG, "[getSettingInfofromDB] bBandLocationEnable [" + bBandLocationEnable + "], bGuardingStreetLamp [" + bGuardingStreetLamp + "]");
|
|
|
+ Log.i(TAG, "[getSettingInfofromDB] bBandLocationEnable [" + bBandLocationEnable + "], bGuardingStreetLamp [" + bGuardingStreetLamp + "], nMobileDeviceRegEnable [" + nMobileDeviceRegEnable + "], nOccupancySensorEnable [" + nOccupancySensorEnable + "], bHSPlatformDeviceEnable [" + bHSPlatformDeviceEnable + "]");
|
|
|
+ Log.i(TAG, "[getSettingInfofromDB] bStrangerRecordingEnable [" + bStrangerRecordingEnable + "], bInterWPMultiCtrlUsage [" + bInterWPMultiCtrlUsage + "]");
|
|
|
|
|
|
if (naAllLightOffEnable != null) {
|
|
|
- for (int i = 0; i < naAllLightOffEnable.length; i++) {
|
|
|
- Log.i(TAG, "[getSettingInfofromDB] naAllLightOffEnable[" + i + "] = " + naAllLightOffEnable[i]);
|
|
|
- }
|
|
|
+ Log.i(TAG, "[getSettingInfofromDB] naAllLightOffEnable " + Arrays.toString(naAllLightOffEnable));
|
|
|
}
|
|
|
|
|
|
if (naLightEnable != null) {
|
|
|
- for (int i = 0; i < naLightEnable.length; i++) {
|
|
|
- Log.i(TAG, "[getSettingInfofromDB] naLightEnable[" + i + "] = " + naLightEnable[i]);
|
|
|
- }
|
|
|
+ Log.i(TAG, "[getSettingInfofromDB] naLightEnable " + Arrays.toString(naLightEnable));
|
|
|
}
|
|
|
|
|
|
if (naDoorlockEnable != null) {
|
|
|
- for (int i = 0; i < naDoorlockEnable.length; i++) {
|
|
|
- Log.i(TAG, "[getSettingInfofromDB] naDoorlockEnable[" + i + "] = " + naDoorlockEnable[i]);
|
|
|
- }
|
|
|
+ Log.i(TAG, "[getSettingInfofromDB] naDoorlockEnable " + Arrays.toString(naDoorlockEnable));
|
|
|
}
|
|
|
|
|
|
if (naVentilEnable != null) {
|
|
|
- for (int i = 0; i < naVentilEnable.length; i++) {
|
|
|
- Log.i(TAG, "[getSettingInfofromDB] naVentilEnable[" + i + "] = " + naVentilEnable[i]);
|
|
|
- }
|
|
|
+ Log.i(TAG, "[getSettingInfofromDB] naVentilEnable " + Arrays.toString(naVentilEnable));
|
|
|
}
|
|
|
|
|
|
if (naFrontCamInfoEnable != null) {
|
|
|
- for (int i = 0; i < naFrontCamInfoEnable.length; i++) {
|
|
|
- Log.i(TAG, "[getSettingInfofromDB] naFrontCamInfoEnable[" + i + "] = " + naFrontCamInfoEnable[i]);
|
|
|
- }
|
|
|
+ Log.i(TAG, "[getSettingInfofromDB] naFrontCamInfoEnable " + Arrays.toString(naFrontCamInfoEnable));
|
|
|
}
|
|
|
|
|
|
if (naRealtimeEnergyMeterEnable != null) {
|
|
|
- for (int i = 0; i < naRealtimeEnergyMeterEnable.length; i++) {
|
|
|
- Log.i(TAG, "[getSettingInfofromDB] naRealtimeEnergyMeterEnable[" + i + "] = " + naRealtimeEnergyMeterEnable[i]);
|
|
|
- }
|
|
|
+ Log.i(TAG, "[getSettingInfofromDB] naRealtimeEnergyMeterEnable " + Arrays.toString(naRealtimeEnergyMeterEnable));
|
|
|
+ }
|
|
|
+
|
|
|
+ if (naKeyType != null) {
|
|
|
+ Log.i(TAG, "[getSettingInfofromDB] naKeyType " + Arrays.toString(naKeyType));
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
} catch (RuntimeException re) {
|
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
|
if (mWallpadDeviceSet != null) mWallpadDeviceSet.closeDB();
|
|
@@ -403,8 +404,8 @@ public class IconManager {
|
|
|
R.drawable.icon_ctrl_heating_normal, R.drawable.icon_ctrl_heating_pressed, R.drawable.icon_ctrl_heating_pressed, R.drawable.icon_ctrl_heating_pressed);
|
|
|
}
|
|
|
|
|
|
- // 가스
|
|
|
- if (nGasValveEnable == WallpadDeviceSet.DO_USE) {
|
|
|
+ // 가스 (가스가 사용안함으로 되어 있더라도, 월패드간 멀티제어를 지원하는 경우에는 가스 아이콘을 표기한다.)
|
|
|
+ if (nGasValveEnable == WallpadDeviceSet.DO_USE || bInterWPMultiCtrlUsage) {
|
|
|
mIconInfoTable.addIconInfo(ID.ICONS.MENUS.CTRL_GAS.getID(), ID.ICONS.MENUS.CTRL_GAS.getNameKR(), ID.LINKEDSCREEN.SubMenuCtrl.Gas,
|
|
|
R.drawable.icon_ctrl_gas_normal, R.drawable.icon_ctrl_gas_pressed, R.drawable.icon_ctrl_gas_pressed, R.drawable.icon_ctrl_gas_pressed);
|
|
|
}
|