update support #3128 pass MotionEvent

app/src/main/java/com/example/gsyvideoplayer/video/EmptyControlVideo.java

@@ -2,6 +2,7 @@ package com.example.gsyvideoplayer.video;
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.view.MotionEvent;
 
 import com.example.gsyvideoplayer.R;
 import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer;
@@ -44,7 +45,7 @@ public class EmptyControlVideo extends StandardGSYVideoPlayer {
     }
 
     @Override
-    protected void touchDoubleUp() {
+    protected void touchDoubleUp(MotionEvent e) {
         //super.touchDoubleUp();
         //不需要双击暂停
     }

app/src/main/java/com/example/gsyvideoplayer/video/LandLayoutVideo.java

@@ -47,14 +47,14 @@ public class LandLayoutVideo extends StandardGSYVideoPlayer {
                 gestureDetector = new GestureDetector(getContext().getApplicationContext(), new GestureDetector.SimpleOnGestureListener() {
                     @Override
                     public boolean onDoubleTap(MotionEvent e) {
-                        touchDoubleUp();
+                        touchDoubleUp(e);
                         return super.onDoubleTap(e);
                     }
 
                     @Override
                     public boolean onSingleTapConfirmed(MotionEvent e) {
                         if (!mChangePosition && !mChangeVolume && !mBrightness) {
-                            onClickUiToggle();
+                            onClickUiToggle(e);
                         }
                         return super.onSingleTapConfirmed(e);
                     }

app/src/main/java/com/example/gsyvideoplayer/video/SampleCoverVideo.java

@@ -3,6 +3,7 @@ package com.example.gsyvideoplayer.video;
 import android.content.Context;
 import android.graphics.Point;
 import android.util.AttributeSet;
+import android.view.MotionEvent;
 import android.view.Surface;
 import android.view.View;
 import android.view.ViewGroup;
@@ -192,13 +193,13 @@ public class SampleCoverVideo extends StandardGSYVideoPlayer {
     protected boolean byStartedClick;
 
     @Override
-    protected void onClickUiToggle() {
+    protected void onClickUiToggle(MotionEvent e) {
         if (mIfCurrentIsFullscreen && mLockCurScreen && mNeedLockFull) {
             setViewShowState(mLockScreen, VISIBLE);
             return;
         }
         byStartedClick = true;
-        super.onClickUiToggle();
+        super.onClickUiToggle(e);
 
     }
 

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

@@ -3,6 +3,7 @@ package com.shuyu.gsyvideoplayer.video;
 import android.content.Context;
 import android.graphics.Color;
 import android.util.AttributeSet;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
@@ -127,7 +128,7 @@ public class GSYADVideoPlayer extends StandardGSYVideoPlayer {
      * 广告期间不需要双击
      */
     @Override
-    protected void touchDoubleUp() {
+    protected void touchDoubleUp(MotionEvent e) {
     }
 
     /**

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

@@ -3,6 +3,7 @@ package com.shuyu.gsyvideoplayer.video;
 import android.content.Context;
 import android.graphics.Color;
 import android.util.AttributeSet;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -165,11 +166,11 @@ public class GSYSampleADVideoPlayer extends ListGSYVideoPlayer {
      * 广告期间不需要双击
      */
     @Override
-    protected void touchDoubleUp() {
+    protected void touchDoubleUp(MotionEvent e) {
         if (isAdModel) {
             return;
         }
-        super.touchDoubleUp();
+        super.touchDoubleUp(e);
     }
 
     /**

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

@@ -8,6 +8,7 @@ import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
@@ -377,7 +378,7 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer {
      * 点击触摸显示和隐藏逻辑
      */
     @Override
-    protected void onClickUiToggle() {
+    protected void onClickUiToggle(MotionEvent e) {
         if (mIfCurrentIsFullscreen && mLockCurScreen && mNeedLockFull) {
             setViewShowState(mLockScreen, VISIBLE);
             return;

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/video/base/GSYBaseVideoPlayer.java

@@ -788,7 +788,7 @@ public abstract class GSYBaseVideoPlayer extends GSYVideoControlView {
 
             gsyVideoPlayer.addTextureView();
             //隐藏掉所有的弹出状态哟
-            gsyVideoPlayer.onClickUiToggle();
+            gsyVideoPlayer.onClickUiToggle(null);
             gsyVideoPlayer.setVideoAllCallBack(mVideoAllCallBack);
             gsyVideoPlayer.setSmallVideoTextureView(new SmallVideoTouch(gsyVideoPlayer, marginLeft, marginTop));
 

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/video/base/GSYVideoControlView.java

@@ -409,7 +409,7 @@ public abstract class GSYVideoControlView extends GSYVideoView implements View.O
                 }
                 startPlayLogic();
             } else if (mCurrentState == CURRENT_STATE_AUTO_COMPLETE) {
-                onClickUiToggle();
+                onClickUiToggle(null);
             }
         } else if (i == R.id.surface_container) {
             if (mVideoAllCallBack != null && isCurrentMediaListener()) {
@@ -431,14 +431,14 @@ public abstract class GSYVideoControlView extends GSYVideoView implements View.O
     protected GestureDetector gestureDetector = new GestureDetector(getContext().getApplicationContext(), new GestureDetector.SimpleOnGestureListener() {
         @Override
         public boolean onDoubleTap(MotionEvent e) {
-            touchDoubleUp();
+            touchDoubleUp(e);
             return super.onDoubleTap(e);
         }
 
         @Override
         public boolean onSingleTapConfirmed(MotionEvent e) {
             if (!mChangePosition && !mChangeVolume && !mBrightness) {
-                onClickUiToggle();
+                onClickUiToggle(e);
             }
             return super.onSingleTapConfirmed(e);
         }
@@ -461,7 +461,7 @@ public abstract class GSYVideoControlView extends GSYVideoView implements View.O
         float y = event.getY();
 
         if (mIfCurrentIsFullscreen && mLockCurScreen && mNeedLockFull) {
-            onClickUiToggle();
+            onClickUiToggle(event);
             startDismissControlViewTimer();
             return true;
         }
@@ -794,7 +794,7 @@ public abstract class GSYVideoControlView extends GSYVideoView implements View.O
      * 双击暂停/播放
      * 如果不需要，重载为空方法即可
      */
-    protected void touchDoubleUp() {
+    protected void touchDoubleUp(MotionEvent e) {
         if (!mHadPlay) {
             return;
         }
@@ -1118,7 +1118,11 @@ public abstract class GSYVideoControlView extends GSYVideoView implements View.O
 
     protected abstract void dismissBrightnessDialog();
 
-    protected abstract void onClickUiToggle();
+    /**
+     * @param  e MotionEvent 存在 null 的情况，外部使用需要判空
+     *           null 时说明不是手动触发而是自动触发的
+     * */
+    protected abstract void onClickUiToggle(MotionEvent e);
 
     protected abstract void hideAllWidget();
 

gsyVideoPlayer/build.gradle

@@ -35,7 +35,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    //api project(':gsyVideoPlayer-java')
+    api project(':gsyVideoPlayer-java')
     api project(':gsyVideoPlayer-exo_player2')
     //api project(':gsyVideoPlayer-armv5')
     //api project(':gsyVideoPlayer-armv7a')
@@ -44,11 +44,11 @@ dependencies {
     //api project(':gsyVideoPlayer-x86_64')
 
     //更多配置版so，增加了concat,rtsp,mpeg，crypto
-    //api project(':gsyVideoPlayer-ex_so')
+    api project(':gsyVideoPlayer-ex_so')
 
     //api "com.shuyu:GSYVideoPlayer:$gsyVideoVersion"
 
-    api "com.shuyu:gsyVideoPlayer-java:$gsyVideoVersion"
+    //api "com.shuyu:gsyVideoPlayer-java:$gsyVideoVersion"
     //api "com.shuyu:GSYVideoPlayer-exo2:$gsyVideoVersion"
     //api "com.shuyu:gsyVideoPlayer-armv5:$gsyVideoVersion"
     //api "com.shuyu:gsyVideoPlayer-armv7a:$gsyVideoVersion"
@@ -57,7 +57,7 @@ dependencies {
     //api "com.shuyu:gsyVideoPlayer-x86:$gsyVideoVersion"
 
     //更多配置版so，增加了concat,rtsp,mpeg，crypto
-    api "com.shuyu:gsyVideoPlayer-ex_so:$gsyVideoVersion"
+    //api "com.shuyu:gsyVideoPlayer-ex_so:$gsyVideoVersion"
 
 }