|
@@ -292,6 +292,25 @@ public class MainActivity extends WpadActivity {
|
|
int elecCarUse = wallpadDeviceSet.GetDeviceSetted("전기차충전");
|
|
int elecCarUse = wallpadDeviceSet.GetDeviceSetted("전기차충전");
|
|
int safeStreetLightUse = wallpadDeviceSet.GetDeviceSetted("안전가로등");
|
|
int safeStreetLightUse = wallpadDeviceSet.GetDeviceSetted("안전가로등");
|
|
boolean bNonInternetUse = wallpadDeviceSet.Get_NonInternetSupportUse();
|
|
boolean bNonInternetUse = wallpadDeviceSet.Get_NonInternetSupportUse();
|
|
|
|
+
|
|
|
|
+ //jglee - 2022.08.17 관리자설정 DB에 따라 보여주기 설정
|
|
|
|
+ //공지사항
|
|
|
|
+ boolean bNotice = false;
|
|
|
|
+ //전자액자
|
|
|
|
+ boolean bAutoPicture = false;
|
|
|
|
+ //날씨
|
|
|
|
+ boolean bWeather = false;
|
|
|
|
+ //메모
|
|
|
|
+ boolean bMemo = false;
|
|
|
|
+ //일정표
|
|
|
|
+ boolean bScedule = false;
|
|
|
|
+
|
|
|
|
+ bNotice = wallpadDeviceSet.Get_Notice(); // jglee - 공지사항 추가
|
|
|
|
+ bAutoPicture = wallpadDeviceSet.Get_AutoPicture(); //jglee - 전자액자
|
|
|
|
+ bWeather = wallpadDeviceSet.Get_Weather(); //jglee - 날씨
|
|
|
|
+ bMemo = wallpadDeviceSet.Get_Memo(); //jglee - 메모
|
|
|
|
+ bScedule = wallpadDeviceSet.Get_Scedule(); //jglee - 일정표
|
|
|
|
+
|
|
wallpadDeviceSet.closeDB();
|
|
wallpadDeviceSet.closeDB();
|
|
Log.d(TAG, "[onCreate] noiseUse [" + noiseUse + "], cctvUse [" + cctvUse + "], parkingUse [" + parkingUse + "], carGuestUse [" + carGuestUse + "], " +
|
|
Log.d(TAG, "[onCreate] noiseUse [" + noiseUse + "], cctvUse [" + cctvUse + "], parkingUse [" + parkingUse + "], carGuestUse [" + carGuestUse + "], " +
|
|
"bandLocUse [" + bandLocUse + "], elecCarUse [" + elecCarUse + "], bNonInternetUse [" + bNonInternetUse + "], safeStreetLightUse [" + safeStreetLightUse + "]");
|
|
"bandLocUse [" + bandLocUse + "], elecCarUse [" + elecCarUse + "], bNonInternetUse [" + bNonInternetUse + "], safeStreetLightUse [" + safeStreetLightUse + "]");
|
|
@@ -306,15 +325,15 @@ public class MainActivity extends WpadActivity {
|
|
|
|
|
|
if (bNonInternetUse) {
|
|
if (bNonInternetUse) {
|
|
// 인터넷 미지원
|
|
// 인터넷 미지원
|
|
- mChildList.add(API_Menu.SubMenuAddService.Notice);
|
|
|
|
- mChildList.add(API_Menu.SubMenuAddService.Memo);
|
|
|
|
|
|
+ if(bNotice) mChildList.add(API_Menu.SubMenuAddService.Notice);
|
|
|
|
+ if(bMemo) mChildList.add(API_Menu.SubMenuAddService.Memo);
|
|
} else {
|
|
} else {
|
|
// 인터넷 지원
|
|
// 인터넷 지원
|
|
- mChildList.add(API_Menu.SubMenuAddService.Notice);
|
|
|
|
- mChildList.add(API_Menu.SubMenuAddService.Weather);
|
|
|
|
- mChildList.add(API_Menu.SubMenuAddService.Memo);
|
|
|
|
- mChildList.add(API_Menu.SubMenuAddService.AutoPicture);
|
|
|
|
- mChildList.add(API_Menu.SubMenuAddService.Schedule);
|
|
|
|
|
|
+ if(bNotice) mChildList.add(API_Menu.SubMenuAddService.Notice);
|
|
|
|
+ if(bWeather) mChildList.add(API_Menu.SubMenuAddService.Weather);
|
|
|
|
+ if(bMemo) mChildList.add(API_Menu.SubMenuAddService.Memo);
|
|
|
|
+ if(bAutoPicture) mChildList.add(API_Menu.SubMenuAddService.AutoPicture);
|
|
|
|
+ if(bScedule) mChildList.add(API_Menu.SubMenuAddService.Schedule);
|
|
|
|
|
|
if (cctvUse == WallpadDeviceSet.DEV_DATA_ENABLE || cctvUse == WallpadDeviceSet.DEV_DATA_NONE) {
|
|
if (cctvUse == WallpadDeviceSet.DEV_DATA_ENABLE || cctvUse == WallpadDeviceSet.DEV_DATA_NONE) {
|
|
mChildList.add(API_Menu.SubMenuAddService.Cctv);
|
|
mChildList.add(API_Menu.SubMenuAddService.Cctv);
|