From 228a5e10fa727f1e664e1bfcb2255ae477f4acf7 Mon Sep 17 00:00:00 2001
From: guoshuyu <guoshuyu@ygsoft.com>
Date: Mon, 5 Feb 2018 14:38:49 +0800
Subject: [PATCH] fix ad

---
 .../example/gsyvideoplayer/DetailADPlayer2.java |  7 +++++++
 .../gsyvideoplayer/GSYBaseADActivityDetail.java | 17 +++++++++++++++--
 .../gsyvideoplayer/video/GSYADVideoPlayer.java  |  2 +-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/example/gsyvideoplayer/DetailADPlayer2.java b/app/src/main/java/com/example/gsyvideoplayer/DetailADPlayer2.java
index 3cac4c1..af69952 100644
--- a/app/src/main/java/com/example/gsyvideoplayer/DetailADPlayer2.java
+++ b/app/src/main/java/com/example/gsyvideoplayer/DetailADPlayer2.java
@@ -54,6 +54,7 @@ public class DetailADPlayer2 extends GSYBaseADActivityDetail<NormalGSYVideoPlaye
             private int preSecond = 0;
             @Override
             public void onProgress(int progress, int secProgress, int currentPosition, int duration) {
+                //在5秒的时候弹出中间广告
                 int currentSecond = currentPosition / 1000;
                 if (currentSecond == 5 && currentSecond != preSecond) {
                     detailPlayer.getCurrentPlayer().onVideoPause();
@@ -98,6 +99,9 @@ public class DetailADPlayer2 extends GSYBaseADActivityDetail<NormalGSYVideoPlaye
 
     }
 
+    /**
+     * 需要片头广告
+     */
     @Override
     public boolean isNeedAdOnStart() {
         return true;
@@ -121,6 +125,9 @@ public class DetailADPlayer2 extends GSYBaseADActivityDetail<NormalGSYVideoPlaye
         gsyVideoPlayer.getBackButton().setVisibility(View.GONE);
     }
 
+    /**
+     * 公用的视频配置
+     */
     private GSYVideoOptionBuilder getCommonBuilder() {
         return new GSYVideoOptionBuilder()
                 .setCacheWithPlay(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 ad34020..eba69e0 100644
--- a/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/GSYBaseADActivityDetail.java
+++ b/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/GSYBaseADActivityDetail.java
@@ -64,10 +64,12 @@ public abstract class GSYBaseADActivityDetail<T extends GSYBaseVideoPlayer, R ex
 
                     @Override
                     public void onAutoComplete(String url, Object... objects) {
+                        //广告结束，释放
                         getGSYADVideoPlayer().release();
                         getGSYADVideoPlayer().onVideoReset();
                         getGSYADVideoPlayer().setVisibility(View.GONE);
                         isAdPlayed = false;
+                        //开始播放原视频，根据是否处于全屏状态判断
                         getGSYVideoPlayer().getCurrentPlayer().startAfterPrepared();
                         if (getGSYADVideoPlayer().getCurrentPlayer().isIfCurrentIsFullscreen()) {
                             getGSYADVideoPlayer().removeFullWindowViewOnly();
@@ -80,6 +82,7 @@ public abstract class GSYBaseADActivityDetail<T extends GSYBaseVideoPlayer, R ex
 
                     @Override
                     public void onQuitFullscreen(String url, Object... objects) {
+                        //退出全屏逻辑
                         if (mADOrientationUtils != null) {
                             mADOrientationUtils.backToProtVideo();
                         }
@@ -92,7 +95,9 @@ public abstract class GSYBaseADActivityDetail<T extends GSYBaseVideoPlayer, R ex
                 .build(getGSYADVideoPlayer());
     }
 
-
+    /**
+     * 正常视频内容的全屏显示
+     */
     @Override
     public void showFull() {
         if (orientationUtils.getIsLand() != 1) {
@@ -173,6 +178,9 @@ public abstract class GSYBaseADActivityDetail<T extends GSYBaseVideoPlayer, R ex
 
     }
 
+    /**
+     * 显示播放广告
+     */
     public void startAdPlay() {
         getGSYADVideoPlayer().setVisibility(View.VISIBLE);
         getGSYADVideoPlayer().startPlayLogic();
@@ -182,6 +190,9 @@ public abstract class GSYBaseADActivityDetail<T extends GSYBaseVideoPlayer, R ex
         }
     }
 
+    /**
+     * 广告视频的全屏显示
+     */
     public void showADFull() {
         if (mADOrientationUtils.getIsLand() != 1) {
             mADOrientationUtils.resolveByClick();
@@ -196,6 +207,8 @@ public abstract class GSYBaseADActivityDetail<T extends GSYBaseVideoPlayer, R ex
      */
     public abstract GSYVideoOptionBuilder getGSYADVideoOptionBuilder();
 
-
+    /**
+     * 是否播放开始广告
+     */
     public abstract boolean isNeedAdOnStart();
 }
diff --git a/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/video/GSYADVideoPlayer.java b/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/video/GSYADVideoPlayer.java
index cadaae5..6b8ab84 100644
--- a/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/video/GSYADVideoPlayer.java
+++ b/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/video/GSYADVideoPlayer.java
@@ -237,7 +237,7 @@ public class GSYADVideoPlayer extends StandardGSYVideoPlayer {
     }
 
     /**
-     * 移除没用的
+     * 移除广告播放的全屏
      */
     public void removeFullWindowViewOnly() {
         ViewGroup vp = (ViewGroup) (CommonUtil.scanForActivity(getContext())).findViewById(Window.ID_ANDROID_CONTENT);
-- 
GitLab