From 20fb2c0361d8cd3faf8d3d4c8af9521889b730eb Mon Sep 17 00:00:00 2001
From: shuyu <359369982@qq.com>
Date: Sun, 10 Sep 2017 23:11:40 +0800
Subject: [PATCH] =?UTF-8?q?update=20demo(2017-09-10=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gsyvideoplayer/DetailControlActivity.java | 35 ++++++++++++++-----
 .../res/layout/activity_detail_control.xml    |  9 +++++
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/example/gsyvideoplayer/DetailControlActivity.java b/app/src/main/java/com/example/gsyvideoplayer/DetailControlActivity.java
index 6026fa6..528cfa1 100644
--- a/app/src/main/java/com/example/gsyvideoplayer/DetailControlActivity.java
+++ b/app/src/main/java/com/example/gsyvideoplayer/DetailControlActivity.java
@@ -1,6 +1,5 @@
 package com.example.gsyvideoplayer;
 
-import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.support.v4.widget.NestedScrollView;
@@ -11,18 +10,13 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 
 import com.example.gsyvideoplayer.listener.SampleListener;
-import com.example.gsyvideoplayer.model.SwitchVideoModel;
+import com.example.gsyvideoplayer.utils.JumpUtils;
 import com.example.gsyvideoplayer.video.SampleControlVideo;
-import com.example.gsyvideoplayer.video.SampleVideo;
 import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder;
 import com.shuyu.gsyvideoplayer.listener.LockClickListener;
-import com.shuyu.gsyvideoplayer.utils.GSYVideoType;
 import com.shuyu.gsyvideoplayer.utils.OrientationUtils;
 import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer;
-import com.shuyu.gsyvideoplayer.video.base.GSYVideoPlayer;
 
-import java.util.ArrayList;
-import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -48,6 +42,10 @@ public class DetailControlActivity extends AppCompatActivity {
     Button changeSpeed;
 
 
+    @BindView(R.id.jump)
+    Button jump;
+
+
     private boolean isPlay;
     private boolean isPause;
 
@@ -102,6 +100,8 @@ public class DetailControlActivity extends AppCompatActivity {
                             orientationUtils.backToProtVideo();
                         }
                     }
+
+
                 })
                 .build(detailPlayer);
 
@@ -133,6 +133,14 @@ public class DetailControlActivity extends AppCompatActivity {
             }
         });
 
+
+        jump.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                JumpUtils.gotoControl(DetailControlActivity.this);
+                //startActivity(new Intent(DetailControlActivity.this, MainActivity.class));
+            }
+        });
     }
 
     @Override
@@ -151,12 +159,14 @@ public class DetailControlActivity extends AppCompatActivity {
 
     @Override
     protected void onPause() {
+        getCurPlay().onVideoPause();
         super.onPause();
         isPause = true;
     }
 
     @Override
     protected void onResume() {
+        getCurPlay().onVideoResume();
         super.onResume();
         isPause = false;
     }
@@ -164,7 +174,9 @@ public class DetailControlActivity extends AppCompatActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        GSYVideoPlayer.releaseAllVideos();
+        if (isPlay) {
+            getCurPlay().release();
+        }
         //GSYPreViewManager.instance().releaseMediaPlayer();
         if (orientationUtils != null)
             orientationUtils.releaseListener();
@@ -179,13 +191,18 @@ public class DetailControlActivity extends AppCompatActivity {
         }
     }
 
-
     private void resolveNormalVideoUI() {
         //增加title
         detailPlayer.getTitleTextView().setVisibility(View.GONE);
         detailPlayer.getBackButton().setVisibility(View.GONE);
     }
 
+    private SampleControlVideo getCurPlay() {
+        if (detailPlayer.getFullWindowPlayer() != null) {
+            return (SampleControlVideo) detailPlayer.getFullWindowPlayer();
+        }
+        return detailPlayer;
+    }
 
     /**
      * 显示比例
diff --git a/app/src/main/res/layout/activity_detail_control.xml b/app/src/main/res/layout/activity_detail_control.xml
index 150d589..fdd0446 100644
--- a/app/src/main/res/layout/activity_detail_control.xml
+++ b/app/src/main/res/layout/activity_detail_control.xml
@@ -46,6 +46,15 @@
             android:layout_margin="10dp"
             android:text="播放速度：1" />
 
+
+        <Button
+            android:id="@+id/jump"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:layout_toRightOf="@+id/change_speed"
+            android:text="跳转" />
+
     </RelativeLayout>
 
 </RelativeLayout>
-- 
GitLab