Browse Source

2021.12.01 VIP wallpadCall 통화 merge
주방티비 콜 수정.

DESKTOP-UNEGUH3\MadeinLab_SW_02 3 years ago
parent
commit
541a6c6197

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

@@ -2264,16 +2264,20 @@ public class CallController extends CallManager implements SIPEventListener {
                 }
                 else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
                     if (eCallType == CALLTYPE.FRONT) {
-                        if (ConfigValues.eFrontCameraType == FRONTCAMERATYPE.SMARTIOT || ConfigValues.eFrontCameraType == FRONTCAMERATYPE.HD) {
-                            MainActivity.mIOInterface.selectFrontCam(false);
-                            MainActivity.mIOInterface.interfaceIGW300(IGW300CMD.VIDEO_MOIP);
-                            mVideoJNI.setComposite(false);
-                            mVideoJNI.decoderStartOperation();
-                        }
-                        else {
-                            MainActivity.mIOInterface.selectFrontCam(true);
-                            MainActivity.mIOInterface.interfaceIGW300(IGW300CMD.VIDEO_FRONT);
-                        }
+//                        if (ConfigValues.eFrontCameraType == FRONTCAMERATYPE.SMARTIOT || ConfigValues.eFrontCameraType == FRONTCAMERATYPE.HD) {
+//                            MainActivity.mIOInterface.selectFrontCam(false);
+//                            MainActivity.mIOInterface.interfaceIGW300(IGW300CMD.VIDEO_MOIP);
+//                            mVideoJNI.setComposite(false);
+//                            mVideoJNI.decoderStartOperation();
+//                        }
+//                        else {
+//                            MainActivity.mIOInterface.selectFrontCam(true);
+//                            MainActivity.mIOInterface.interfaceIGW300(IGW300CMD.VIDEO_FRONT);
+//                        }
+                        MainActivity.mIOInterface.interfaceIGW300(IGW300CMD.VIDEO_MOIP);
+                        mVideoJNI.setComposite(true);
+                        MainActivity.mIOInterface.selectFrontCam(false);
+
                     }
                     else if (eCallType == CALLTYPE.GUARD) {
                         MainActivity.mIOInterface.interfaceIGW300(IGW300CMD.VIDEO_MOIP);
@@ -2290,8 +2294,8 @@ public class CallController extends CallManager implements SIPEventListener {
                         if (MainActivity.mIOInterface != null)
                             MainActivity.mIOInterface.selectFrontCam(false);
                         if (bFinish) {
-                            if (ConfigValues.eFrontCameraType == FRONTCAMERATYPE.SMARTIOT || ConfigValues.eFrontCameraType == FRONTCAMERATYPE.HD)
-                                mVideoJNI.decoderStopOperation();
+                            //if (ConfigValues.eFrontCameraType == FRONTCAMERATYPE.SMARTIOT || ConfigValues.eFrontCameraType == FRONTCAMERATYPE.HD)
+                            //    mVideoJNI.decoderStopOperation();
                         }
                     }
                 }

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

@@ -1039,6 +1039,11 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
                     //Global.stopMelodyRepeat();
                     //MainActivity.mCallController.rejectMoIPCall();
 
+                    if(MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.CALLING)
+                    {
+                        send_stop_talking_request(RemoteIDInfo.strIP);
+                    }
+
                     bEnableVisitorPic = false;
                     bReliefCallInit = false;
                     Global.stopMelodyRepeat();