Kaynağa Gözat

2022.02.16 VIP
1. 4차 QA 이슈 수정

DESKTOP-UNEGUH3\MadeinLab_SW_02 3 yıl önce
ebeveyn
işleme
d19eb756d9

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

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

@@ -262,7 +262,7 @@ public class VideoJNI {
 
     public void decoderStopOperation() {
         try {
-            int nTime = 500;
+            int nTime = 700;
             Log.d(TAG, "[decoderStopOperation] BOARDTYPE [" + BOARDTYPE + "], bDecoderStarted [" + bDecoderStarted + "], SWDecoderStarted [" + SWDecoderStarted + "]");
             if (BOARDTYPE == BOARD_TYPE.V40_IGW300) {
                 if (bDecoderStarted) {

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

@@ -1161,7 +1161,7 @@ public class InquiryCallHistory extends WpadScreen implements CallEventListener,
                     mLIST_VALUE[i].REMOTE_IP = mInfoTable.getCallHistoryInfo(i+iListCount).getName();
 
                     if (mLIST_VALUE[i].REMOTE_IP.equals("lobby")) {
-                        mLIST_VALUE[i].NAME =  "정문 로비";
+                        mLIST_VALUE[i].NAME =  "대문";
                     }
                     else if (mLIST_VALUE[i].REMOTE_IP.equals("homedev")) {
                         //String[] strEndIP = {"10.1.1.1", "10.1.2.1", "10.1.3.1", "10.1.3.2", "10.1.1.3", "10.1.1.2", "10.1.2.2"};

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

@@ -516,7 +516,7 @@ public class InquiryVisitorPictureHistory extends WpadScreen implements CallEven
             } else if (strName.contains("FRONT")) {
                 strResult = "현관";
             } else if (strName.contains("LOBBY")) {
-                strResult = "101동 10번 로비";
+                strResult = "대문";
             } 
 //            } else {
 //                String[] strParse_01 = strName.split("/");

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

@@ -114,7 +114,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
 
     int nCurrentVolume = 0;
 
-    boolean m_bCallStartBtnEnable = false;
+    boolean m_bCallStartBtnEnable = true;
 
     Context mContext;
 

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

@@ -383,7 +383,14 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
                         sendHandlerMsgDelayed(HANDLERMSG.ENABLE_SAVE_VISITORPICTURE, 0, 0, null, 3000);
                     } else if (nID == ID.SCREEN.TALKLOBBY.ELEMENT.BUTTON.DOOROPEN) {
                         if (!bSentiMAP) {
-                            sendHandlerMsg(HANDLERMSG.HIDE_LOBBYVIDEO, 0, 0, null); // 문열림으로 통화 종료시 로비 영상 노이즈가 생기므로 영상을 GUI 아래로 내림
+                            new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
+                                @Override
+                                public void run() {
+                                    //Global.stopMelodyRepeat();
+                                    sendHandlerMsg(HANDLERMSG.HIDE_LOBBYVIDEO, 0, 0, null); // 문열림으로 통화 종료시 로비 영상 노이즈가 생기므로 영상을 GUI 아래로 내림
+                                }
+                            }, 2000);
+
                             doDoorOpen();
                             //doEnd();
                             //send_stop_talking_request(RemoteIDInfo.strIP);
@@ -1029,6 +1036,7 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
                     nSelectedFilter = 0;
                     sendReliefFilterSelectBR(nSelectedFilter);
                     MainActivity.mCallController.MultiCallScenarioManager();
+                    //MainActivity.mCallController.rejectMoIPCall();
                     //send_stop_talking_request(RemoteIDInfo.strIP);
                 }
                 else if (MainActivity.mCallController.mCallInfo.getLOBBY() == CALLSTATUS.TALKING) {
@@ -2190,8 +2198,9 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
                     break;
 
                 case HANDLERMSG.HIDE_LOBBYVIDEO:
-                    //if (IMG_VIDEO_MODULE != null) IMG_VIDEO_MODULE.setImageResource(R.drawable.image_lobby);
-                    //if (MainActivity.mIOInterface != null) MainActivity.mIOInterface.ctrlPopupGUI(true);
+                    if (IMG_VIDEO_MODULE != null) IMG_VIDEO_MODULE.setImageResource(R.drawable.image_lobby);
+                    if (MainActivity.mIOInterface != null) MainActivity.mIOInterface.ctrlPopupGUI(true);
+                    //doEnd();
                     break;
 
                 default:

+ 7 - 3
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/TalkResidence.java

@@ -405,22 +405,26 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
                         if (MainActivity.mCallController.mCallInfo.getRESI() != CALLSTATUS.TALKING) MainActivity.mSound.Play(SND.effect.TOUCH_LATCHED);
 
                         if (ConfigValues.bWallPadCameraEnable) {
+                            //BTN_END.setImageResource(R.drawable.btn_residence_end_disabled2);
                             BTN_END.setButtonEventOffEnable(R.drawable.btn_residence_end_disabled2);
                         }
                         else
                         {
-                            BTN_END.setButtonEventOffEnable(R.drawable.btn_residence_end_disabled3);
+                            //BTN_END.setImageResource(R.drawable.btn_residence_end_disabled2);
+                            BTN_END.setButtonEventOffEnable(R.drawable.btn_residence_end_disabled2);
                         }
 
+                        //BTN_END.setEnabled(false);
+
                         m_bCallStartBtnEnable = true;
                         new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
                             @Override
                             public void run() {
-                                BTN_END.setImageResource(R.drawable.btn_residence_end_normal3);
+                                BTN_END.setImageResource(R.drawable.btn_residence_end_normal2);
                                 BTN_END.setButtonEventOffDisable();
                                 m_bCallStartBtnEnable = false;
                             }
-                        }, 2000);
+                        }, 3000);
 
                         if (Global.TargetInputStep == TARGETINFOINPUTSTEP.DONE) {
                             doTalk(CALLOWNER.WALLPAD);