Browse Source

[WallPadCall]
1. App Ver. 갱신
- 2022.05.20.01
2. 경비실 통화시작시, 이전 통화음량대로 음량 설정 안되는 이슈 개선

Changwoo Nam 3 years ago
parent
commit
b44600e992

+ 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.05.19.01">
+    android:versionName="2022.05.20.01">
 
     <!--android:sharedUserId="android.uid.system"-->
     <!--<uses-sdk-->

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

@@ -2004,7 +2004,7 @@ public class CallController extends CallManager implements SIPEventListener {
     public CALLPATH getTalkPath() {
         try {
             int nMode = MainActivity.mAudioManager.getMode();
-//            LOG("[getTalkPath] nMode [" + nMode + "]");
+            LOG("[getTalkPath] nMode [" + nMode + "]");
             if (nMode == AUDIO_MODE_NORMAL) {
                 return CALLPATH.NORMAL;
             }
@@ -2044,7 +2044,7 @@ public class CallController extends CallManager implements SIPEventListener {
                 else return CALLPATH.NONE;
             }
             else if (nMode == AUDIO_MODE_MOIP_GUARD_IHND101) { // 13
-                return CALLPATH.MOIP_IHND101_GUARD;
+                return CALLPATH.MOIP_IHN1000_GUARD;
             }
             else if (nMode == AUDIO_MODE_IN_DOOR_COMMUNICATION_V40) {
                 return CALLPATH.FRONT;

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

@@ -469,6 +469,7 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
                     }
                     else {
                         MainActivity.mCallController.setTalkPath(CALLPATH.MOIP_IHN1000_GUARD);
+                        mPathCheckHandler.sendEmptyMessage(0);
                     }
 
                     MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.RESIDENCEnGUARD);
@@ -1795,7 +1796,6 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
             if (nCurrentVolume != nCtrlLevel) {
                 nCurrentVolume = nCtrlLevel;
                 showVolume(nCurrentVolume);
-//                ctrlVolume(false);
             }
         }
 
@@ -1983,12 +1983,10 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
                     mPathCheckHandler.removeMessages(1);
                 } else {
                     if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
-                        if (MainActivity.mCallController.getTalkPath() == CALLPATH.MOIP_IHND101_GUARD)
-                            mPathCheckHandler.sendEmptyMessageDelayed(1, 50);
+                        if (MainActivity.mCallController.getTalkPath() == CALLPATH.MOIP_IHND101_GUARD) mPathCheckHandler.sendEmptyMessageDelayed(1, 50);
                         else mPathCheckHandler.sendEmptyMessageDelayed(0, 50);
                     } else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) {
-                        if (MainActivity.mCallController.getTalkPath() == CALLPATH.MOIP_IHN1000_GUARD)
-                            mPathCheckHandler.sendEmptyMessageDelayed(2, 50);
+                        if (MainActivity.mCallController.getTalkPath() == CALLPATH.MOIP_IHN1000_GUARD) mPathCheckHandler.sendEmptyMessageDelayed(2, 50);
                         else mPathCheckHandler.sendEmptyMessageDelayed(0, 50);
                     }
                 }