|
@@ -55,6 +55,20 @@ public class IconManager {
|
|
|
boolean bVisitedVehicleEnable = false; // 방문 차량 등록
|
|
|
boolean bBandLocationEnable = false; // 밴드 위치 인식
|
|
|
boolean bGuardingStreetLamp = false; // 안전가로등 (효성중공업 현장 특화 기능)
|
|
|
+ //jglee - 2022.08.17 관리자설정 DB에 따라 보여주기 설정
|
|
|
+ //공지사항
|
|
|
+ boolean bNotice = false;
|
|
|
+ //전자액자
|
|
|
+ boolean bAutoPicture = false;
|
|
|
+ //날씨
|
|
|
+ boolean bWeather = false;
|
|
|
+ //메모
|
|
|
+ boolean bMemo = false;
|
|
|
+ //일정표
|
|
|
+ boolean bScedule = false;
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
// 설정
|
|
|
int nMobileDeviceRegEnable = WallpadDeviceSet.DO_NOT_USE; // 모바일 기기 등록
|
|
@@ -173,6 +187,11 @@ public class IconManager {
|
|
|
bVisitedVehicleEnable = mWallpadDeviceSet.getVisitedVehicleRegiUsage(); // 방문 차량 등록
|
|
|
bBandLocationEnable = mWallpadDeviceSet.getBandLocationUsage(); // 위치 인식
|
|
|
bGuardingStreetLamp = mWallpadDeviceSet.Get_SafeStreetLightUse(); // 안전가로등 (효성중공업 현장 특화기능)
|
|
|
+ bNotice = mWallpadDeviceSet.Get_Notice(); // jglee - 공지사항 추가
|
|
|
+ bAutoPicture = mWallpadDeviceSet.Get_AutoPicture(); //jglee - 전자액자
|
|
|
+ bWeather = mWallpadDeviceSet.Get_Weather(); //jglee - 날씨
|
|
|
+ bMemo = mWallpadDeviceSet.Get_Memo(); //jglee - 메모
|
|
|
+ bScedule = mWallpadDeviceSet.Get_Scedule(); //jglee - 일정표
|
|
|
|
|
|
// 설정
|
|
|
nMobileDeviceRegEnable = mWallpadDeviceSet.Get_MobileAppAuth_Use(); // 모바일 기기 등록
|
|
@@ -437,27 +456,32 @@ public class IconManager {
|
|
|
부가 App
|
|
|
*/
|
|
|
|
|
|
- mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_NOTICE.getID(), ID.ICONS.MENUS.ADD_NOTICE.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Notice,
|
|
|
- R.drawable.icon_add_notice_normal, R.drawable.icon_add_notice_pressed, R.drawable.icon_add_notice_pressed, R.drawable.icon_add_notice_pressed);
|
|
|
+ if(bNotice)
|
|
|
+ {
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_NOTICE.getID(), ID.ICONS.MENUS.ADD_NOTICE.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Notice,
|
|
|
+ R.drawable.icon_add_notice_normal, R.drawable.icon_add_notice_pressed, R.drawable.icon_add_notice_pressed, R.drawable.icon_add_notice_pressed);
|
|
|
+ }
|
|
|
|
|
|
- if (!bNonInternetSupportEnable) {
|
|
|
+ if (!bNonInternetSupportEnable && bWeather) {
|
|
|
// 날씨
|
|
|
mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_WEATHER.getID(), ID.ICONS.MENUS.ADD_WEATHER.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Weather,
|
|
|
R.drawable.icon_add_weather_normal, R.drawable.icon_add_weather_pressed, R.drawable.icon_add_weather_pressed, R.drawable.icon_add_weather_pressed);
|
|
|
}
|
|
|
|
|
|
// 메모
|
|
|
- mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
- R.drawable.icon_add_memo_normal, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed);
|
|
|
+ if(bMemo) {
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
+ R.drawable.icon_add_memo_normal, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed);
|
|
|
+ }
|
|
|
|
|
|
// 전자액자
|
|
|
- if (!bNonInternetSupportEnable) {
|
|
|
+ if (!bNonInternetSupportEnable && bAutoPicture) {
|
|
|
mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_E_FRAME.getID(), ID.ICONS.MENUS.ADD_E_FRAME.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.AutoPicture,
|
|
|
R.drawable.icon_add_eframe_normal, R.drawable.icon_add_eframe_pressed, R.drawable.icon_add_eframe_pressed, R.drawable.icon_add_eframe_pressed);
|
|
|
}
|
|
|
|
|
|
// 일정표
|
|
|
- if (!bNonInternetSupportEnable) {
|
|
|
+ if (!bNonInternetSupportEnable && bScedule) {
|
|
|
mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_SCHEDULE.getID(), ID.ICONS.MENUS.ADD_SCHEDULE.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Schedule,
|
|
|
R.drawable.icon_add_schedule_normal, R.drawable.icon_add_schedule_pressed, R.drawable.icon_add_schedule_pressed, R.drawable.icon_add_schedule_pressed);
|
|
|
}
|
|
@@ -820,8 +844,10 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
//메모
|
|
|
- mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
- R.drawable.metroui_icon_group_add_memo_normal_1280, R.drawable.metroui_icon_group_add_memo_pressed_1280, R.drawable.metroui_icon_group_add_memo_pressed_1280, R.drawable.metroui_icon_group_add_memo_pressed_1280);
|
|
|
+ if(bMemo) {
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
+ R.drawable.metroui_icon_group_add_memo_normal_1280, R.drawable.metroui_icon_group_add_memo_pressed_1280, R.drawable.metroui_icon_group_add_memo_pressed_1280, R.drawable.metroui_icon_group_add_memo_pressed_1280);
|
|
|
+ }
|
|
|
|
|
|
//전자액자
|
|
|
if (!bNonInternetSupportEnable) {
|
|
@@ -830,7 +856,7 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
//일정표
|
|
|
- if (!bNonInternetSupportEnable) {
|
|
|
+ if (!bNonInternetSupportEnable && bScedule) {
|
|
|
mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_SCHEDULE.getID(), ID.ICONS.MENUS.ADD_SCHEDULE.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Schedule,
|
|
|
R.drawable.metroui_icon_group_add_scheduler_normal_1280, R.drawable.metroui_icon_group_add_scheduler_pressed_1280, R.drawable.metroui_icon_group_add_scheduler_pressed_1280, R.drawable.metroui_icon_group_add_scheduler_pressed_1280);
|
|
|
}
|
|
@@ -1152,8 +1178,10 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
//메모
|
|
|
- mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
- R.drawable.metroui_icon_group_add_memo_normal, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed);
|
|
|
+ if(bMemo) {
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
+ R.drawable.metroui_icon_group_add_memo_normal, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed);
|
|
|
+ }
|
|
|
|
|
|
//전자액자
|
|
|
if (!bNonInternetSupportEnable) {
|
|
@@ -1162,7 +1190,7 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
//일정표
|
|
|
- if (!bNonInternetSupportEnable) {
|
|
|
+ if (!bNonInternetSupportEnable && bScedule) {
|
|
|
mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_SCHEDULE.getID(), ID.ICONS.MENUS.ADD_SCHEDULE.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Schedule,
|
|
|
R.drawable.metroui_icon_group_add_scheduler_normal, R.drawable.metroui_icon_group_add_scheduler_pressed, R.drawable.metroui_icon_group_add_scheduler_pressed, R.drawable.metroui_icon_group_add_scheduler_pressed);
|
|
|
}
|
|
@@ -1418,8 +1446,11 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
// 메모
|
|
|
- mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
- R.drawable.icon_add_memo_normal, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed);
|
|
|
+ if(bMemo)
|
|
|
+ {
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
+ R.drawable.icon_add_memo_normal, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed);
|
|
|
+ }
|
|
|
|
|
|
/*
|
|
|
설정 App
|
|
@@ -1521,8 +1552,10 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
// 메모
|
|
|
- mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
- R.drawable.metroui_icon_group_add_memo_normal, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed);
|
|
|
+ if(bMemo) {
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
+ R.drawable.metroui_icon_group_add_memo_normal, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed);
|
|
|
+ }
|
|
|
|
|
|
/*
|
|
|
설정 App
|
|
@@ -1732,8 +1765,10 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
// 메모
|
|
|
- mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
- R.drawable.icon_add_memo_normal, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed);
|
|
|
+ if(bMemo) {
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
+ R.drawable.icon_add_memo_normal, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed);
|
|
|
+ }
|
|
|
|
|
|
// 전자액자
|
|
|
if (!bNonInternetSupportEnable) {
|
|
@@ -1742,7 +1777,7 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
// 일정표
|
|
|
- if (!bNonInternetSupportEnable) {
|
|
|
+ if (!bNonInternetSupportEnable && bScedule) {
|
|
|
mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_SCHEDULE.getID(), ID.ICONS.MENUS.ADD_SCHEDULE.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Schedule,
|
|
|
R.drawable.gooddesign2020_icon_add_schedule_normal, R.drawable.gooddesign2020_icon_add_schedule_pressed, R.drawable.gooddesign2020_icon_add_schedule_pressed, R.drawable.gooddesign2020_icon_add_schedule_pressed);
|
|
|
}
|
|
@@ -2086,8 +2121,10 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
// 메모
|
|
|
- mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
- R.drawable.icon_add_memo_normal, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed);
|
|
|
+ if(bMemo) {
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
+ R.drawable.icon_add_memo_normal, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed);
|
|
|
+ }
|
|
|
|
|
|
// 전자액자
|
|
|
if (!bNonInternetSupportEnable) {
|
|
@@ -2096,7 +2133,7 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
// 일정표
|
|
|
- if (!bNonInternetSupportEnable) {
|
|
|
+ if (!bNonInternetSupportEnable && bScedule) {
|
|
|
mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_SCHEDULE.getID(), ID.ICONS.MENUS.ADD_SCHEDULE.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Schedule,
|
|
|
R.drawable.icon_add_schedule_normal, R.drawable.icon_add_schedule_pressed, R.drawable.icon_add_schedule_pressed, R.drawable.icon_add_schedule_pressed);
|
|
|
}
|
|
@@ -2426,8 +2463,10 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
// 메모
|
|
|
- mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
- R.drawable.icon_add_memo_normal, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed);
|
|
|
+ if(bMemo) {
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
+ R.drawable.icon_add_memo_normal, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed);
|
|
|
+ }
|
|
|
|
|
|
// 전자액자
|
|
|
if (!bNonInternetSupportEnable) {
|
|
@@ -2436,7 +2475,7 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
// 일정표
|
|
|
- if (!bNonInternetSupportEnable) {
|
|
|
+ if (!bNonInternetSupportEnable && bScedule) {
|
|
|
mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_SCHEDULE.getID(), ID.ICONS.MENUS.ADD_SCHEDULE.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Schedule,
|
|
|
R.drawable.icon_add_schedule_normal, R.drawable.icon_add_schedule_pressed, R.drawable.icon_add_schedule_pressed, R.drawable.icon_add_schedule_pressed);
|
|
|
}
|
|
@@ -2665,8 +2704,10 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
// 메모
|
|
|
- mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
- R.drawable.icon_add_memo_normal, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed);
|
|
|
+ if(bMemo) {
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
+ R.drawable.icon_add_memo_normal, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed);
|
|
|
+ }
|
|
|
|
|
|
/*
|
|
|
설정 App
|
|
@@ -2839,8 +2880,10 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
// 메모
|
|
|
- mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
- R.drawable.icon_add_memo_normal, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed);
|
|
|
+ if(bMemo) {
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
+ R.drawable.icon_add_memo_normal, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed, R.drawable.icon_add_memo_pressed);
|
|
|
+ }
|
|
|
|
|
|
// 전자액자
|
|
|
if (!bNonInternetSupportEnable) {
|
|
@@ -2849,7 +2892,7 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
// 일정표
|
|
|
- if (!bNonInternetSupportEnable) {
|
|
|
+ if (!bNonInternetSupportEnable && bScedule) {
|
|
|
mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_SCHEDULE.getID(), ID.ICONS.MENUS.ADD_SCHEDULE.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Schedule,
|
|
|
R.drawable.icon_add_schedule_normal, R.drawable.icon_add_schedule_pressed, R.drawable.icon_add_schedule_pressed, R.drawable.icon_add_schedule_pressed);
|
|
|
}
|
|
@@ -3277,15 +3320,19 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
//메모
|
|
|
- if (Common.SCREEN_TYPE == Common.SCREEN_TYPE_1280x800) {
|
|
|
- mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
- R.drawable.metroui_icon_group_add_memo_normal_1280, R.drawable.metroui_icon_group_add_memo_pressed_1280, R.drawable.metroui_icon_group_add_memo_pressed_1280, R.drawable.metroui_icon_group_add_memo_pressed_1280);
|
|
|
- }
|
|
|
- else {
|
|
|
- mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
- R.drawable.metroui_icon_group_add_memo_normal, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed);
|
|
|
+ if(bMemo)
|
|
|
+ {
|
|
|
+ if (Common.SCREEN_TYPE == Common.SCREEN_TYPE_1280x800) {
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
+ R.drawable.metroui_icon_group_add_memo_normal_1280, R.drawable.metroui_icon_group_add_memo_pressed_1280, R.drawable.metroui_icon_group_add_memo_pressed_1280, R.drawable.metroui_icon_group_add_memo_pressed_1280);
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
+ R.drawable.metroui_icon_group_add_memo_normal, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
+
|
|
|
//전자액자
|
|
|
if (!bNonInternetSupportEnable) {
|
|
|
if (Common.SCREEN_TYPE == Common.SCREEN_TYPE_1280x800) {
|
|
@@ -3299,7 +3346,7 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
//일정표
|
|
|
- if (!bNonInternetSupportEnable) {
|
|
|
+ if (!bNonInternetSupportEnable && bScedule) {
|
|
|
if (Common.SCREEN_TYPE == Common.SCREEN_TYPE_1280x800) {
|
|
|
mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_SCHEDULE.getID(), ID.ICONS.MENUS.ADD_SCHEDULE.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Schedule,
|
|
|
R.drawable.metroui_icon_group_add_scheduler_normal_1280, R.drawable.metroui_icon_group_add_scheduler_pressed_1280, R.drawable.metroui_icon_group_add_scheduler_pressed_1280, R.drawable.metroui_icon_group_add_scheduler_pressed_1280);
|
|
@@ -3687,8 +3734,12 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
//메모
|
|
|
- mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
- R.drawable.metroui_icon_group_add_memo_normal, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed);
|
|
|
+ if(bMemo)
|
|
|
+ {
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
+ R.drawable.metroui_icon_group_add_memo_normal, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed);
|
|
|
+
|
|
|
+ }
|
|
|
|
|
|
//전자액자
|
|
|
if (!bNonInternetSupportEnable) {
|
|
@@ -3697,7 +3748,7 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
//일정표
|
|
|
- if (!bNonInternetSupportEnable) {
|
|
|
+ if (!bNonInternetSupportEnable && bScedule) {
|
|
|
mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_SCHEDULE.getID(), ID.ICONS.MENUS.ADD_SCHEDULE.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Schedule,
|
|
|
R.drawable.metroui_icon_group_add_scheduler_normal, R.drawable.metroui_icon_group_add_scheduler_pressed, R.drawable.metroui_icon_group_add_scheduler_pressed, R.drawable.metroui_icon_group_add_scheduler_pressed);
|
|
|
}
|
|
@@ -3951,27 +4002,34 @@ public class IconManager {
|
|
|
*/
|
|
|
|
|
|
//공지사항
|
|
|
- mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_NOTICE.getID(), ID.ICONS.MENUS.ADD_NOTICE.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Notice,
|
|
|
- R.drawable.metroui_icon_group_add_notice_normal, R.drawable.metroui_icon_group_add_notice_pressed, R.drawable.metroui_icon_group_add_notice_pressed, R.drawable.metroui_icon_group_add_notice_pressed);
|
|
|
+ if(bNotice)
|
|
|
+ {
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_NOTICE.getID(), ID.ICONS.MENUS.ADD_NOTICE.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Notice,
|
|
|
+ R.drawable.metroui_icon_group_add_notice_normal, R.drawable.metroui_icon_group_add_notice_pressed, R.drawable.metroui_icon_group_add_notice_pressed, R.drawable.metroui_icon_group_add_notice_pressed);
|
|
|
+ }
|
|
|
|
|
|
//날씨
|
|
|
- if (!bNonInternetSupportEnable) {
|
|
|
+ if (!bNonInternetSupportEnable && bWeather) {
|
|
|
mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_WEATHER.getID(), ID.ICONS.MENUS.ADD_WEATHER.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Weather,
|
|
|
R.drawable.metroui_icon_group_add_weather_normal, R.drawable.metroui_icon_group_add_weather_pressed, R.drawable.metroui_icon_group_add_weather_pressed, R.drawable.metroui_icon_group_add_weather_pressed);
|
|
|
}
|
|
|
|
|
|
//메모
|
|
|
- mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
- R.drawable.metroui_icon_group_add_memo_normal, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed);
|
|
|
+ if(bMemo)
|
|
|
+ {
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
+ R.drawable.metroui_icon_group_add_memo_normal, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed);
|
|
|
+
|
|
|
+ }
|
|
|
|
|
|
//전자액자
|
|
|
- if (!bNonInternetSupportEnable) {
|
|
|
+ if (!bNonInternetSupportEnable && bAutoPicture) {
|
|
|
mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_E_FRAME.getID(), ID.ICONS.MENUS.ADD_E_FRAME.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.AutoPicture,
|
|
|
R.drawable.metroui_icon_group_add_eframe_normal, R.drawable.metroui_icon_group_add_eframe_pressed, R.drawable.metroui_icon_group_add_eframe_pressed, R.drawable.metroui_icon_group_add_eframe_pressed);
|
|
|
}
|
|
|
|
|
|
//일정표
|
|
|
- if (!bNonInternetSupportEnable) {
|
|
|
+ if (!bNonInternetSupportEnable && bScedule) {
|
|
|
mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_SCHEDULE.getID(), ID.ICONS.MENUS.ADD_SCHEDULE.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Schedule,
|
|
|
R.drawable.metroui_icon_group_add_scheduler_normal, R.drawable.metroui_icon_group_add_scheduler_pressed, R.drawable.metroui_icon_group_add_scheduler_pressed, R.drawable.metroui_icon_group_add_scheduler_pressed);
|
|
|
}
|
|
@@ -4235,8 +4293,11 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
//메모
|
|
|
- mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
- R.drawable.metroui_icon_group_add_memo_normal, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed);
|
|
|
+ if(bMemo)
|
|
|
+ {
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
+ R.drawable.metroui_icon_group_add_memo_normal, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed);
|
|
|
+ }
|
|
|
|
|
|
//전자액자
|
|
|
if (!bNonInternetSupportEnable) {
|
|
@@ -4245,7 +4306,7 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
//일정표
|
|
|
- if (!bNonInternetSupportEnable) {
|
|
|
+ if (!bNonInternetSupportEnable && bScedule) {
|
|
|
mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_SCHEDULE.getID(), ID.ICONS.MENUS.ADD_SCHEDULE.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Schedule,
|
|
|
R.drawable.metroui_icon_group_add_scheduler_normal, R.drawable.metroui_icon_group_add_scheduler_pressed, R.drawable.metroui_icon_group_add_scheduler_pressed, R.drawable.metroui_icon_group_add_scheduler_pressed);
|
|
|
}
|
|
@@ -4867,15 +4928,19 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
//메모
|
|
|
- if (Common.SCREEN_TYPE == Common.SCREEN_TYPE_1280x800) {
|
|
|
- mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
- R.drawable.metroui_icon_group_add_memo_normal_1280, R.drawable.metroui_icon_group_add_memo_pressed_1280, R.drawable.metroui_icon_group_add_memo_pressed_1280, R.drawable.metroui_icon_group_add_memo_pressed_1280);
|
|
|
- }
|
|
|
- else {
|
|
|
- mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
- R.drawable.metroui_icon_group_add_memo_normal, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed);
|
|
|
+ if(bMemo)
|
|
|
+ {
|
|
|
+ if (Common.SCREEN_TYPE == Common.SCREEN_TYPE_1280x800) {
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
+ R.drawable.metroui_icon_group_add_memo_normal_1280, R.drawable.metroui_icon_group_add_memo_pressed_1280, R.drawable.metroui_icon_group_add_memo_pressed_1280, R.drawable.metroui_icon_group_add_memo_pressed_1280);
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_MEMO.getID(), ID.ICONS.MENUS.ADD_MEMO.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Memo,
|
|
|
+ R.drawable.metroui_icon_group_add_memo_normal, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed, R.drawable.metroui_icon_group_add_memo_pressed);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
+
|
|
|
//전자액자
|
|
|
if (!bNonInternetSupportEnable) {
|
|
|
if (Common.SCREEN_TYPE == Common.SCREEN_TYPE_1280x800) {
|
|
@@ -4889,7 +4954,7 @@ public class IconManager {
|
|
|
}
|
|
|
|
|
|
//일정표
|
|
|
- if (!bNonInternetSupportEnable) {
|
|
|
+ if (!bNonInternetSupportEnable && bScedule) {
|
|
|
if (Common.SCREEN_TYPE == Common.SCREEN_TYPE_1280x800) {
|
|
|
mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_SCHEDULE.getID(), ID.ICONS.MENUS.ADD_SCHEDULE.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Schedule,
|
|
|
R.drawable.metroui_icon_group_add_scheduler_normal_1280, R.drawable.metroui_icon_group_add_scheduler_pressed_1280, R.drawable.metroui_icon_group_add_scheduler_pressed_1280, R.drawable.metroui_icon_group_add_scheduler_pressed_1280);
|