fix ad demo

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/GSYBaseADActivityDetail.java

@@ -15,6 +15,7 @@ import com.shuyu.gsyvideoplayer.video.GSYADVideoPlayer;
 import com.shuyu.gsyvideoplayer.video.NormalGSYVideoPlayer;
 import com.shuyu.gsyvideoplayer.video.base.GSYBaseVideoPlayer;
 import com.shuyu.gsyvideoplayer.video.base.GSYVideoPlayer;
+import com.shuyu.gsyvideoplayer.video.base.GSYVideoView;
 
 /**
  * 详情AD模式播放页面基础类
@@ -24,8 +25,6 @@ public abstract class GSYBaseADActivityDetail<T extends GSYBaseVideoPlayer, R ex
 
     protected OrientationUtils mADOrientationUtils;
 
-    protected boolean isAdPlayed;
-
     @Override
     public void initVideo() {
         super.initVideo();
@@ -57,7 +56,6 @@ public abstract class GSYBaseADActivityDetail<T extends GSYBaseVideoPlayer, R ex
                     @Override
                     public void onStartPrepared(String url, Object... objects) {
                         super.onStartPrepared(url, objects);
-                        isAdPlayed = true;
                         //开始播放了才能旋转和全屏
                         mADOrientationUtils.setEnable(getDetailOrientationRotateAuto());
                     }
@@ -68,7 +66,6 @@ public abstract class GSYBaseADActivityDetail<T extends GSYBaseVideoPlayer, R ex
                         getGSYADVideoPlayer().release();
                         getGSYADVideoPlayer().onVideoReset();
                         getGSYADVideoPlayer().setVisibility(View.GONE);
-                        isAdPlayed = false;
                         //开始播放原视频，根据是否处于全屏状态判断
                         getGSYVideoPlayer().getCurrentPlayer().startAfterPrepared();
                         if (getGSYADVideoPlayer().getCurrentPlayer().isIfCurrentIsFullscreen()) {
@@ -142,8 +139,8 @@ public abstract class GSYBaseADActivityDetail<T extends GSYBaseVideoPlayer, R ex
     public void onConfigurationChanged(Configuration newConfig) {
         //如果旋转了就全屏
         boolean backUpIsPlay = isPlay;
-        if (isAdPlayed && !isPause && getGSYADVideoPlayer().getVisibility() == View.VISIBLE) {
-            if (getGSYADVideoPlayer().getCurrentPlayer().isInPlayingState()) {
+        if (!isPause && getGSYADVideoPlayer().getVisibility() == View.VISIBLE) {
+            if (isADStarted()) {
                 isPlay = false;
                 getGSYADVideoPlayer().getCurrentPlayer().onConfigurationChanged(this, newConfig, mADOrientationUtils);
             }
@@ -178,6 +175,12 @@ public abstract class GSYBaseADActivityDetail<T extends GSYBaseVideoPlayer, R ex
 
     }
 
+    protected boolean isADStarted() {
+        return getGSYADVideoPlayer().getCurrentPlayer().getCurrentState() >= 0 &&
+                getGSYADVideoPlayer().getCurrentPlayer().getCurrentState() != GSYVideoView.CURRENT_STATE_NORMAL
+                && getGSYADVideoPlayer().getCurrentPlayer().getCurrentState() != GSYVideoView.CURRENT_STATE_AUTO_COMPLETE;
+    }
+
     /**
      * 显示播放广告
      */

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/video/GSYADVideoPlayer.java

@@ -110,17 +110,28 @@ public class GSYADVideoPlayer extends StandardGSYVideoPlayer {
         changeAdUIState();
     }
 
+    @Override
+    public void onClick(View v) {
+        if (v.getId() == R.id.start) {
+            if (mCurrentState == CURRENT_STATE_ERROR) {
+                clickStartIcon();
+            }
+        } else {
+            super.onClick(v);
+        }
+    }
+
     @Override
     protected void updateStartImage() {
         if (mStartButton != null) {
             if (mStartButton instanceof ImageView) {
                 ImageView imageView = (ImageView) mStartButton;
                 if (mCurrentState == CURRENT_STATE_PLAYING) {
-                    imageView.setImageResource(R.drawable.video_click_pause_selector);
+                    imageView.setImageResource(R.drawable.empty_drawable);
                 } else if (mCurrentState == CURRENT_STATE_ERROR) {
-                    imageView.setImageResource(R.drawable.video_click_play_selector);
+                    imageView.setImageResource(R.drawable.video_click_error_selector);
                 } else {
-                    imageView.setImageResource(R.drawable.video_click_play_selector);
+                    imageView.setImageResource(R.drawable.empty_drawable);
                 }
             }
         }

gsyVideoPlayer-java/src/main/res/layout/video_layout_ad.xml

@@ -49,6 +49,14 @@
         android:layout_centerVertical="true"
         android:visibility="invisible" />
 
+    <ImageView
+        android:id="@+id/start"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:layout_gravity="center_vertical" />
+
     <TextView
         android:id="@+id/jump_ad"
         android:layout_width="wrap_content"