Ver código fonte

[WallPadCall]
1. 로비/가드 Audio Path 분리
2. 버전 업데이트: 2022.10.05.01

jigsjjang 2 anos atrás
pai
commit
d2538c6c89

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

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

+ 18 - 5
WallPadCall/src/main/java/kr/co/icontrols/callengine/engine/CallController.java

@@ -2069,7 +2069,8 @@ public class CallController extends CallManager implements SIPEventListener {
     int AUDIO_MODE_IN_VOICE_DOOR = 10;                             // 현관 VOICE 모드
     int AUDIO_MODE_IN_VOICE_DOOR = 10;                             // 현관 VOICE 모드
     int AUDIO_MODE_IN_DOORWALLPADMUSIC = 10;                       // IHN-1010 현관 초인종
     int AUDIO_MODE_IN_DOORWALLPADMUSIC = 10;                       // IHN-1010 현관 초인종
     int AUDIO_MODE_MOIP_RESIDENCE = 11;                            // A20/V40 월패드 세대 통화
     int AUDIO_MODE_MOIP_RESIDENCE = 11;                            // A20/V40 월패드 세대 통화
-    int AUDIO_MODE_MOIP_LOBBY_GUARD_IHN1010 = 12;                  // IHN-1010 월패드 로비/경비 통화
+    int AUDIO_MODE_MOIP_LOBBY_IHN1010 = 12;                  // IHN-1010 월패드 로비/경비 통화
+    int AUDIO_MODE_MOIP_GUARD_IHN1010 = 13;                  // IHN-1010 월패드 로비/경비 통화
     int AUDIO_MODE_MOIP_LOBBY_IHND101 = 12;                        // IHN-D101 월패드 로비 통화
     int AUDIO_MODE_MOIP_LOBBY_IHND101 = 12;                        // IHN-D101 월패드 로비 통화
     int AUDIO_MODE_MOIP_GUARD_IHND101 = 13;                        // IHN-D101 월패드 경비실 통화
     int AUDIO_MODE_MOIP_GUARD_IHND101 = 13;                        // IHN-D101 월패드 경비실 통화
     int AUDIO_MODE_IN_DOOR_COMMUNICATION_V40 = 15;                 // V40 현관 통화
     int AUDIO_MODE_IN_DOOR_COMMUNICATION_V40 = 15;                 // V40 현관 통화
@@ -2139,8 +2140,12 @@ public class CallController extends CallManager implements SIPEventListener {
                 MainActivity.mIOInterface.ctrlAudioSwitch34118(true);
                 MainActivity.mIOInterface.ctrlAudioSwitch34118(true);
                 sendHandlerMsg(HANDLERMSG.SETMODE_AUDIO_MOIP_GUARD_WALLPAD, 0, 0);
                 sendHandlerMsg(HANDLERMSG.SETMODE_AUDIO_MOIP_GUARD_WALLPAD, 0, 0);
             }
             }
-            else if (eCallPath == CALLPATH.MOIP_IHN1010_LOBBY_GUARD) {
-                MainActivity.mAudioManager.setMode(AUDIO_MODE_MOIP_LOBBY_GUARD_IHN1010);
+            else if (eCallPath == CALLPATH.MOIP_IHN1010_LOBBY) {
+                MainActivity.mAudioManager.setMode(AUDIO_MODE_MOIP_LOBBY_IHN1010);
+                MainActivity.mIOInterface.ctrlAudioSwitch34118(true);
+            }
+            else if (eCallPath == CALLPATH.MOIP_IHN1010_GUARD) {
+                MainActivity.mAudioManager.setMode(AUDIO_MODE_MOIP_GUARD_IHN1010);
                 MainActivity.mIOInterface.ctrlAudioSwitch34118(true);
                 MainActivity.mIOInterface.ctrlAudioSwitch34118(true);
             }
             }
             else if (eCallPath == CALLPATH.PSTN) {
             else if (eCallPath == CALLPATH.PSTN) {
@@ -2338,11 +2343,19 @@ public class CallController extends CallManager implements SIPEventListener {
             else if (nMode == AUDIO_MODE_MOIP_RESIDENCE) { // 11
             else if (nMode == AUDIO_MODE_MOIP_RESIDENCE) { // 11
                 return CALLPATH.MOIP_V40_RESIDENCE;
                 return CALLPATH.MOIP_V40_RESIDENCE;
             }
             }
-            else if (nMode == AUDIO_MODE_MOIP_LOBBY_GUARD_IHN1010) { // 12
+            else if (nMode == AUDIO_MODE_MOIP_LOBBY_IHN1010) { // 12
                 if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) return CALLPATH.MOIP_IHND101_LOBBY;
                 if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) return CALLPATH.MOIP_IHND101_LOBBY;
-                else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) return CALLPATH.MOIP_IHN1010_LOBBY_GUARD;
+                else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) return CALLPATH.MOIP_IHN1010_LOBBY;
                 else return CALLPATH.NONE;
                 else return CALLPATH.NONE;
             }
             }
