|
@@ -582,21 +582,6 @@ public class MainActivity extends WpadActivity {
|
|
|
Log.e(TAG, "menueListDataClass == null, Load Default List");
|
|
|
menuListDataClass = LoadDefaultMenuList();
|
|
|
}
|
|
|
- else
|
|
|
- {
|
|
|
- for (int i = 0; i < menuListDataClass.idMappingTable.length; i++) {
|
|
|
-//Temp_menuListDataClass.idMappingTable[i].Name
|
|
|
- Log.e(TAG, "menueListDataClass test " + menuListDataClass.idMappingTable[i].Name);
|
|
|
-
|
|
|
- if(menuListDataClass.idMappingTable[i].Name.contains("로비"))
|
|
|
- {
|
|
|
- menuListDataClass.idMappingTable[i].Name = "대문";
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
- }
|
|
|
- }
|
|
|
|
|
|
// enableKaKaoiFunction(false);
|
|
|
|
|
@@ -1926,9 +1911,7 @@ public class MainActivity extends WpadActivity {
|
|
|
//추가 또는 수정해야할 부분 1. - Menu정보가 DB에 없을 경우 불러올 스크린 종류(시작)
|
|
|
arrayList.add(API_Menu.SubMenuCall.Name_Door);
|
|
|
ChildCount++;
|
|
|
- //modify KSJ 2022.04.26 통화 메뉴
|
|
|
- arrayList.add("대문");
|
|
|
- //arrayList.add(API_Menu.SubMenuCall.Name_Lobby);
|
|
|
+ arrayList.add(API_Menu.SubMenuCall.Name_Lobby);
|
|
|
ChildCount++;
|
|
|
arrayList.add(API_Menu.SubMenuCall.Name_Guard);
|
|
|
ChildCount++;
|
|
@@ -1946,13 +1929,10 @@ public class MainActivity extends WpadActivity {
|
|
|
// Temp_menuListDataClass.idMappingTable[i].Id = API_Menu.SubMenuCall.Door;
|
|
|
Temp_menuListDataClass.idMappingTable[i].Id = ID.SCREEN.SCREEN_TALKFRONT_SUBWALLPAD;
|
|
|
Temp_menuListDataClass.idMappingTable[i].Name = API_Menu.SubMenuCall.Name_Door;
|
|
|
- } else if (arrayList.get(i).equals("대문")) {
|
|
|
- //else if (arrayList.get(i).equals(API_Menu.SubMenuCall.Name_Lobby)) { //modify KSJ 2022.04.26 통화 메뉴
|
|
|
+ } else if (arrayList.get(i).equals(API_Menu.SubMenuCall.Name_Lobby)) {
|
|
|
// Temp_menuListDataClass.idMappingTable[i].Id = API_Menu.SubMenuCall.Lobby;
|
|
|
Temp_menuListDataClass.idMappingTable[i].Id = ID.SCREEN.SCREEN_TALKLOBBY_SUBWALLPAD;
|
|
|
- //modify KSJ 2022.04.26 통화 메뉴
|
|
|
- Temp_menuListDataClass.idMappingTable[i].Name = "대문";
|
|
|
- //Temp_menuListDataClass.idMappingTable[i].Name = API_Menu.SubMenuCall.Name_Lobby;
|
|
|
+ Temp_menuListDataClass.idMappingTable[i].Name = API_Menu.SubMenuCall.Name_Lobby;
|
|
|
} else if (arrayList.get(i).equals(API_Menu.SubMenuCall.Name_Guard)) {
|
|
|
// Temp_menuListDataClass.idMappingTable[i].Id = API_Menu.SubMenuCall.Guard;
|
|
|
Temp_menuListDataClass.idMappingTable[i].Id = ID.SCREEN.SCREEN_TALKGUARD_SUBWALLPAD;
|