From 4fb0c80bd7a907f817aa73c254091e9742525c75 Mon Sep 17 00:00:00 2001 From: shuyu <359369982@qq.com> Date: Sun, 17 Sep 2017 22:15:35 +0800 Subject: [PATCH] =?UTF-8?q?2.0.8=20release=20(2017-09-17=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 34 +++++++++---------- .../gsyvideoplayer/DetailFilterActivity.java | 14 +++++++- dependencies.md | 18 +++++----- gsyVideoPlayer/build.gradle | 26 +++++++------- 4 files changed, 52 insertions(+), 40 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6fec5cd..1dd9fac 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,32 +63,32 @@ dependencies { compile project(':gsyVideoPlayer') //jcenter - //compile 'com.shuyu:GSYVideoPlayer:2.0.7' + //compile 'com.shuyu:GSYVideoPlayer:2.0.8' - //compile 'com.shuyu:gsyVideoPlayer-java:2.0.7' + //compile 'com.shuyu:gsyVideoPlayer-java:2.0.8' - //compile 'com.shuyu:gsyVideoPlayer-armv5:2.0.7' - //compile 'com.shuyu:gsyVideoPlayer-armv7a:2.0.7' - //compile 'com.shuyu:gsyVideoPlayer-arm64:2.0.7' - //compile 'com.shuyu:gsyVideoPlayer-x64:2.0.7' - //compile 'com.shuyu:gsyVideoPlayer-x86:2.0.7' + //compile 'com.shuyu:gsyVideoPlayer-armv5:2.0.8' + //compile 'com.shuyu:gsyVideoPlayer-armv7a:2.0.8' + //compile 'com.shuyu:gsyVideoPlayer-arm64:2.0.8' + //compile 'com.shuyu:gsyVideoPlayer-x64:2.0.8' + //compile 'com.shuyu:gsyVideoPlayer-x86:2.0.8' - //compile 'com.shuyu:gsyVideoPlayer-ex_so:2.0.7' + //compile 'com.shuyu:gsyVideoPlayer-ex_so:2.0.8' //jitpack - //compile 'com.github.CarGuo:GSYVideoPlayer:v2.0.7' + //compile 'com.github.CarGuo:GSYVideoPlayer:v2.0.8' - //compile 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v2.0.7' + //compile 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v2.0.8' - //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-ex_so:v2.0.7' + //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-ex_so:v2.0.8' - //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-java:v2.0.7' - //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-x64:v2.0.7' - //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-x86:v2.0.7' - //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-arm64:v2.0.7' - //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-armv5:v2.0.7' - //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-armv7a:v2.0.7' + //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-java:v2.0.8' + //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-x64:v2.0.8' + //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-x86:v2.0.8' + //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-arm64:v2.0.8' + //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-armv5:v2.0.8' + //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-armv7a:v2.0.8' } diff --git a/app/src/main/java/com/example/gsyvideoplayer/DetailFilterActivity.java b/app/src/main/java/com/example/gsyvideoplayer/DetailFilterActivity.java index af7b6f4..57a2a84 100644 --- a/app/src/main/java/com/example/gsyvideoplayer/DetailFilterActivity.java +++ b/app/src/main/java/com/example/gsyvideoplayer/DetailFilterActivity.java @@ -25,12 +25,15 @@ import com.shuyu.gsyvideoplayer.effect.DocumentaryEffect; import com.shuyu.gsyvideoplayer.effect.DuotoneEffect; import com.shuyu.gsyvideoplayer.effect.FillLightEffect; import com.shuyu.gsyvideoplayer.effect.GammaEffect; +import com.shuyu.gsyvideoplayer.effect.GaussianBlurEffect; import com.shuyu.gsyvideoplayer.effect.GrainEffect; import com.shuyu.gsyvideoplayer.effect.HueEffect; import com.shuyu.gsyvideoplayer.effect.InvertColorsEffect; import com.shuyu.gsyvideoplayer.effect.LamoishEffect; import com.shuyu.gsyvideoplayer.effect.NoEffect; +import com.shuyu.gsyvideoplayer.effect.OverlayEffect; import com.shuyu.gsyvideoplayer.effect.PosterizeEffect; +import com.shuyu.gsyvideoplayer.effect.SampleBlurEffect; import com.shuyu.gsyvideoplayer.effect.SaturationEffect; import com.shuyu.gsyvideoplayer.effect.SepiaEffect; import com.shuyu.gsyvideoplayer.effect.SharpnessEffect; @@ -248,10 +251,19 @@ public class DetailFilterActivity extends GSYBaseActivityDetail { case 22: effect = new NoEffect(); break; + case 23: + effect = new OverlayEffect(); + break; + case 24: + effect = new SampleBlurEffect(4.0f); + break; + case 25: + effect = new GaussianBlurEffect(6.0f, GaussianBlurEffect.TYPEXY); + break; } detailPlayer.setEffectFilter(effect); type++; - if (type > 22) { + if (type > 25) { type = 0; } } diff --git a/dependencies.md b/dependencies.md index 4e9eee0..f64f5bf 100644 --- a/dependencies.md +++ b/dependencies.md @@ -68,7 +68,7 @@ allprojects { #### A、直接引入 ``` //完整版引入 -compile 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v2.0.7' +compile 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v2.0.8' ``` @@ -76,14 +76,14 @@ compile 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v2.0.7' ``` -compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-java:v2.0.7' +compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-java:v2.0.8' //根据你的需求 -compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-x64:v2.0.7' -compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-x86:v2.0.7' -compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-arm64:v2.0.7' -compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-armv5:v2.0.7' -compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-armv7a:v2.0.7' +compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-x64:v2.0.8' +compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-x86:v2.0.8' +compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-arm64:v2.0.8' +compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-armv5:v2.0.8' +compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-armv7a:v2.0.8' ``` @@ -93,8 +93,8 @@ A、B普通版本支持263/264/265等，对于mpeg编码会有声音无画面情 C 方法引入的so支持mpeg编码和其他补充协议，但是so包相对变大。 ``` -compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-java:v2.0.7' +compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-java:v2.0.8' -compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-ex_so:v2.0.7' +compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-ex_so:v2.0.8' ``` diff --git a/gsyVideoPlayer/build.gradle b/gsyVideoPlayer/build.gradle index 3ef7609..8c4d733 100644 --- a/gsyVideoPlayer/build.gradle +++ b/gsyVideoPlayer/build.gradle @@ -31,26 +31,26 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile project(':gsyVideoPlayer-java') - compile project(':gsyVideoPlayer-armv5') - compile project(':gsyVideoPlayer-armv7a') - compile project(':gsyVideoPlayer-armv64') - compile project(':gsyVideoPlayer-x86') - compile project(':gsyVideoPlayer-x86_64') + //compile project(':gsyVideoPlayer-java') + //compile project(':gsyVideoPlayer-armv5') + //compile project(':gsyVideoPlayer-armv7a') + //compile project(':gsyVideoPlayer-armv64') + //compile project(':gsyVideoPlayer-x86') + //compile project(':gsyVideoPlayer-x86_64') //更多配置版so，增加了concat,rtsp,mpeg，crypto //compile project(':gsyVideoPlayer-ex_so') - //compile 'com.shuyu:gsyVideoPlayer-java:2.0.7' + compile 'com.shuyu:gsyVideoPlayer-java:2.0.8' - //compile 'com.shuyu:gsyVideoPlayer-armv5:2.0.7' - //compile 'com.shuyu:gsyVideoPlayer-armv7a:2.0.7' - //compile 'com.shuyu:gsyVideoPlayer-arm64:2.0.7' - //compile 'com.shuyu:gsyVideoPlayer-x64:2.0.7' - //compile 'com.shuyu:gsyVideoPlayer-x86:2.0.7' + compile 'com.shuyu:gsyVideoPlayer-armv5:2.0.8' + compile 'com.shuyu:gsyVideoPlayer-armv7a:2.0.8' + compile 'com.shuyu:gsyVideoPlayer-arm64:2.0.8' + compile 'com.shuyu:gsyVideoPlayer-x64:2.0.8' + compile 'com.shuyu:gsyVideoPlayer-x86:2.0.8' //更多配置版so，增加了concat,rtsp,mpeg，crypto - //compile 'com.shuyu:gsyVideoPlayer-ex_so:2.0.7' + //compile 'com.shuyu:gsyVideoPlayer-ex_so:2.0.8' } apply from: './bintray.gradle' -- GitLab