Prechádzať zdrojové kódy

2022.01.25 VIP
1. 통화 이슈 수정

DESKTOP-UNEGUH3\MadeinLab_SW_02 3 rokov pred
rodič
commit
47c883f099

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

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

@@ -325,7 +325,9 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
             if (TalkFrontHandler != null) {
                 TalkFrontHandler.removeMessages(TalkFront.HANDLERMSG.ENABLE_SAVE_VISITORPICTURE);
                 TalkFrontHandler.removeMessages(TalkFront.HANDLERMSG.SAVE_VISITORPICTURE);
-                TalkFrontHandler.removeMessages(TalkFront.HANDLERMSG.TAKE_VISITORPICTURE);
+                TalkFrontHandler.removeMessages(TalkFront.HANDLERMSG.ENABLE_TALK_BTN);
+                TalkFrontHandler.removeMessages(TalkFront.HANDLERMSG.ENABLE_END_BTN);
+                TalkFrontHandler.removeMessages(TalkFront.HANDLERMSG.ENABLE_OPENDOOR_BTN);
             }
 
             if (mPathCheckHandler != null) {

+ 15 - 0
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/TalkResidence.java

@@ -1734,7 +1734,22 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
 //                        MainActivity.mSubPhoneController.sendBusyCall(CALLOWNER.SUB_WALLPAD, CALLTYPE.RESIDENCE);
 
                         int nTime = MainActivity.mSound.PlayMent(SND.call.BUSY_TRY_LATER);
+                        try {
+                            Thread.sleep(nTime + 500);
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+
+                        MainActivity.mCallController.mCallInfo.setCallStatus(CALLTYPE.RESIDENCE, CALLSTATUS.IDLE);
+                        MainActivity.mCallController.stop1stCallTimer();
+                        initCallVariables();
+                        updateScreen();
+                        Global.change1stCallLogAction(CALLACTION.BUSY);
+                        MainActivity.mCallController.MultiCallScenarioManager();
+                        ((MainActivity) mContext).setMenuBTNEnable(true);
+                        MainActivity.mSubPhoneController.sendBusyCall(CALLOWNER.SUB_WALLPAD, CALLTYPE.RESIDENCE);
 
+                        /*
                         new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
                             @Override
                             public void run() {