Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/master'

jslee(madeinlab) 3 rokov pred
rodič
commit
8ba64c7200

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

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

@@ -2348,16 +2348,16 @@ public class CallController extends CallManager implements SIPEventListener {
                 else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) {
                     if (eCallType == CALLTYPE.FRONT) {
                         if (ConfigValues.eFrontCameraType == FRONTCAMERATYPE.SMART_HS) {
-                            mVideoJNI.setComposite(false);
-                            mVideoJNI.decoderStartOperation();
+                            mVideoJNI.setComposite(true);
+                            //mVideoJNI.decoderStartOperation();
                         }
                         else if (ConfigValues.eFrontCameraType == FRONTCAMERATYPE.SMART_DW) {
-                            mVideoJNI.setComposite(false);
-                            mVideoJNI.decoderStartOperation();
+                            mVideoJNI.setComposite(true);
+                            //mVideoJNI.decoderStartOperation();
                         }
                         else {
-                            mVideoJNI.setComposite(false);
-                            mVideoJNI.decoderStartOperation();
+                            mVideoJNI.setComposite(true);
+                            //mVideoJNI.decoderStartOperation();
                         }
                     }
                     else if (eCallType == CALLTYPE.LOBBY || eCallType == CALLTYPE.RESIDENCE) {

+ 16 - 11
WallPadCall/src/main/java/kr/co/icontrols/callengine/engine/SIPInterface.java

@@ -877,13 +877,15 @@ public class SIPInterface {
                                 videoManager = null;
                             }
 
+
                             if (!bDecoding) {
-//                                Log.w(TAG, "[videoSet] ================= VIDEO [7] =================");
-                                if (bDecoderStarted) {
-//                                    Log.w(TAG, "[videoSet] ================= VIDEO [8] =================");
-                                    MainActivity.mCallController.mVideoJNI.decoderStopOperation();
-                                    bDecoderStarted = false;
-                                }
+                                Log.w(TAG, "[videoSet] ================= VIDEO [7] =================");
+                                MainActivity.mCallController.mVideoJNI.decoderStopOperation();
+                                bDecoderStarted = false;
+//                                if (bDecoderStarted) {
+////                                    Log.w(TAG, "[videoSet] ================= VIDEO [8] =================");
+//
+//                                }
 //                                Log.w(TAG, "[videoSet] ================= VIDEO [9] =================");
                             }
 
@@ -999,11 +1001,14 @@ public class SIPInterface {
 
                     if (!bDecoding) {
 //                        Log.w(TAG, "[videoSet] ================= VIDEO [7] =================");
-                        if (bDecoderStarted) {
-//                            Log.w(TAG, "[videoSet] ================= VIDEO [8] =================");
-                            MainActivity.mCallController.mVideoJNI.decoderStopOperation();
-                            bDecoderStarted = false;
-                        }
+                        Log.d(TAG, "[videoSet] 1 bDecoderStarted: " + bDecoderStarted);
+                        MainActivity.mCallController.mVideoJNI.decoderStopOperation();
+                        bDecoderStarted = false;
+//                        if (bDecoderStarted) {
+////                            Log.w(TAG, "[videoSet] ================= VIDEO [8] =================");
+//                            MainActivity.mCallController.mVideoJNI.decoderStopOperation();
+//                            bDecoderStarted = false;
+//                        }
 //                        Log.w(TAG, "[videoSet] ================= VIDEO [9] =================");
                     }
 

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

@@ -397,15 +397,18 @@ public class VideoJNI {
     boolean bComposite = false;   // true: 로비, false: 현관
     public void setComposite(boolean bEnable) {
         try {
+            bEnable = true; //VIP 경우 현관 아날로그 통화가 없음. 그래서 false 로 들어오더라도 true 로 강제 변환
             Log.d(TAG, "[setComposite] bEnable [" + bEnable + "]");
             if (BOARDTYPE == BOARD_TYPE.V40_IGW300 || BOARDTYPE == BOARD_TYPE.V40) {
-                if (bEnable) mV40IFCCD.composite(1);
-                else mV40IFCCD.composite(0);
+                mV40IFCCD.composite(1);
+                //if (bEnable) mV40IFCCD.composite(1);
+                //else mV40IFCCD.composite(0); //VIP 경우 현관 아날로그 통화가 없음.
             } else if (BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT || BOARDTYPE == BOARD_TYPE.V40_NOUGAT) {
                 // true : 로비통화, false : 현관통화
                 bComposite = bEnable;
-                if (bEnable) mV40IFCCD.composite(1);   // 로비통화
-                else mV40IFCCD.composite(0);   // 현관통화
+                mV40IFCCD.composite(1);
+                //if (bEnable) mV40IFCCD.composite(1);   // 로비통화
+                //else mV40IFCCD.composite(0);   //VIP 경우 현관 아날로그 통화가 없음.
             } else {
                 Log.w(TAG, "[setComposite] Not supported BOARDTYPE!! [" + BOARDTYPE + "]");
             }

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

@@ -144,7 +144,7 @@ import static kr.co.icontrols.wallpadcall.declare.Declare.BR.ACNAME_MAIN_NOTI;
  */
 public class MainActivity extends WpadActivity {
     private final static String TAG = "MainActivity";
-//
+
     /**
      * MoIP 영상통화시, FFMPEG 사용 여부 설정
      * true: FFMPEG 사용, MoIP 영상을 안드로이드 화면의 surface에 출력

+ 2 - 1
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/popup/DeleteItems.java

@@ -139,7 +139,8 @@ public class DeleteItems extends WpadScreen implements PopupEventListener {
         super.onClose();
         try {
             LOG_INFO("[onClose]");
-            MainActivity.mIOInterface.ctrlPopupGUI(false);
+            //사진 삭제 popup 후 취소할 경우 오류 발생 아래 코드 불필요.
+            //MainActivity.mIOInterface.ctrlPopupGUI(false);
             setPopupResult(ID.POPUP.DELETE_ITEMS.ELEMENT.BUTTON.CANCEL, strPopupType);
             MainActivity.mCallController.releasePopupEventListener();
         } catch (RuntimeException re) {

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

@@ -312,6 +312,11 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
         try {
             LOG_INFO("[onClose]");
             //MainActivity.mIOInterface.ctrlPopupGUI(false);
+            MainActivity.mCallController.mSIPInterface.videoSet(false, false, false);
+
+            //MainActivity.mCallController.mVideoJNI.decoderStopOperation();
+            //bDecoderStarted = false;
+
             if (MainActivity.mIOInterface != null) MainActivity.mIOInterface.ctrlWallPadLED_Call(false);
             nSelectedFilter = 0;
             sendReliefFilterSelectBR(nSelectedFilter);
@@ -336,7 +341,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
             if (ConfigValues.bReliefCall) selectReliefCallFilter(nSelectedFilter);
             MainActivity.mCallController.releaseCallEventListener();
             ((MainActivity) mContext).releaseMainEventListener();
-            MainActivity.mCallController.mSIPInterface.videoSet(false, false, false);
+
             initCallVariables();
             //super.setFinishTimerDestroy();
             //Global.add1stCallHistoryInfoFinal();