Browse Source

2021.11.19 VIP wallpadCall 통화 merge
device version 추가

DESKTOP-UNEGUH3\MadeinLab_SW_02 3 years ago
parent
commit
d5445123ec

+ 1 - 1
WallPadCall/src/main/java/kr/co/icontrols/callengine/pstn/PSTNController.java

@@ -380,7 +380,7 @@ public class PSTNController {
 
                 if (ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101 || ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101_I
                         || ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101K || ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101K_I
-                        || ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101_I_OCF) {
+                        || ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101_I_OCF || ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101_I_LX2) {
                     ((MainActivity) mContext).sendPSTNRingEndBR();
                 }
 

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

@@ -1825,6 +1825,7 @@ public class PSTNSerialManager extends Service {
             switch (nModelType) {
                 case MODEL_TYPE.IHN_D101:
                 case MODEL_TYPE.IHN_D101_I:
+                case MODEL_TYPE.IHN_D101_I_LX2:
                 case MODEL_TYPE.IHN_1010GL:
                 case MODEL_TYPE.IHN_1010GL_I:
                 case MODEL_TYPE.IHN_D101K:
@@ -1837,6 +1838,7 @@ public class PSTNSerialManager extends Service {
 
                 case MODEL_TYPE.IHN_1010:
                 case MODEL_TYPE.IHN_1010_I:
+                case MODEL_TYPE.IHN_1010_I_LX2:
                 case MODEL_TYPE.IHN_1030_I:
                 case MODEL_TYPE.IHN_1040:
                 case MODEL_TYPE.IHN_1040_I:

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

@@ -2879,6 +2879,7 @@ public class SubPhoneSerialManager extends Service {
             switch (nModelType) {
                 case MODEL_TYPE.IHN_D101:
                 case MODEL_TYPE.IHN_D101_I:
+                case MODEL_TYPE.IHN_D101_I_LX2:
                 case MODEL_TYPE.IHN_1010GL:
                 case MODEL_TYPE.IHN_1010GL_I:
                 case MODEL_TYPE.IHN_D101K:
@@ -2891,6 +2892,7 @@ public class SubPhoneSerialManager extends Service {
 
                 case MODEL_TYPE.IHN_1010:
                 case MODEL_TYPE.IHN_1010_I:
+                case MODEL_TYPE.IHN_1010_I_LX2:
                 case MODEL_TYPE.IHN_1030_I:
                 case MODEL_TYPE.IHN_1040:
                 case MODEL_TYPE.IHN_1040_I:

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

@@ -462,6 +462,7 @@ public class SubWallPadSerialManager extends Service {
             switch (nModelType) {
                 case MODEL_TYPE.IHN_D101:
                 case MODEL_TYPE.IHN_D101_I:
+                case MODEL_TYPE.IHN_D101_I_LX2:
                 case MODEL_TYPE.IHN_1010GL:
                 case MODEL_TYPE.IHN_1010GL_I:
                 case MODEL_TYPE.IHN_D101K:
@@ -474,6 +475,7 @@ public class SubWallPadSerialManager extends Service {
 
                 case MODEL_TYPE.IHN_1010:
                 case MODEL_TYPE.IHN_1010_I:
+                case MODEL_TYPE.IHN_1010_I_LX2:
                 case MODEL_TYPE.IHN_1030_I:
                 case MODEL_TYPE.IHN_1040:
                 case MODEL_TYPE.IHN_1040_I:

+ 6 - 4
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/MainActivity.java

@@ -142,7 +142,7 @@ import static kr.co.icontrols.wallpadcall.declare.Declare.BR.ACNAME_MAIN_NOTI;
  */
 public class MainActivity extends WpadActivity {
     private final static String TAG = "MainActivity";
-//test
+// test
     /**
      * MoIP 영상통화시, FFMPEG 사용 여부 설정
      * true: FFMPEG 사용, MoIP 영상을 안드로이드 화면의 surface에 출력
@@ -384,6 +384,7 @@ public class MainActivity extends WpadActivity {
 
             if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101) LOG_INFO("[onCreate] Model Type [IHN_D101]");
             else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I) LOG_INFO("[onCreate] Model Type [IHN_D101-I]");
+            else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_LX2) LOG_INFO("[onCreate] Model Type [IHN_D101-I_LX2]");
             else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_OCF) LOG_INFO("[onCreate] Model Type [IHN_D101-I-OCF]");
             else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010GL) LOG_INFO("[onCreate] Model Type [IHN_1010GL]");
             else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010GL_I) LOG_INFO("[onCreate] Model Type [IHN_1010GL-I]");
@@ -413,6 +414,7 @@ public class MainActivity extends WpadActivity {
             else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_DW101_I) LOG_INFO("[onCreate] Model Type [IHN_DW101_I]");
             else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1020B_I) LOG_INFO("[onCreate] Model Type [IHN_1020B_I]");
             else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1303_I) LOG_INFO("[onCreate] Model Type [IHN_1303_I]");
+            else if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010_I_LX2) LOG_INFO("[onCreate] Model Type [IHN_1010_I_LX2]");
             else LOG_INFO("[onCreate] ConfigValues.DEVICE_MODELTYPE [" + ConfigValues.DEVICE_MODELTYPE + "]");
 
             // @ AutoScale 설정
@@ -3726,7 +3728,7 @@ public class MainActivity extends WpadActivity {
             if (mFrontCamera != null) {
                 if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101 || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I
                         || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K_I
-                        || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_OCF) {
+                        || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_OCF || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_LX2) {
                     mFrontCamera.takePicture(null, null, mPicture_IHND101);
                 }
                 else {
@@ -4586,7 +4588,7 @@ public class MainActivity extends WpadActivity {
                     Log.d(TAG, "[MainHandler] ConfigValues.DEVICE_MODELTYPE [" + ConfigValues.DEVICE_MODELTYPE + "]");
                     if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101 || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I
                             || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K_I
-                            || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_OCF)
+                            || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_OCF || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_LX2)
                     {
                         sendPSTNRingEndBR();
                     }
@@ -4625,7 +4627,7 @@ public class MainActivity extends WpadActivity {
                     Log.d(TAG, "[MainHandler] AUDIO_PSTN_REJECT");
                     if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101 || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I
                             || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101K_I
-                            || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_OCF) {
+                            || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_OCF || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_D101_I_LX2) {
                         sendPSTNRingEndBR();
                     }
 

+ 4 - 2
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/declare/Global.java

@@ -2084,6 +2084,7 @@ public final class Global {
             switch (nModelType) {
                 case MODEL_TYPE.IHN_D101:
                 case MODEL_TYPE.IHN_D101_I:
+                case MODEL_TYPE.IHN_D101_I_LX2:
                 case MODEL_TYPE.IHN_1010GL:
                 case MODEL_TYPE.IHN_1010GL_I:
                 case MODEL_TYPE.IHN_D101K:
@@ -2096,6 +2097,7 @@ public final class Global {
 
                 case MODEL_TYPE.IHN_1010:
                 case MODEL_TYPE.IHN_1010_I:
+                case MODEL_TYPE.IHN_1010_I_LX2:
                 case MODEL_TYPE.IHN_1030_I:
                 case MODEL_TYPE.IHN_1040:
                 case MODEL_TYPE.IHN_1040_I:
@@ -2135,7 +2137,7 @@ public final class Global {
                     || nModelType == MODEL_TYPE.IHN_D101K || nModelType == MODEL_TYPE.IHN_D101K_I
                     || nModelType == MODEL_TYPE.IHN_1010GL || nModelType == MODEL_TYPE.IHN_1010GL_I
                     || nModelType == MODEL_TYPE.IHN_1010GL_I_2443 || nModelType == MODEL_TYPE.IHN_1010GL_I_6410
-                    || nModelType == MODEL_TYPE.IHN_D101_I_OCF) {
+                    || nModelType == MODEL_TYPE.IHN_D101_I_OCF || nModelType == MODEL_TYPE.IHN_D101_I_LX2) {
                 ConfigValues.bPSTNEnable = true;
                 ConfigValues.bSubPhoneEnable = true;
                 ConfigValues.bWallPadCameraEnable = false;
@@ -2147,7 +2149,7 @@ 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_DW101_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_LX2) {
                 ConfigValues.bPSTNEnable = true;
                 ConfigValues.bSubPhoneEnable = true;
                 ConfigValues.bWallPadCameraEnable = true;

+ 1 - 1
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/subwallpadscreen/TalkFront_SubWallPad.java

@@ -600,7 +600,7 @@ public class TalkFront_SubWallPad  extends WpadScreen implements SubWallPadEvent
         try {
             Log.d(TAG, "[showFrontCam] bOn [" + bOn + "], bBell [" + bBell + "]");
             MainActivity.mIOInterface.ctrlFrontCamPower(bOn);
-            if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010 || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010_I) {
+            if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010 || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010_I || ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1010_I_LX2) {
                 MainActivity.mIOInterface.selectFrontCam(bOn);
             }
             else {