优化启动流程

app/src/main/java/com/sikey/skvideo/activity/MainActivity.java

@@ -84,7 +84,6 @@ public class MainActivity extends BaseActivity implements Listener.VideoListener
     }
 
     protected void initData() {
-        Log.d(TAG, "initData: ");
         if (Macros.DEBUG) {
             mVideoType = Constant.VIDEO_CALL_OUT;
             mTargetId = "3523b1d1-8543-43d9-92c9-df663a3f147d";
@@ -123,13 +122,13 @@ public class MainActivity extends BaseActivity implements Listener.VideoListener
             refreshInfoLayout(0);
         });
         cancelInBtn.setOnClickListener(v -> {
-            clickCancelButton();
+            videoEndStep1();
         });
         cancelOutBtn.setOnClickListener(v -> {
-            clickCancelButton();
+            videoEndStep1();
         });
         cancelIngBtn.setOnClickListener(v -> {
-            clickCancelButton();
+            videoEndStep1();
         });
         answerInBtn.setOnClickListener(v -> {
             mVideoManager.answer();
@@ -141,7 +140,7 @@ public class MainActivity extends BaseActivity implements Listener.VideoListener
 
         });
         mBottomEndButton.setOnClickListener(v -> {
-            actionWithFinish();
+            videoEndStep2();
         });
     }
 
@@ -204,12 +203,6 @@ public class MainActivity extends BaseActivity implements Listener.VideoListener
             mBottomEndButton.setVisibility(View.VISIBLE);
             String text = ToolsUtils.getTimeString(mTimeCount);
             mHintText.setText(text);
-            new Handler().postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    actionWithFinish();
-                }
-            }, 3000);
         }
     }
 
@@ -245,7 +238,7 @@ public class MainActivity extends BaseActivity implements Listener.VideoListener
 
         int state = item.getState();
         Log.d(TAG, "updateLayout: " + state);
-        updateLayout_button(item);
+        updateLayout_info(item);
         if (state == JCCall.STATE_INIT || state == JCCall.STATE_PENDING) {
             updateLayout_pending(item);
         } else if (state == JCCall.STATE_CONNECTING) {
@@ -255,7 +248,7 @@ public class MainActivity extends BaseActivity implements Listener.VideoListener
         }
     }
 
-    private void updateLayout_button(JCCallItem item) {
+    private void updateLayout_info(JCCallItem item) {
         int state = item.getState();
         if (state == JCCall.STATE_INIT || state == JCCall.STATE_PENDING) {
             if (item.getDirection() == JCCall.DIRECTION_OUT) {
@@ -280,6 +273,7 @@ public class MainActivity extends BaseActivity implements Listener.VideoListener
                 mLocalCanvas.getVideoView().setZOrderMediaOverlay(true);
                 mLocalCanvas.getVideoView().setId(View.generateViewId());
                 mVideoLayout.addView(mLocalCanvas.getVideoView(), 0);
+                mVideoLayout.setVisibility(View.VISIBLE);
             }
         }
     }
@@ -320,9 +314,7 @@ public class MainActivity extends BaseActivity implements Listener.VideoListener
     @Override
     public void onCallItemRemove() {
         Log.d(TAG, "onCallItemRemove: ");
-        stopTimeoutTimer();
-        stopTalkingTimer();
-        refreshView(20);
+        videoEndStep1();
     }
 
     /*动态申请权限*/
@@ -419,21 +411,31 @@ public class MainActivity extends BaseActivity implements Listener.VideoListener
         }
     }
 
-    private void actionWithFinish() {
-        if (mMediaPlayerUtils != null) {
-            mMediaPlayerUtils.playSound(this, R.raw.video_cancel, false);
-        }
-        finish();
-    }
-
     private void showToast(String content) {
         Toast t = Toast.makeText(getApplicationContext(), content, Toast.LENGTH_SHORT);
         t.show();
     }
 
-    private void clickCancelButton() {
+    private void videoEndStep1() {
+        stopTimeoutTimer();
+        stopTalkingTimer();
+        if (mMediaPlayerUtils != null) {
+            mMediaPlayerUtils.stopSound();
+        }
         refreshView(20);
-        //mVideoManager.hangup();
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                videoEndStep2();
+            }
+        }, 3000);
+    }
+
+    private void videoEndStep2() {
+        if (mMediaPlayerUtils != null) {
+            mMediaPlayerUtils.playSound(this, R.raw.video_cancel, false);
+        }
+        finish();
     }
 
     @Override

app/src/main/java/com/sikey/skvideo/manager/DataManager.java

@@ -9,7 +9,8 @@ public class DataManager {
 
     public static String getVideoUserId(Context context) {
         if (Macros.DEBUG) {
-            return "TK_QjZ0vC1tBa";
+            return "TK_1ONFZ8pNwa";
+            //return "TK_QjZ0vC1tBa";
         }
         return Settings.Global.getString(context.getContentResolver(), "sk_tk");
     }