diff --git a/README.md b/README.md index e1d9ffaa77a4dc976652af0a39e96f1c3bba2eae..bf637eb80f03e626700caad1e6405201fc21e3e8 100644 --- a/README.md +++ b/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 * 调整部分代码路径,优化代码 diff --git a/UPDATE_VERSION.md b/UPDATE_VERSION.md index 6898140d7fa94fc77a080053ad690aa8a5b5768e..5f47f79eafe99970c5e6c3f44f58d140d42c322e 100644 --- a/UPDATE_VERSION.md +++ b/UPDATE_VERSION.md @@ -1,5 +1,14 @@ ## 下方个版本说明,可以当做简单的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 diff --git a/dependencies.gradle b/dependencies.gradle index 0ebbab8edd9d3a7cd9f7ad94ffa4526c5b4f1313..87572fcd1e1024b2936d85a316f738a8d7d478d1 100644 --- a/dependencies.gradle +++ b/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}", diff --git a/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/GSYVideoManager.java b/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/GSYVideoManager.java index 782856d03f1dba02e11a1c0bdc084eaa54218529..8d882bb68734b76b73d8bc9ece7c00f66d7d2105 100644 --- a/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/GSYVideoManager.java +++ b/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) { diff --git a/gsyVideoPlayer/build.gradle b/gsyVideoPlayer/build.gradle index 4bb7a445e644ba58023d70ed051f27aae569e3af..0367e1dc2464e3c97f83fbca913c79bf1021c443 100644 --- a/gsyVideoPlayer/build.gradle +++ b/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"