From ebd0f65d6d16e90fcca9ece845108e64d4b2aeb0 Mon Sep 17 00:00:00 2001
From: guoshuyu <guoshuyu@ygsoft.com>
Date: Mon, 5 Feb 2018 13:43:33 +0800
Subject: [PATCH] fix demo ad

---
 .../example/gsyvideoplayer/DetailADPlayer2.java   | 15 ++++++++++-----
 .../gsyvideoplayer/GSYBaseADActivityDetail.java   | 15 ++++++++-------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/example/gsyvideoplayer/DetailADPlayer2.java b/app/src/main/java/com/example/gsyvideoplayer/DetailADPlayer2.java
index 321d0c6..7d92fed 100644
--- a/app/src/main/java/com/example/gsyvideoplayer/DetailADPlayer2.java
+++ b/app/src/main/java/com/example/gsyvideoplayer/DetailADPlayer2.java
@@ -25,8 +25,6 @@ public class DetailADPlayer2 extends GSYBaseADActivityDetail<NormalGSYVideoPlaye
 
     private String url = "http://9890.vod.myqcloud.com/9890_4e292f9a3dd011e6b4078980237cc3d3.f20.mp4";
 
-    private boolean mHadADMiddle;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -53,12 +51,13 @@ public class DetailADPlayer2 extends GSYBaseADActivityDetail<NormalGSYVideoPlaye
         detailPlayer.setReleaseWhenLossAudio(false);
 
         detailPlayer.setGSYVideoProgressListener(new GSYVideoProgressListener() {
+            private int preSecond = 0;
             @Override
             public void onProgress(int progress, int secProgress, int currentPosition, int duration) {
-                if (currentPosition / 1000 == 5 && !mHadADMiddle) {
-                    mHadADMiddle = true;
+                int currentSecond = currentPosition / 1000;
+                if (currentSecond == 5 && currentSecond != preSecond) {
                     detailPlayer.getCurrentPlayer().onVideoPause();
-                    adPlayer.setUp(urlAd2, false, "");
+                    getGSYADVideoOptionBuilder().setUrl(urlAd2).build(adPlayer);
                     adPlayer.setVisibility(View.VISIBLE);
                     adPlayer.startPlayLogic();
                     if (detailPlayer.getCurrentPlayer().isIfCurrentIsFullscreen()) {
@@ -66,6 +65,7 @@ public class DetailADPlayer2 extends GSYBaseADActivityDetail<NormalGSYVideoPlaye
                         adPlayer.setSaveBeforeFullSystemUiVisibility(getGSYVideoPlayer().getSaveBeforeFullSystemUiVisibility());
                     }
                 }
+                preSecond = currentSecond;
             }
         });
 
@@ -103,6 +103,11 @@ public class DetailADPlayer2 extends GSYBaseADActivityDetail<NormalGSYVideoPlaye
 
     }
 
+    @Override
+    public boolean isNeedAdOnStart() {
+        return true;
+    }
+
     /**
      * 是否启动旋转横屏，true表示启动
      *
diff --git a/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/GSYBaseADActivityDetail.java b/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/GSYBaseADActivityDetail.java
index f2878df..b783880 100644
--- a/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/GSYBaseADActivityDetail.java
+++ b/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/GSYBaseADActivityDetail.java
@@ -68,10 +68,6 @@ public abstract class GSYBaseADActivityDetail<T extends GSYBaseVideoPlayer, R ex
                         getGSYADVideoPlayer().onVideoReset();
                         getGSYADVideoPlayer().setVisibility(View.GONE);
                         isAdPlayed = false;
-                        //todo 如果在全屏下的处理
-                        //todo 中间弹出逻辑处理
-                        //todo 开始缓冲的时候问题
-                        //todo 是否增加一个开始缓冲的回调
                         getGSYVideoPlayer().getCurrentPlayer().startAfterPrepared();
                         if (getGSYADVideoPlayer().getCurrentPlayer().isIfCurrentIsFullscreen()) {
                             getGSYADVideoPlayer().removeFullWindowViewOnly();
@@ -141,7 +137,7 @@ public abstract class GSYBaseADActivityDetail<T extends GSYBaseVideoPlayer, R ex
     public void onConfigurationChanged(Configuration newConfig) {
         //如果旋转了就全屏
         boolean backUpIsPlay = isPlay;
-        if (isAdPlayed && !isPause) {
+        if (isAdPlayed && !isPause && getGSYADVideoPlayer().getVisibility() == View.VISIBLE) {
             if (getGSYADVideoPlayer().getCurrentPlayer().isInPlayingState()) {
                 isPlay = false;
                 getGSYADVideoPlayer().getCurrentPlayer().onConfigurationChanged(this, newConfig, mADOrientationUtils);
@@ -154,13 +150,15 @@ public abstract class GSYBaseADActivityDetail<T extends GSYBaseVideoPlayer, R ex
     @Override
     public void onStartPrepared(String url, Object... objects) {
         super.onStartPrepared(url, objects);
-        getGSYADVideoPlayer().setVisibility(View.VISIBLE);
+        if (isNeedAdOnStart())
+            getGSYADVideoPlayer().setVisibility(View.VISIBLE);
     }
 
     @Override
     public void onPrepared(String url, Object... objects) {
         super.onPrepared(url, objects);
-        getGSYADVideoPlayer().startPlayLogic();
+        if (isNeedAdOnStart())
+            getGSYADVideoPlayer().startPlayLogic();
     }
 
     @Override
@@ -189,4 +187,7 @@ public abstract class GSYBaseADActivityDetail<T extends GSYBaseVideoPlayer, R ex
      * 配置AD播放器
      */
     public abstract GSYVideoOptionBuilder getGSYADVideoOptionBuilder();
+
+
+    public abstract boolean isNeedAdOnStart();
 }
-- 
GitLab