From 478507794b434ad080f93b3c4b2f74e58f8cac69 Mon Sep 17 00:00:00 2001
From: shuyu <359369982@qq.com>
Date: Thu, 31 May 2018 23:17:38 +0800
Subject: [PATCH] update ad list

---
 .../gsyvideoplayer/ListADVideoActivity.java    |  7 ++++++-
 .../video/ListADVideoPlayer.java               | 18 +++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/example/gsyvideoplayer/ListADVideoActivity.java b/app/src/main/java/com/example/gsyvideoplayer/ListADVideoActivity.java
index b9a5381..3c5ccc5 100644
--- a/app/src/main/java/com/example/gsyvideoplayer/ListADVideoActivity.java
+++ b/app/src/main/java/com/example/gsyvideoplayer/ListADVideoActivity.java
@@ -257,8 +257,13 @@ public class ListADVideoActivity extends AppCompatActivity {
                     holder.adVideoPlayer.getCurrentPlayer().release();
                     holder.adVideoPlayer.onVideoReset();
                     holder.adVideoPlayer.setVisibility(View.GONE);
+
                     //开始播放原视频，根据是否处于全屏状态判断
-                    holder.gsyVideoPlayer.getCurrentPlayer().startAfterPrepared();
+                    int playPosition = holder.gsyVideoPlayer.getGSYVideoManager().getPlayPosition();
+                    if (position == playPosition) {
+                        holder.gsyVideoPlayer.getCurrentPlayer().startAfterPrepared();
+                    }
+
                     if (holder.adVideoPlayer.getCurrentPlayer().isIfCurrentIsFullscreen()) {
                         holder.adVideoPlayer.removeFullWindowViewOnly();
                         if (!holder.gsyVideoPlayer.getCurrentPlayer().isIfCurrentIsFullscreen()) {
diff --git a/app/src/main/java/com/example/gsyvideoplayer/video/ListADVideoPlayer.java b/app/src/main/java/com/example/gsyvideoplayer/video/ListADVideoPlayer.java
index ae553eb..5b4b031 100644
--- a/app/src/main/java/com/example/gsyvideoplayer/video/ListADVideoPlayer.java
+++ b/app/src/main/java/com/example/gsyvideoplayer/video/ListADVideoPlayer.java
@@ -3,6 +3,8 @@ package com.example.gsyvideoplayer.video;
 import android.content.Context;
 import android.util.AttributeSet;
 
+import com.shuyu.gsyvideoplayer.listener.GSYMediaPlayerListener;
+import com.shuyu.gsyvideoplayer.utils.Debuger;
 import com.shuyu.gsyvideoplayer.video.GSYADVideoPlayer;
 
 public class ListADVideoPlayer extends GSYADVideoPlayer {
@@ -21,10 +23,20 @@ public class ListADVideoPlayer extends GSYADVideoPlayer {
 
     @Override
     protected void startPrepare() {
-        if (getGSYVideoManager().listener() != null) {
-            getGSYVideoManager().listener().onAutoCompletion();
-        }
+        GSYMediaPlayerListener listener = getGSYVideoManager().listener();
         super.startPrepare();
+        if (listener != null) {
+            listener.onAutoCompletion();
+        }
+    }
+
+    @Override
+    public void onAutoCompletion() {
+        super.onAutoCompletion();
+        if (!isCurrentMediaListener() && mVideoAllCallBack != null) {
+            Debuger.printfLog("onAutoComplete");
+            mVideoAllCallBack.onAutoComplete(mOriginUrl, mTitle, this);
+        }
     }
 
     @Override
-- 
GitLab