|
@@ -42,6 +42,9 @@ public class IconManager {
|
|
|
boolean bCookTopOutletEnable = false;
|
|
|
int nSystemAirconEnable = WallpadDeviceSet.DO_NOT_USE;
|
|
|
boolean bShadingEnable = false;
|
|
|
+
|
|
|
+
|
|
|
+ int[] naSubWallPadLight;
|
|
|
|
|
|
|
|
|
boolean bRemoteMeterEnable = false;
|
|
@@ -189,6 +192,10 @@ public class IconManager {
|
|
|
naKeyType = mWallpadDeviceSet.Get_BLESmartKey_Info();
|
|
|
bNonInternetSupportEnable = mWallpadDeviceSet.Get_NonInternetSupportUse();
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+ if(mWallpadDeviceSet.getIsSubWallpad()) naSubWallPadLight = mWallpadDeviceSet.GetSubWpdDirect_Light();
|
|
|
+
|
|
|
if (mWallpadDeviceSet != null) mWallpadDeviceSet.closeDB();
|
|
|
|
|
|
mWallpadStatusData = new WallpadStatusData(mContext);
|
|
@@ -1382,6 +1389,8 @@ public class IconManager {
|
|
|
* - 이웃 : 세대 수신/발신
|
|
|
*
|
|
|
* # 제어 (제어연동기능은 제주 내도동 파라곤만 적용이며, 이후 현장에는 없다. 현산/대외 모두 동일)
|
|
|
+ * - 조명(멀티스위치 연동하여 사용)
|
|
|
+ *
|
|
|
* - 난방
|
|
|
* > 병합세대의 밸브제어기가 통합 된 경우(1개) : 난방 상태 확인, 난방 제어 기능 (On/Off, 온도설정)
|
|
|
* > 병합세대의 밸브제어기가 분리된 경우 (2개) : 메인월패드와 기능 동일 (On/Off, 온도설정, 외출설정) -> 메인월패드와 서브월패드가 각각 1개의 밸브제어기와 연동한다.
|
|
@@ -1417,6 +1426,47 @@ public class IconManager {
|
|
|
mIconInfoTable.addIconInfo(ID.ICONS.MENUS.TALK_GUARD.getID(), ID.ICONS.MENUS.TALK_GUARD.getNameKR(), ID.LINKEDSCREEN.SubCall.Guard,
|
|
|
R.drawable.icon_talk_guard_normal, R.drawable.icon_talk_guard_pressed, R.drawable.icon_talk_guard_pressed, R.drawable.icon_talk_guard_pressed);
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ if(naSubWallPadLight!=null && naSubWallPadLight.length == 2)
|
|
|
+ {
|
|
|
+ if(naSubWallPadLight[1] == WallpadDeviceSet.SUBWPD_CTR_DIRECT)
|
|
|
+ {
|
|
|
+
|
|
|
+ if (naLightEnable != null && naLightEnable[0] == WallpadDeviceSet.DO_USE) {
|
|
|
+ if (naLightEnable[1] == WallpadDeviceSet.LIGHT_TYPE_LIVING) {
|
|
|
+
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.CTRL_LIGHT.getID(), ID.ICONS.MENUS.CTRL_LIGHT.getNameKR(), ID.LINKEDSCREEN.SubMenuCtrl.OutSide_livingLamp,
|
|
|
+ R.drawable.icon_ctrl_light_normal, R.drawable.icon_ctrl_light_pressed, R.drawable.icon_ctrl_light_pressed, R.drawable.icon_ctrl_light_pressed);
|
|
|
+ }
|
|
|
+ else if (naLightEnable[1] == WallpadDeviceSet.LIGHT_TYPE_ROOM) {
|
|
|
+
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.CTRL_LIGHT.getID(), ID.ICONS.MENUS.CTRL_LIGHT.getNameKR(), ID.LINKEDSCREEN.SubMenuCtrl.OutSide_EachLamp,
|
|
|
+ R.drawable.icon_ctrl_light_normal, R.drawable.icon_ctrl_light_pressed, R.drawable.icon_ctrl_light_pressed, R.drawable.icon_ctrl_light_pressed);
|
|
|
+
|
|
|
+ }
|
|
|
+ else if (naLightEnable[1] == WallpadDeviceSet.LIGHT_TYPE_HDC_INTLIGHT_NORMAL) {
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.CTRL_LIGHT.getID(), ID.ICONS.MENUS.CTRL_LIGHT.getNameKR(), ID.LINKEDSCREEN.SubMenuCtrl.HDCLivingNEach_Lamp,
|
|
|
+ R.drawable.icon_ctrl_light_normal, R.drawable.icon_ctrl_light_pressed, R.drawable.icon_ctrl_light_pressed, R.drawable.icon_ctrl_light_pressed);
|
|
|
+
|
|
|
+ }
|
|
|
+ else if (naLightEnable[1] == WallpadDeviceSet.LIGHT_TYPE_HDC_INTLIGHT_ADD_BATCHLIGHT) {
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.CTRL_LIGHT.getID(), ID.ICONS.MENUS.CTRL_LIGHT.getNameKR(), ID.LINKEDSCREEN.SubMenuCtrl.OutSide_EachLamp,
|
|
|
+ R.drawable.icon_ctrl_light_normal, R.drawable.icon_ctrl_light_pressed, R.drawable.icon_ctrl_light_pressed, R.drawable.icon_ctrl_light_pressed);
|
|
|
+ }
|
|
|
+ else if (naLightEnable[1] == WallpadDeviceSet.LIGHT_TYPE_HDC_INTLIGHT_ADD_BATCHLIGHT_MULTISWITCH) {
|
|
|
+
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.CTRL_LIGHT.getID(), ID.ICONS.MENUS.CTRL_LIGHT.getNameKR(), ID.LINKEDSCREEN.SubMenuCtrl.HDCLivingNEnergyMeter_Lamp,
|
|
|
+ R.drawable.icon_ctrl_light_normal, R.drawable.icon_ctrl_light_pressed, R.drawable.icon_ctrl_light_pressed, R.drawable.icon_ctrl_light_pressed);
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ Log.w(TAG, "[setWallpadFunction] naLightEnable[1] is not available!! -> " + naLightEnable[1]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
부가 App
|
|
|
*/
|