|
@@ -89,7 +89,7 @@ public class AdminSettingFragment extends Fragment implements AdminSubMenu.SubMe
|
|
|
|
|
|
if (Version.getGatewayUsage()) {
|
|
|
if (Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I
|
|
|
- || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_6410) {
|
|
|
+ || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_2443) {
|
|
|
inputmenuItem = new String[menuItem.length-2];
|
|
|
Log.d(TAG, "[onViewCreated] inputmenuItem.length [" + inputmenuItem.length + "]");
|
|
|
|
|
@@ -103,6 +103,22 @@ public class AdminSettingFragment extends Fragment implements AdminSubMenu.SubMe
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ //jglee 2022.10.26 6410대체품 현산향은 서브폰으로 사용
|
|
|
+ else if (Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_6410) {
|
|
|
+ inputmenuItem = new String[menuItem.length-1];
|
|
|
+ Log.d(TAG, "[onViewCreated] inputmenuItem.length [" + inputmenuItem.length + "]");
|
|
|
+
|
|
|
+ for (int i = 0; i < menuItem.length-2; i++) {
|
|
|
+ if ( i == (menuItem.length-3) ) {
|
|
|
+ inputmenuItem[i] = menuItem[i+1];
|
|
|
+ inputmenuItem[i+1] = menuItem[i+2];// IHN-1010GL 월패드인 경우에는 거실EM 설정, 서브월패드 설정 화면 안나오도록 함.
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ inputmenuItem[i] = menuItem[i];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
else {
|
|
|
inputmenuItem = new String[menuItem.length-1];
|
|
|
Log.d(TAG, "[onViewCreated] inputmenuItem.length [" + inputmenuItem.length + "]");
|
|
@@ -214,8 +230,9 @@ public class AdminSettingFragment extends Fragment implements AdminSubMenu.SubMe
|
|
|
getActivity().getSupportFragmentManager().beginTransaction()
|
|
|
.replace(R.id.menu_content, fragment).commit();
|
|
|
}
|
|
|
+ //jglee - 6410GL 현산향일 경우 서브폰 설정이 필요함(6410 현산향에서 사용하기로 함)
|
|
|
else if (modelType == Version.MODEL_TYPE.IHN_1010 || modelType == Version.MODEL_TYPE.IHN_1010_I
|
|
|
- || modelType == Version.MODEL_TYPE.IHN_1010_I_2443 || modelType == Version.MODEL_TYPE.IHN_1010_I_6410) {
|
|
|
+ || modelType == Version.MODEL_TYPE.IHN_1010_I_2443 || modelType == Version.MODEL_TYPE.IHN_1010_I_6410 || modelType == Version.MODEL_TYPE.IHN_1010GL_I_6410) {
|
|
|
SettingSubWpdSettingFragment fragment = new SettingSubWpdSettingFragment();
|
|
|
getActivity().getSupportFragmentManager().beginTransaction()
|
|
|
.replace(R.id.menu_content, fragment).commit();
|