浏览代码

[ManagerSetting]
1. 어드레스 설정 뷰 추가(보드명 추가 대외향 6410)
2. 서브 월패드 뷰 추가(보드명 추가 대외향 6410)
3. 버전업
- 2022.06.30.01 -> 2022.09.20.01
4. 최신 APK 등록

jglee 2 年之前
父节点
当前提交
a9caaaf796

二进制
10_Release/ManagerSetting.apk


+ 1 - 1
ManagerSetting/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.artncore.managersetting"
     android:versionCode="23"
-    android:versionName="2022.06.30.01">
+    android:versionName="2022.09.20.01">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

+ 2 - 2
ManagerSetting/src/main/java/com/artncore/managersetting/ui/activities/SetAddress.java

@@ -128,7 +128,7 @@ public class SetAddress extends Activity
                     setContentView(R.layout.activity_set_address_a20_1280x800);
                 }
                 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_2443 || ModelType == Version.MODEL_TYPE.IHN_1010_I_6410
                 ) {
                     setContentView(R.layout.activity_set_address_1010);
                 }
@@ -226,7 +226,7 @@ public class SetAddress extends Activity
             initView_GLE();
         }
         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_2443 || ModelType == Version.MODEL_TYPE.IHN_1010_I_6410) {
             initView_1010();
         }
         else if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101K || ModelType == Version.MODEL_TYPE.IHN_1010GL

+ 2 - 2
ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/AdminSettingFragment.java

@@ -121,7 +121,7 @@ public class AdminSettingFragment extends Fragment implements AdminSubMenu.SubMe
         else {
             int modelType = Version.getModelType();
             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_2443 || modelType == Version.MODEL_TYPE.IHN_1010_I_6410) {
                 inputmenuItem = new String[menuItem.length-1]; // 1010의 경우에만 서브월패드 설정 화면 나오도록 함.
                 Log.d(TAG, "[onViewCreated] inputmenuItem.length [" + inputmenuItem.length + "]");
 
@@ -215,7 +215,7 @@ public class AdminSettingFragment extends Fragment implements AdminSubMenu.SubMe
                             .replace(R.id.menu_content, fragment).commit();
                 }
                 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_2443 || modelType == Version.MODEL_TYPE.IHN_1010_I_6410) {
                     SettingSubWpdSettingFragment fragment = new SettingSubWpdSettingFragment();
                     getActivity().getSupportFragmentManager().beginTransaction()
                             .replace(R.id.menu_content, fragment).commit();