Преглед на файлове

[WallPadCall]
1. 월패드-현관 통화 중, 경비/세대 호출에 대한 멀티콜 팝업이 생성되지 않는 문제 수정
2. 월패드-로비 통화 종료시 서브폰이 느리게 끊기는 문제 수정
3. 버전 수정 (2022.08.17.01)

jigsjjang преди 2 години
родител
ревизия
4e8a76b85e

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

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

@@ -813,8 +813,8 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
             MainActivity.mCallController.mCallInfo.printCallStatus();
             MainActivity.mCallController.mCallInfo.printMultiCallStatus();
 
-            if(eCallOwner == CALLOWNER.NONE)
-                return;
+            //if(eCallOwner == CALLOWNER.NONE)
+            //    return;
 
             if (eCallStatus == CALLSTATUS.CALLED) {
                 if (eCallType == CALLTYPE.LOBBY || eCallType == CALLTYPE.GUARD || eCallType == CALLTYPE.RESIDENCE) {

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

@@ -589,6 +589,9 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
                         ((MainActivity) mContext).m_bMissCall = true;
 
                     ((MainActivity) mContext).m_bMissCall_Lobby = false;
+                    if(eCallOwner == CALLOWNER.WALLPAD)
+                        MainActivity.mSubPhoneController.notifyEndCall(eCallOwner, CALLTYPE.LOBBY);
+
                 } else if (eCallStatus == CALLSTATUS.REJECT) {
                     bEnableVisitorPic = false;
                     bReliefCallInit = false;