|
@@ -41,7 +41,7 @@ public class IconManager {
|
|
|
int nInterFloorNoiseSensorEnable = WallpadDeviceSet.DO_NOT_USE; // 층간소음 센서
|
|
|
boolean bCookTopOutletEnable = false; // 쿡탑콘센트
|
|
|
int nSystemAirconEnable = WallpadDeviceSet.DO_NOT_USE; // 시스템에어컨
|
|
|
- boolean bShadingEnable = false; // 전동커튼
|
|
|
+ int nShadingEnable; // 전동커튼
|
|
|
|
|
|
//서브월패드 - 제어
|
|
|
int[] naSubWallPadLight; // 서브월패드 조명
|
|
@@ -164,7 +164,7 @@ public class IconManager {
|
|
|
bCookTopOutletEnable = mWallpadDeviceSet.Get_CookTopConcent_Use(); // 쿡탑콘센트 사용 유무
|
|
|
nSystemAirconEnable = mWallpadDeviceSet.Get_AirCON_Info(); // 시스템에어컨 사용 유무
|
|
|
bCtrlUse = mWallpadDeviceSet.Get_MainGUICtrlUse();
|
|
|
- bShadingEnable = mWallpadDeviceSet.Get_Shading_Use();
|
|
|
+ nShadingEnable = mWallpadDeviceSet.Get_Shading_Use();
|
|
|
|
|
|
// 에너지
|
|
|
bRemoteMeterEnable = mWallpadDeviceSet.Get_RemoteMeter_Use(); // 원격검침
|
|
@@ -413,9 +413,13 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
//전동커튼
|
|
|
- if(bShadingEnable)
|
|
|
+ if(nShadingEnable!=WallpadDeviceSet.DO_NOT_USE)
|
|
|
{
|
|
|
- mIconInfoTable.addIconInfo(ID.ICONS.MENUS.CTRL_CURTAIN.getID(), ID.ICONS.MENUS.CTRL_CURTAIN.getNameKR(), ID.LINKEDSCREEN.SubMenuCtrl.Curtain,
|
|
|
+
|
|
|
+ String app_Name = ID.ICONS.MENUS.CTRL_CURTAIN.getNameKR();
|
|
|
+ if(nShadingEnable == WallpadDeviceSet.RollScreen)
|
|
|
+ app_Name = "롤스크린";
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.CTRL_CURTAIN.getID(), app_Name, ID.LINKEDSCREEN.SubMenuCtrl.Curtain,
|
|
|
R.drawable.icon_curtain_normal, R.drawable.icon_curtain_pressed, R.drawable.icon_curtain_pressed, R.drawable.icon_curtain_pressed);
|
|
|
}
|
|
|
|