+            else if (nMode == AUDIO_MODE_MOIP_GUARD_IHN1010) { // 13
+                if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) return CALLPATH.MOIP_IHND101_GUARD;
+                else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) return CALLPATH.MOIP_IHN1010_GUARD;
+                else return CALLPATH.NONE;
+            }
+            else if (nMode == AUDIO_MODE_MOIP_LOBBY_IHND101) { // 12
+                return CALLPATH.MOIP_IHND101_LOBBY;
+            }
             else if (nMode == AUDIO_MODE_MOIP_GUARD_IHND101) { // 13
             else if (nMode == AUDIO_MODE_MOIP_GUARD_IHND101) { // 13
                 return CALLPATH.MOIP_IHND101_GUARD;
                 return CALLPATH.MOIP_IHND101_GUARD;
             }
             }

+ 2 - 1
WallPadCall/src/main/java/kr/co/icontrols/callengine/engine/CallManager.java

@@ -175,7 +175,8 @@ public class CallManager {
         MOIP_V40_RESIDENCE,
         MOIP_V40_RESIDENCE,
         MOIP_IHND101_LOBBY,
         MOIP_IHND101_LOBBY,
         MOIP_IHND101_GUARD,
         MOIP_IHND101_GUARD,
-        MOIP_IHN1010_LOBBY_GUARD,
+        MOIP_IHN1010_LOBBY,
+        MOIP_IHN1010_GUARD,
         PSTN,
         PSTN,
         PSTN_MIC,
         PSTN_MIC,
         PSTN_SPEAKER,
         PSTN_SPEAKER,

+ 1 - 1
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/popup/MultiCall.java

@@ -231,7 +231,7 @@ public class MultiCall extends WpadScreen implements PopupEventListener {
                     setPopupResult(nID);
                     setPopupResult(nID);
                     CALLPATH eCallPath = MainActivity.mCallController.getTalkPath();
                     CALLPATH eCallPath = MainActivity.mCallController.getTalkPath();
                     Log.d(TAG, "[onTouchEvent] eCallPath [" + eCallPath + "]");
                     Log.d(TAG, "[onTouchEvent] eCallPath [" + eCallPath + "]");
-                    if ((eCallPath == CALLPATH.MOIP_IHND101_LOBBY) || ((eCallPath == CALLPATH.MOIP_IHND101_GUARD) && (ConfigValues.bGuardVideoEnable)) || ((eCallPath == CALLPATH.MOIP_IHN1010_LOBBY_GUARD) && (ConfigValues.bGuardVideoEnable)))
+                    if ((eCallPath == CALLPATH.MOIP_IHND101_LOBBY) || ((eCallPath == CALLPATH.MOIP_IHND101_GUARD) && (ConfigValues.bGuardVideoEnable)) || (eCallPath == CALLPATH.MOIP_IHN1010_LOBBY) || ((eCallPath == CALLPATH.MOIP_IHN1010_GUARD) && (ConfigValues.bGuardVideoEnable)))
                         MainActivity.mIOInterface.ctrlPopupGUI(false); // 멀티콜 거절시 현재 통화패스가 로비 또는 경비(영상)통화일 경우 GUI 화면이 아래로(영상이 위로)
                         MainActivity.mIOInterface.ctrlPopupGUI(false); // 멀티콜 거절시 현재 통화패스가 로비 또는 경비(영상)통화일 경우 GUI 화면이 아래로(영상이 위로)
                     else if ((ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) && (eCallPath == CALLPATH.MOIP_V40_RESIDENCE)) {
                     else if ((ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) && (eCallPath == CALLPATH.MOIP_V40_RESIDENCE)) {
                         MainActivity.mIOInterface.ctrlPopupGUI(false); // 멀티콜 거절시 현재 통화패스가 IHN-1010 이웃통화일 경우 GUI 화면이 아래로(영상이 위로)
                         MainActivity.mIOInterface.ctrlPopupGUI(false); // 멀티콜 거절시 현재 통화패스가 IHN-1010 이웃통화일 경우 GUI 화면이 아래로(영상이 위로)

+ 6 - 2
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/TalkFront.java

@@ -1045,7 +1045,10 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
                         if (eCallPath == CALLPATH.MOIP_IHND101_LOBBY) {
                         if (eCallPath == CALLPATH.MOIP_IHND101_LOBBY) {
                             MainActivity.mIOInterface.ctrlPopupGUI(false); // 멀티콜 거절시 로비 통화일 경우 GUI 화면이 아래로(영상이 위로)
                             MainActivity.mIOInterface.ctrlPopupGUI(false); // 멀티콜 거절시 로비 통화일 경우 GUI 화면이 아래로(영상이 위로)
                         }
                         }
-                        else if ((eCallPath == CALLPATH.MOIP_IHND101_GUARD && Global.ConfigValues.bGuardVideoEnable) || (eCallPath == CALLPATH.MOIP_IHN1010_LOBBY_GUARD && Global.ConfigValues.bGuardVideoEnable)) {
+                        else if (eCallPath == CALLPATH.MOIP_IHN1010_LOBBY) {
+                            MainActivity.mIOInterface.ctrlPopupGUI(false); // 멀티콜 거절시 로비 통화일 경우 GUI 화면이 아래로(영상이 위로)
+                        }
+                        else if ((eCallPath == CALLPATH.MOIP_IHND101_GUARD && Global.ConfigValues.bGuardVideoEnable) || (eCallPath == CALLPATH.MOIP_IHN1010_GUARD && Global.ConfigValues.bGuardVideoEnable)) {
                             MainActivity.mIOInterface.ctrlPopupGUI(false); // 멀티콜 거절시 경비(영상)통화일 경우 GUI 화면이 아래로(영상이 위로)
                             MainActivity.mIOInterface.ctrlPopupGUI(false); // 멀티콜 거절시 경비(영상)통화일 경우 GUI 화면이 아래로(영상이 위로)
                         }
                         }
                         else if (eCallPath == CALLPATH.MOIP_V40_RESIDENCE && (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT)) {
                         else if (eCallPath == CALLPATH.MOIP_V40_RESIDENCE && (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT)) {
@@ -1087,7 +1090,8 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
                     {
                     {
                         CALLPATH eCallPath = MainActivity.mCallController.getTalkPath();
                         CALLPATH eCallPath = MainActivity.mCallController.getTalkPath();
                         if (eCallPath == CALLPATH.MOIP_IHND101_LOBBY) MainActivity.mIOInterface.ctrlPopupGUI(false); // 멀티콜 거절시 로비 통화일 경우 GUI 화면이 아래로(영상이 위로)
                         if (eCallPath == CALLPATH.MOIP_IHND101_LOBBY) MainActivity.mIOInterface.ctrlPopupGUI(false); // 멀티콜 거절시 로비 통화일 경우 GUI 화면이 아래로(영상이 위로)
-                        else if ((eCallPath == CALLPATH.MOIP_IHND101_GUARD && Global.ConfigValues.bGuardVideoEnable) || (eCallPath == CALLPATH.MOIP_IHN1010_LOBBY_GUARD && Global.ConfigValues.bGuardVideoEnable)) {
+                        else if (eCallPath == CALLPATH.MOIP_IHN1010_LOBBY) MainActivity.mIOInterface.ctrlPopupGUI(false); // 멀티콜 거절시 로비 통화일 경우 GUI 화면이 아래로(영상이 위로)
+                        else if ((eCallPath == CALLPATH.MOIP_IHND101_GUARD && Global.ConfigValues.bGuardVideoEnable) || (eCallPath == CALLPATH.MOIP_IHN1010_GUARD && Global.ConfigValues.bGuardVideoEnable)) {
                             MainActivity.mIOInterface.ctrlPopupGUI(false); // 멀티콜 거절시 경비(영상)통화일 경우 GUI 화면이 아래로(영상이 위로)
                             MainActivity.mIOInterface.ctrlPopupGUI(false); // 멀티콜 거절시 경비(영상)통화일 경우 GUI 화면이 아래로(영상이 위로)
                         }
                         }
                         else if (eCallPath == CALLPATH.MOIP_V40_RESIDENCE && (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT)) {
                         else if (eCallPath == CALLPATH.MOIP_V40_RESIDENCE && (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT)) {

+ 2 - 2
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/TalkGuard.java

@@ -575,7 +575,7 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
                             if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT)
                             if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT)
                                 MainActivity.mCallController.setTalkPath(CALLPATH.MOIP_IHND101_GUARD);
                                 MainActivity.mCallController.setTalkPath(CALLPATH.MOIP_IHND101_GUARD);
                             else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT)
                             else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT)
-                                MainActivity.mCallController.setTalkPath(CALLPATH.MOIP_IHN1010_LOBBY_GUARD);
+                                MainActivity.mCallController.setTalkPath(CALLPATH.MOIP_IHN1010_GUARD);
                             else MainActivity.mCallController.setTalkPath(CALLPATH.MOIP);
                             else MainActivity.mCallController.setTalkPath(CALLPATH.MOIP);
                         }
                         }
                         mPathCheckHandler.sendEmptyMessage(0);
                         mPathCheckHandler.sendEmptyMessage(0);
@@ -2203,7 +2203,7 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
                             mPathCheckHandler.sendEmptyMessageDelayed(1, 50);
                             mPathCheckHandler.sendEmptyMessageDelayed(1, 50);
                         else mPathCheckHandler.sendEmptyMessageDelayed(0, 50);
                         else mPathCheckHandler.sendEmptyMessageDelayed(0, 50);
                     } else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) {
                     } else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) {
-                        if (MainActivity.mCallController.getTalkPath() == CALLPATH.MOIP_IHN1010_LOBBY_GUARD)
+                        if (MainActivity.mCallController.getTalkPath() == CALLPATH.MOIP_IHN1010_GUARD)
                             mPathCheckHandler.sendEmptyMessageDelayed(2, 50);
                             mPathCheckHandler.sendEmptyMessageDelayed(2, 50);
                         else mPathCheckHandler.sendEmptyMessageDelayed(0, 50);
                         else mPathCheckHandler.sendEmptyMessageDelayed(0, 50);
                     }
                     }

