Merge remote-tracking branch 'origin/master'

crazier9527 · Jun 4, 2018 · edaad70 · edaad70
2 parents ca9e915 + 4785077
commit edaad70
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 2 deletions.
diff --git 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 void onAutoComplete(String url, Object... objects) {
                     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
@@ -0,0 +1,46 @@
+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 {
+
+    public ListADVideoPlayer(Context context, Boolean fullFlag) {
+        super(context, fullFlag);
+    }
+
+    public ListADVideoPlayer(Context context) {
+        super(context);
+    }
+
+    public ListADVideoPlayer(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void startPrepare() {
+        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
+    public void onCompletion() {
+        super.onCompletion();
+    }
+}
diff --git a/app/src/main/res/layout/list_video_item_ad.xml b/app/src/main/res/layout/list_video_item_ad.xml
@@ -9,7 +9,7 @@
         android:layout_height="@dimen/post_media_height" />
 
 
-    <com.shuyu.gsyvideoplayer.video.GSYADVideoPlayer
+    <com.example.gsyvideoplayer.video.ListADVideoPlayer
         android:id="@+id/video_ad_player"
         android:layout_width="match_parent"
         android:layout_height="@dimen/post_media_height"