优化视频通话

app/src/main/java/com/xplora/xpvideo/activity/MainActivity.java

@@ -1,18 +1,15 @@
 package com.xplora.xpvideo.activity;
 
-import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.pm.PackageManager;
-import android.media.MediaPlayer;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
 import android.view.View;
-import android.view.WindowManager;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
@@ -24,6 +21,7 @@ import com.juphoon.cloud.JCCallItem;
 import com.juphoon.cloud.JCMediaDevice;
 import com.juphoon.cloud.JCMediaDeviceVideoCanvas;
 import com.xplora.xpvideo.R;
+import com.xplora.xpvideo.manager.DataManager;
 import com.xplora.xpvideo.manager.DatabaseUtils;
 import com.xplora.xpvideo.manager.MediaPlayerUtils;
 import com.xplora.xpvideo.manager.VideoManager;
@@ -33,10 +31,6 @@ import com.xplora.xpvideo.utils.Constant;
 import com.xplora.xpvideo.utils.Macros;
 import com.xplora.xpvideo.utils.ToolsUtils;
 
-import org.w3c.dom.Text;
-
-import java.io.IOException;
-import java.sql.Time;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -68,8 +62,7 @@ public class MainActivity extends Activity implements Listener.VideoListener {
 
     //0:呼入 1:呼出
     private int mVideoType = 0;
-    private String mVideoId = "";
-    private String mTicket = "TK_1ONFZ8pNwa";
+    private String mTargetId = "";
     private ContactBean mContactBean = new ContactBean();
 
     @Override
@@ -114,15 +107,15 @@ public class MainActivity extends Activity implements Listener.VideoListener {
     }
 
     private void initData() {
-        Log.d(TAG, "initData: ");
         if (Macros.DEBUG) {
             mVideoType = 0;
-            mVideoId = "3523b1d1-8543-43d9-92c9-df663a3f147d";
+            mTargetId = "3523b1d1-8543-43d9-92c9-df663a3f147d";
         } else {
             mVideoType = getIntent().getIntExtra(Constant.EXTRA_VIDEO_TYPE, 0);
-            mVideoId = getIntent().getStringExtra(Constant.EXTRA_VIDEO_ID);
+            mTargetId = getIntent().getStringExtra(Constant.EXTRA_VIDEO_TARGET_ID);
         }
-        mContactBean = new DatabaseUtils().loadContact(mVideoId);
+        Log.d(TAG, "initData: VideoType:" + mVideoType + " TargetId:" + mTargetId );
+        mContactBean = new DatabaseUtils().loadContact(mTargetId);
 
         ToolsUtils.setImageView(mIconView, mContactBean.profilePath, 0, R.drawable.default_avatar);
         mNameText.setText(mContactBean.name);
@@ -131,7 +124,9 @@ public class MainActivity extends Activity implements Listener.VideoListener {
 
     private void initVideoManager() {
         if (ToolsUtils.isNetworkAvailable(this)) {
-            mVideoManager.init(this, mTicket);
+            String userId = DataManager.getVideoUserId(this);
+            Log.d(TAG, "initVideoManager: " + userId);
+            mVideoManager.init(this, userId);
         } else {
             showToast(getString(R.string.network_error));
         }
@@ -139,14 +134,16 @@ public class MainActivity extends Activity implements Listener.VideoListener {
 
     @Override
     public void onLoginCallback(boolean isOK) {
+        Log.d(TAG, "onLoginCallback: " + isOK);
         //呼出
         if (isOK && mVideoType == 1) {
-            mVideoManager.call(mVideoId);
+            mVideoManager.call(mTargetId);
         }
     }
 
     @Override
     public void onCallItemAdd(JCCallItem item) {
+        Log.d(TAG, "onCallItemAdd: ");
         mLoadingLayout.setVisibility(View.GONE);
         mInfoLayout.setVisibility(View.VISIBLE);
 
@@ -205,6 +202,7 @@ public class MainActivity extends Activity implements Listener.VideoListener {
     }
 
     private void updateLayout_talking(JCCallItem item) {
+        Log.d(TAG, "updateLayout_talking: ");
         if (mLocalCanvas != null) {
             mVideoLayout.removeView(mLocalCanvas.getVideoView());
             mLocalCanvas = null;
@@ -223,6 +221,7 @@ public class MainActivity extends Activity implements Listener.VideoListener {
     }
 
     private void removeCanvas() {
+        Log.d(TAG, "removeCanvas: ");
         if (mLocalCanvas != null) {
             mVideoLayout.removeView(mLocalCanvas.getVideoView());
             mVideoManager.mMediaDevice.stopVideo(mLocalCanvas);

app/src/main/java/com/xplora/xpvideo/manager/DataManager.java

@@ -0,0 +1,15 @@
+package com.xplora.xpvideo.manager;
+
+import android.content.Context;
+import android.provider.Settings;
+
+public class DataManager {
+
+    public static String getVideoUserId(Context context) {
+        return Settings.Global.getString(context.getContentResolver(), "sk_tk");
+    }
+
+    public static void setVideoUserId(Context context, String value) {
+        Settings.Global.putString(context.getContentResolver(), "sk_tk", value);
+    }
+}

app/src/main/java/com/xplora/xpvideo/utils/Constant.java

@@ -2,5 +2,5 @@ package com.xplora.xpvideo.utils;
 
 public class Constant {
     public final static String EXTRA_VIDEO_TYPE = "ExtraVideoType";
-    public final static String EXTRA_VIDEO_ID = "ExtraVideoId";
+    public final static String EXTRA_VIDEO_TARGET_ID = "ExtraVideoTargetId";
 }