Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/example/gsyvideoplayer/DetailControlActivity.java
#	app/src/main/java/com/example/gsyvideoplayer/DetailFilterActivity.java

README.md

@@ -129,6 +129,9 @@ compile 'com.shuyu:gsyVideoPlayer-ex_so:4.1.2'
 
 ## 五、近期版本
 
+### 4.1.3(2018-xx-xx 未发布)
+* 优化单双击
+
 ### 4.1.2(2018-04-14)
 * 修复已知问题。
 * 增加ijkplayer的raw播放支持。

RECORD.md

+1、未加载成功的跳转暂停和释放问题
+
+2、单双击问题 https://github.com/CarGuo/GSYVideoPlayer/issues/402
+
+3、android7.0 先开启网易云音乐后台播放音乐 再打开 demo中detailplayer 进行全屏小屏切换 con全屏切换到小屏时 出现视频声音和后台音乐一起播放

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

@@ -418,6 +418,14 @@ public abstract class GSYVideoControlView extends GSYVideoView implements View.O
             touchDoubleUp();
             return super.onDoubleTap(e);
         }
+
+        @Override
+        public boolean onSingleTapConfirmed(MotionEvent e) {
+            if (!mChangePosition && !mChangeVolume && !mBrightness) {
+                onClickUiToggle();
+            }
+            return super.onSingleTapConfirmed(e);
+        }
     });
 
     /**
@@ -701,9 +709,6 @@ public abstract class GSYVideoControlView extends GSYVideoView implements View.O
             if (mBottomProgressBar != null)
                 mBottomProgressBar.setProgress(progress);
         }
-        if (!mChangePosition && !mChangeVolume && !mBrightness) {
-            onClickUiToggle();
-        }
 
         mTouchingProgressBar = false;
         dismissProgressDialog();

gsyVideoPlayer/build.gradle

@@ -31,7 +31,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    //api project(':gsyVideoPlayer-java')
+    api project(':gsyVideoPlayer-java')
     //api project(':gsyVideoPlayer-armv5')
     //api project(':gsyVideoPlayer-armv7a')
     //api project(':gsyVideoPlayer-armv64')
@@ -43,7 +43,7 @@ dependencies {
 
     //api "com.shuyu:GSYVideoPlayer:$gsyVideoVersion"
 
-    api "com.shuyu:gsyVideoPlayer-java:$gsyVideoVersion"
+    //api "com.shuyu:gsyVideoPlayer-java:$gsyVideoVersion"
     api "com.shuyu:gsyVideoPlayer-armv5:$gsyVideoVersion"
     api "com.shuyu:gsyVideoPlayer-armv7a:$gsyVideoVersion"
     api "com.shuyu:gsyVideoPlayer-arm64:$gsyVideoVersion"