+ 2 - 2
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/TalkLobby.java

@@ -553,7 +553,7 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
                                 MainActivity.mCallController.setTalkPath(CALLPATH.MOIP_IHND101_LOBBY);
                                 MainActivity.mCallController.setTalkPath(CALLPATH.MOIP_IHND101_LOBBY);
                             }
                             }
                             else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) {
                             else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) {
-                                MainActivity.mCallController.setTalkPath(CALLPATH.MOIP_IHN1010_LOBBY_GUARD);
+                                MainActivity.mCallController.setTalkPath(CALLPATH.MOIP_IHN1010_LOBBY);
                             }
                             }
                             else {
                             else {
                                 MainActivity.mCallController.setTalkPath(CALLPATH.MOIP);
                                 MainActivity.mCallController.setTalkPath(CALLPATH.MOIP);
@@ -2325,7 +2325,7 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
                             mPathCheckHandler.sendEmptyMessageDelayed(1, 50);
                             mPathCheckHandler.sendEmptyMessageDelayed(1, 50);
                         else mPathCheckHandler.sendEmptyMessageDelayed(0, 50);
                         else mPathCheckHandler.sendEmptyMessageDelayed(0, 50);
                     } else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) {
                     } else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) {
-                        if (MainActivity.mCallController.getTalkPath() == CALLPATH.MOIP_IHN1010_LOBBY_GUARD)
+                        if (MainActivity.mCallController.getTalkPath() == CALLPATH.MOIP_IHN1010_LOBBY)
                             mPathCheckHandler.sendEmptyMessageDelayed(1, 50);
                             mPathCheckHandler.sendEmptyMessageDelayed(1, 50);
                         else mPathCheckHandler.sendEmptyMessageDelayed(0, 50);
                         else mPathCheckHandler.sendEmptyMessageDelayed(0, 50);
                     }
                     }