diff --git a/README.md b/README.md index 0760bd6dcfb6f9c4d2c9de00a186d2ee0bc94215..7b4f8783cf27083d0d5eae2ce1fec34d4f49537f 100644 --- a/README.md +++ b/README.md @@ -52,21 +52,21 @@ #### A、直接引入 ``` //完整版引入 -compile 'com.shuyu:GSYVideoPlayer:4.0.0' +compile 'com.shuyu:GSYVideoPlayer:4.0.0-beat1' ``` #### B、添加java和你想要的so支持： ``` -compile 'com.shuyu:gsyVideoPlayer-java:4.0.0' +compile 'com.shuyu:gsyVideoPlayer-java:4.0.0-beat1' //根据你的需求 -compile 'com.shuyu:gsyVideoPlayer-armv5:4.0.0' -compile 'com.shuyu:gsyVideoPlayer-armv7a:4.0.0' -compile 'com.shuyu:gsyVideoPlayer-arm64:4.0.0' -compile 'com.shuyu:gsyVideoPlayer-x64:4.0.0' -compile 'com.shuyu:gsyVideoPlayer-x86:4.0.0' +compile 'com.shuyu:gsyVideoPlayer-armv5:4.0.0-beat1' +compile 'com.shuyu:gsyVideoPlayer-armv7a:4.0.0-beat1' +compile 'com.shuyu:gsyVideoPlayer-arm64:4.0.0-beat1' +compile 'com.shuyu:gsyVideoPlayer-x64:4.0.0-beat1' +compile 'com.shuyu:gsyVideoPlayer-x86:4.0.0-beat1' ``` @@ -76,9 +76,9 @@ A、B普通版本支持263/264/265等，对于mpeg编码会有声音无画面情 C 引入的so支持mpeg编码和其他补充协议，但是so包相对变大。 ``` -compile 'com.shuyu:gsyVideoPlayer-java:4.0.0' +compile 'com.shuyu:gsyVideoPlayer-java:4.0.0-beat1' -compile 'com.shuyu:gsyVideoPlayer-ex_so:4.0.0' +compile 'com.shuyu:gsyVideoPlayer-ex_so:4.0.0-beat1' ``` @@ -129,7 +129,7 @@ compile 'com.shuyu:gsyVideoPlayer-ex_so:4.0.0' ## 五、近期版本 -### 4.0.0（2018-xx-xx） +### 4.0.0-beat1（2018-02-06） * 1、新增简单片头广告支持。 `GSYSampleADVideoPlayer 与 DetailADPlayer` * 2、优化了ListGSYVideoPlayer、增加`playNext()`接口。 diff --git a/UPDATE_VERSION.md b/UPDATE_VERSION.md index 0e1297d3b2249ca32a53b9c189c24adcd362b57a..acc80d4ac2e5f4bb7f6522e0566492a3a4e9f136 100644 --- a/UPDATE_VERSION.md +++ b/UPDATE_VERSION.md @@ -1,5 +1,28 @@ ## 下方个版本说明，可以当做简单的wiki使用~，效果可参考DEMO。 +### 4.0.0-beat1（2018-02-06） +* 1、新增简单片头广告支持。 +`GSYSampleADVideoPlayer 与 DetailADPlayer` +* 2、优化了ListGSYVideoPlayer、增加`playNext()`接口。 +* 3、优化代码结构，调整部分API接口（稍微调整下，偶尔有和旧版本不兼容的，参考源码和demo修改下方法名即可）。 +* 4、增加GSYVideoHelper视频帮助类，更加节省资源。 +* 5、增加GSYSampleCallBack节省继承，优化GSYVideoProgressListener的回调。 +* 6、增加GSYVideoViewBridge、重载`getGSYVideoManager()`方法实现自己的Manager。 +* 7、支持自定义渲染层，demo中`CustomRenderVideoPlayer`演示如何设置自定义渲染层。 +* 8、`ListMultiVideoActivity`和`MultiSampleVideo`演示如何同时播放多个视频。 +* 9、`DetailADPlayer2`和`ListADVideoActivity`演示广告与中间插入广告支持。 +* 10、增加音频焦点方法。 +``` +/** + * 长时间失去音频焦点，暂停播放器 + * + * @param releaseWhenLossAudio 默认true，false的时候只会暂停 + */ + public void setReleaseWhenLossAudio(boolean releaseWhenLossAudio) + +``` + + ### 3.0.0（2018-01-14） 1、增肌PlayerManager，更新为ExoPlayer2，优化对ExoPlayer2的支持。 diff --git a/dependencies.gradle b/dependencies.gradle index 2bb9984509c3efff4adf507d176d55034a1e4d33..40bb7a27caa01c9f196885cd274d27769e2106b9 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -23,12 +23,11 @@ ext { floatWindow = '1.0.6' //DataLibraries - videocache = '2.1.1' leakcanary = '1.5' imageLoader = '4.0.0' - gsyVideoVersion = '3.0.0' + gsyVideoVersion = '4.0.0-beat1' exo_player2 = '2.6.1' @@ -64,7 +63,7 @@ ext { ] dataDependencies = [ - videocache: "com.shuyu:gsyvideoplayer-androidvideocache:${videocache}", + videocache: "com.shuyu:gsyvideoplayer-androidvideocache:${gsyVideoVersion}", leakcanary: "com.squareup.leakcanary:leakcanary-android:${leakcanary}", ] } diff --git a/dependencies.md b/dependencies.md index 7ae827373e0d141ec2d26d58c641e4dc774d319e..3759c8d184a76d880973f3c17f26dcc3f96ba7ef 100644 --- a/dependencies.md +++ b/dependencies.md @@ -7,21 +7,21 @@ #### A、直接引入 ``` //完整版引入 -compile 'com.shuyu:GSYVideoPlayer:3.0.0' +compile 'com.shuyu:GSYVideoPlayer:4.0.0-beat1' ``` #### B、添加java和你想要的so支持： ``` -compile 'com.shuyu:gsyVideoPlayer-java:3.0.0' +compile 'com.shuyu:gsyVideoPlayer-java:4.0.0-beat1' //根据你的需求 -compile 'com.shuyu:gsyVideoPlayer-armv5:3.0.0' -compile 'com.shuyu:gsyVideoPlayer-armv7a:3.0.0' -compile 'com.shuyu:gsyVideoPlayer-arm64:3.0.0' -compile 'com.shuyu:gsyVideoPlayer-x64:3.0.0' -compile 'com.shuyu:gsyVideoPlayer-x86:3.0.0' +compile 'com.shuyu:gsyVideoPlayer-armv5:4.0.0-beat1' +compile 'com.shuyu:gsyVideoPlayer-armv7a:4.0.0-beat1' +compile 'com.shuyu:gsyVideoPlayer-arm64:4.0.0-beat1' +compile 'com.shuyu:gsyVideoPlayer-x64:4.0.0-beat1' +compile 'com.shuyu:gsyVideoPlayer-x86:4.0.0-beat1' ``` @@ -31,9 +31,9 @@ A、B普通版本支持263/264/265等，对于mpeg编码会有声音无画面情 C 引入的so支持mpeg编码和其他补充协议，但是so包相对变大。 ``` -compile 'com.shuyu:gsyVideoPlayer-java:3.0.0' +compile 'com.shuyu:gsyVideoPlayer-java:4.0.0-beat1' -compile 'com.shuyu:gsyVideoPlayer-ex_so:3.0.0' +compile 'com.shuyu:gsyVideoPlayer-ex_so:4.0.0-beat1' ``` @@ -49,7 +49,7 @@ compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.8.4' -------------------------------------------------------------------------------- -### 2、JitPack引入方法 (3.0.0开始目前不支持) +### 2、JitPack引入方法 (4.0.0-beat1开始目前不支持) #### First、在project下的build.gradle添加 ``` @@ -68,7 +68,7 @@ allprojects { #### A、直接引入 ``` //完整版引入 -compile 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v3.0.0' +compile 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v4.0.0-beat1' ``` @@ -76,14 +76,14 @@ compile 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v3.0.0' ``` -compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-java:v3.0.0' +compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-java:v4.0.0-beat1' //根据你的需求 -compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-x64:v3.0.0' -compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-x86:v3.0.0' -compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-arm64:v3.0.0' -compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-armv5:v3.0.0' -compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-armv7a:v3.0.0' +compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-x64:v4.0.0-beat1' +compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-x86:v4.0.0-beat1' +compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-arm64:v4.0.0-beat1' +compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-armv5:v4.0.0-beat1' +compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-armv7a:v4.0.0-beat1' ``` @@ -93,8 +93,8 @@ A、B普通版本支持263/264/265等，对于mpeg编码会有声音无画面情 C 方法引入的so支持mpeg编码和其他补充协议，但是so包相对变大。 ``` -compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-java:v3.0.0' +compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-java:v4.0.0-beat1' -compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-ex_so:v3.0.0' +compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-ex_so:v4.0.0-beat1' ``` diff --git a/gradle.properties b/gradle.properties index a11d3a7f3d583403f54e3d2ee5634ee862aceaac..11867d51e3860baebf83f920c38259e36f429a8e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ org.gradle.jvmargs=-Xmx1536m BINTRAY_USER=carguo BINTRAY_KEY= PROJ_GROUP=com.shuyu -PROJ_VERSION=3.0.0 +PROJ_VERSION=4.0.0-beat1 PROJ_WEBSITEURL=https://github.com/CarGuo/GSYVideoPlayer PROJ_ISSUETRACKERURL= PROJ_VCSURL=git@github.com:CarGuo/GSYVideoPlayer.git diff --git a/gsyVideoPlayer-java/build.gradle b/gsyVideoPlayer-java/build.gradle index 45456d91a6f400f2374b9215015df885811cefd7..0e4b0892131cf02ed67dd64c15da0d57157a350e 100644 --- a/gsyVideoPlayer-java/build.gradle +++ b/gsyVideoPlayer-java/build.gradle @@ -37,9 +37,9 @@ dependencies { api viewDependencies.ijkplayer_java api viewDependencies.ijkplayer_exo api viewDependencies.transitionseverywhere - //api dataDependencies.videocache + api dataDependencies.videocache api "com.shuyu:GSYVideoPlayer-exo2:$gsyVideoVersion" - api project(':gsyvideoplayer-androidvideocache') + //api project(':gsyvideoplayer-androidvideocache') //api project(':gsyvideoplayer-exo2') diff --git a/gsyVideoPlayer/build.gradle b/gsyVideoPlayer/build.gradle index fcaae0f0b0571b936257ad4bc2497e1c61d67cc4..7568b8fbd236f6c7f5ef832559720411ebc52d4e 100644 --- a/gsyVideoPlayer/build.gradle +++ b/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') @@ -41,8 +41,9 @@ dependencies { //更多配置版so，增加了concat,rtsp,mpeg，crypto //api project(':gsyVideoPlayer-ex_so') - //api "com.shuyu:gsyVideoPlayer-java:$gsyVideoVersion" + api "com.shuyu:GSYVideoPlayer:$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" @@ -50,7 +51,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" //compile fileTree(dir: 'libs', include: ['*.jar'])