Merge remote-tracking branch 'origin/dev' into dev

README.md

@@ -111,7 +111,7 @@ compile 'com.shuyu:gsyVideoPlayer-ex_so:2.1.1'
 
 ## 五、近期版本
 
-### 2.1.1(2017-10-xx)
+### 2.1.1(2017-10-29)
 * videoCache模式支持增加header
 * 增加无缝切换视频DEMO SmartPickVideo
 * 调整部分代码路径，优化代码

UPDATE_VERSION.md

 ## 下方个版本说明，可以当做简单的wiki使用~，效果可参考DEMO。
 
+### 2.1.1(2017-10-29)
+* videoCache模式支持增加header
+* 增加无缝切换视频DEMO SmartPickVideo
+* 调整部分代码路径，优化代码
+* log输入等级接口
+```
+GSYVideoManager.instance().setLogLevel(IjkMediaPlayer.IJK_LOG_SILENT);
+```
+
 ### 2.1.0(2017-10-10)
 * 增加了视频帧合成gif功能（DEMO DetailControlActivity中）。
 * update ijkplayer 0.84

dependencies.gradle

@@ -27,7 +27,7 @@ ext {
 
     imageLoader = '4.0.0'
 
-    gsyVideoVersion = '2.1.0'
+    gsyVideoVersion = '2.1.1'
 
     androidDependencies = [
             recyclerView: "com.android.support:recyclerview-v7:${supportLibraryVersion}",

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

@@ -769,14 +769,6 @@ public class GSYVideoManager implements IMediaPlayer.OnPreparedListener, IMediaP
     /**
      * 设置log输入等级
      *
-     * @param logLevel {@link tv.danmaku.ijk.media.player.IjkMediaPlayer#IJK_LOG_DEFAULT}
-     *                 {@link tv.danmaku.ijk.media.player.IjkMediaPlayer#IJK_LOG_VERBOSE}
-     *                 {@link tv.danmaku.ijk.media.player.IjkMediaPlayer#IJK_LOG_DEBUG}
-     *                 {@link tv.danmaku.ijk.media.player.IjkMediaPlayer#IJK_LOG_INFO}
-     *                 {@link tv.danmaku.ijk.media.player.IjkMediaPlayer#IJK_LOG_WARN}
-     *                 {@link tv.danmaku.ijk.media.player.IjkMediaPlayer#IJK_LOG_ERROR}
-     *                 {@link tv.danmaku.ijk.media.player.IjkMediaPlayer#IJK_LOG_FATAL}
-     *                 {@link tv.danmaku.ijk.media.player.IjkMediaPlayer#IJK_LOG_SILENT}
      */
     public void setLogLevel(int logLevel) {
         if (mediaPlayer != null && mediaPlayer instanceof IjkMediaPlayer) {

gsyVideoPlayer/build.gradle

@@ -31,7 +31,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
 
-    compile project(':gsyVideoPlayer-java')
+    //compile project(':gsyVideoPlayer-java')
     //compile project(':gsyVideoPlayer-armv5')
     //compile project(':gsyVideoPlayer-armv7a')
     //compile project(':gsyVideoPlayer-armv64')
@@ -41,7 +41,7 @@ dependencies {
     //更多配置版so，增加了concat,rtsp,mpeg，crypto
     //compile project(':gsyVideoPlayer-ex_so')
 
-    //compile "com.shuyu:gsyVideoPlayer-java:$gsyVideoVersion"
+    compile "com.shuyu:gsyVideoPlayer-java:$gsyVideoVersion"
 
     compile "com.shuyu:gsyVideoPlayer-armv5:$gsyVideoVersion"
     compile "com.shuyu:gsyVideoPlayer-armv7a:$gsyVideoVersion"