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

2022.09.22

수정내용.

1. 로비 문열림 멘트 추가

2. 경비 호출 후 응답이 없을 경우 "잠시 후에 다시 시도 해주세요" 멘트 출력 후 종료
DESKTOP-UNEGUH3\MadeinLab_SW_02 преди 2 години
родител
ревизия
92943de11c

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

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

@@ -30,6 +30,7 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.OutputStreamWriter;
 import java.net.NoRouteToHostException;
 import java.net.NoRouteToHostException;
 import java.net.Socket;
 import java.net.Socket;
+import java.net.UnknownHostException;
 
 
 import kr.co.icontrols.callengine.engine.CallController.CallEventListener;
 import kr.co.icontrols.callengine.engine.CallController.CallEventListener;
 import kr.co.icontrols.callengine.engine.CallManager.CALLEVENTTYPE;
 import kr.co.icontrols.callengine.engine.CallManager.CALLEVENTTYPE;
@@ -1110,7 +1111,9 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
         @Override
         @Override
         public void run() {
         public void run() {
             try {
             try {
+
                 s = new Socket(toCall, 4001);
                 s = new Socket(toCall, 4001);
+
                 s.setTcpNoDelay(true);
                 s.setTcpNoDelay(true);
                 output = new BufferedWriter(new OutputStreamWriter(s.getOutputStream()));
                 output = new BufferedWriter(new OutputStreamWriter(s.getOutputStream()));
                 input = new BufferedReader(new InputStreamReader(s.getInputStream()));
                 input = new BufferedReader(new InputStreamReader(s.getInputStream()));
@@ -1171,26 +1174,14 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
             catch (NoRouteToHostException e)
             catch (NoRouteToHostException e)
             {
             {
                 LOG_INFO("[mySocket] NoRouteToHostException()");
                 LOG_INFO("[mySocket] NoRouteToHostException()");
-
                 MainActivity.mSound.Play(SND.call.BUSY_TRY_LATER);
                 MainActivity.mSound.Play(SND.call.BUSY_TRY_LATER);
-
-                sendHandlerMsgDelayed(HANDLERMSG.END_CALL, 0, 0, 1500);
-                //finishWallpadCallApp();
-//                new Handler().postDelayed(new Runnable()
-//                {
-//                    @Override
-//                    public void run()
-//                    {
-//                        //딜레이 후 시작할 코드 작성
-//                        finishWallpadCallApp();
-//                    }
-//                }, 2000);
-
-                //initCallVariables();
-                //updateScreen();
+                sendHandlerMsgDelayed(HANDLERMSG.END_CALL, 0, 0, 3000);
             }
             }
             catch (IOException e) {
             catch (IOException e) {
-                e.printStackTrace();
+                LOG_INFO("[mySocket] IOException()");
+                MainActivity.mSound.Play(SND.call.BUSY_TRY_LATER);
+                sendHandlerMsgDelayed(HANDLERMSG.END_CALL, 0, 0, 3000);
+                //e.printStackTrace();
             }
             }
         }
         }
     }
     }

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

@@ -1844,7 +1844,7 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
                             if(MainActivity.mCallController.mCallInfo.getLOBBY() == CALLSTATUS.CALLED)
                             if(MainActivity.mCallController.mCallInfo.getLOBBY() == CALLSTATUS.CALLED)
                             {
                             {
 //                                MainActivity.mCallController.setTalkPath(CALLPATH.NORMAL);
 //                                MainActivity.mCallController.setTalkPath(CALLPATH.NORMAL);
-//                                mPathCheckHandler.sendEmptyMessage(2); // 통화패스 Normal로 변경 확인 후 멘트 출력 seulki
+                                mPathCheckHandler.sendEmptyMessage(2); // 통화패스 Normal로 변경 확인 후 멘트 출력 seulki
 //                                enableTalkBTN(false);
 //                                enableTalkBTN(false);
 //                                enableEndBTN(false);
 //                                enableEndBTN(false);
 //                                enableOpenDoorBTN(false);
 //                                enableOpenDoorBTN(false);
@@ -1855,6 +1855,11 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
 //                                }
 //                                }
                                 doEnd();
                                 doEnd();
                             }
                             }
+                            else if(MainActivity.mCallController.mCallInfo.getLOBBY() == CALLSTATUS.TALKING)
+                            {
+                                MainActivity.mCallController.setTalkPath(CALLPATH.NORMAL);
+                                mPathCheckHandler.sendEmptyMessage(2); // 통화패스 Normal로 변경 확인 후 멘트 출력 seulki
+                            }
 
 
                             break;
                             break;
 
 

+ 5 - 1
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/TalkResidence.java

@@ -1764,7 +1764,11 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
                 updateScreen();
                 updateScreen();
             }
             }
             catch (IOException e) {
             catch (IOException e) {
-                e.printStackTrace();
+                LOG_INFO("[mySocket] IOException()");
+                MainActivity.mSound.Play(SND.setting.RETRY_INPUT);
+                initCallVariables();
+                updateScreen();
+                //e.printStackTrace();
             }
             }
         }
         }
     }
     }