Просмотр исходного кода

Merge branch 'master' of https://hub.hdc-smart.com/jglee/6410_ALT

DESKTOP-UNEGUH3\MadeinLab_SW_02 2 лет назад
Родитель
Сommit
69c4256256

BIN
10_Release/WallPadCall.apk


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

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadcall"
     android:versionCode="17"
-    android:versionName="2022.09.08.01">
+    android:versionName="2022.09.20.01">
 
     <!--android:sharedUserId="android.uid.system"-->
     <!--<uses-sdk-->

+ 2 - 0
WallPadCall/src/main/java/kr/co/icontrols/callengine/pstn/PSTNSerialManager.java

@@ -1849,6 +1849,8 @@ public class PSTNSerialManager extends Service {
                 case MODEL_TYPE.IHN_430_I:
                 case MODEL_TYPE.IHN_1050DW_I:
                 case MODEL_TYPE.IHN_1020B_I:
+                case MODEL_TYPE.IHN_1010_I_2443:
+                case MODEL_TYPE.IHN_1010_I_6410:
                 case MODEL_TYPE.IHN_1303_I:
                     if (ConfigValues.AOS_VERSION >= 7) return BOARD_TYPE.V40_NOUGAT;
                     else return BOARD_TYPE.V40;

+ 2 - 0
WallPadCall/src/main/java/kr/co/icontrols/callengine/subphone/SubPhoneSerialManager.java

@@ -2873,6 +2873,8 @@ public class SubPhoneSerialManager extends Service {
                 case MODEL_TYPE.IHN_430_I:
                 case MODEL_TYPE.IHN_1050DW_I:
                 case MODEL_TYPE.IHN_1020B_I:
+                case MODEL_TYPE.IHN_1010_I_2443:
+                case MODEL_TYPE.IHN_1010_I_6410:
                 case MODEL_TYPE.IHN_1303_I:
                     if (ConfigValues.AOS_VERSION >= 7) return BOARD_TYPE.V40_NOUGAT;
                     else return BOARD_TYPE.V40;

+ 2 - 0
WallPadCall/src/main/java/kr/co/icontrols/callengine/subwallpad/SubWallPadSerialManager.java

@@ -486,6 +486,8 @@ public class SubWallPadSerialManager extends Service {
                 case MODEL_TYPE.IHN_430_I:
                 case MODEL_TYPE.IHN_1050DW_I:
                 case MODEL_TYPE.IHN_1020B_I:
+                case MODEL_TYPE.IHN_1010_I_2443:
+                case MODEL_TYPE.IHN_1010_I_6410:
                 case MODEL_TYPE.IHN_1303_I:
                     if (ConfigValues.AOS_VERSION >= 7) return BOARD_TYPE.V40_NOUGAT;
                     else return BOARD_TYPE.V40;

+ 2 - 0
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/MainActivity.java

@@ -412,6 +412,8 @@ public class MainActivity extends WpadActivity {
             else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010GL_I) LOG_INFO("[onCreate] Model Type [IHN_1010GL-I]");
             else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010GL_I_2443) LOG_INFO("[onCreate] Model Type [IHN_1010GL-I_2443]");
             else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010GL_I_6410) LOG_INFO("[onCreate] Model Type [IHN_1010GL-I_6410]");
+ 			else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010_I_2443) LOG_INFO("[onCreate] Model Type [IHN_1010-I_2443]");
+            else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010_I_6410) LOG_INFO("[onCreate] Model Type [IHN_1010-I_6410]");
             else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K) LOG_INFO("[onCreate] Model Type [IHN_D101K]");
             else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K_I) LOG_INFO("[onCreate] Model Type [IHN_D101K-I]");
             else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010) {

+ 5 - 1
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/declare/Global.java

@@ -760,6 +760,7 @@ public final class Global {
 
     // V40_300 / V40(현산) VOLUME TABLE
     //private static String[] sV40WallPadVolumeTable = new String[]{"0x0036", "0x0036", "0x0040", "0x004c", "0x005a", "0x006b", "0x0080", "0x0098", "0x00b5", "0x00d7", "0x100"};
+    //jglee - 로비 볼륨 테이블(현장에서 작으면 해당 테이블을 변경해서 사용함)
     private static String[] sV40WallPadVolumeTable = new String[]{"0x0036", "0x0036", "0x004c", "0x006b", "0x0080", "0x0100", "0x0120", "0x0140", "0x0160", "0x0180", "0x200"};
     private static String[] sV40WallPadVolumeTable_RESIDENCE = new String[]{"0x006b", "0x006b", "0x0080", "0x0098", "0x00b5", "0x00d7", "0x0100", "0x0130", "0x016a", "0x01ae", "0x200"};
 
@@ -2138,6 +2139,8 @@ public final class Global {
                 case MODEL_TYPE.IHN_430_I:
                 case MODEL_TYPE.IHN_1050DW_I:
                 case MODEL_TYPE.IHN_1020B_I:
+                case MODEL_TYPE.IHN_1010_I_2443:
+                case MODEL_TYPE.IHN_1010_I_6410:
                 case MODEL_TYPE.IHN_1303_I:
                     if (ConfigValues.AOS_VERSION >= 7) return BOARD_TYPE.V40_NOUGAT;
                     else return BOARD_TYPE.V40;
@@ -2175,7 +2178,8 @@ public final class Global {
                     || nModelType == MODEL_TYPE.IHN_T1010 || nModelType == MODEL_TYPE.IHN_T1010_I
                     || nModelType == MODEL_TYPE.IHN_HS101 || nModelType == MODEL_TYPE.IHN_HS101_I
                     || nModelType == MODEL_TYPE.IHN_1050DW_I || nModelType == MODEL_TYPE.IHN_1020B_I
-                    || nModelType == MODEL_TYPE.IHN_1303_I) {
+                    || nModelType == MODEL_TYPE.IHN_1303_I || nModelType == MODEL_TYPE.IHN_1010_I_2443
+                    || nModelType == MODEL_TYPE.IHN_1010_I_6410) {
                 ConfigValues.bPSTNEnable = true;
                 ConfigValues.bSubPhoneEnable = true;
                 ConfigValues.bWallPadCameraEnable = true;