diff --git a/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java b/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java index f8a5831db..937ab62b1 100644 --- a/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java +++ b/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java @@ -318,6 +318,7 @@ private String getUrl() { //String url = "http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/bipbop_4x3_variant.m3u8"; //String url = "rtmp://ctc-zhenjiang04.rt1.gensee.com/5324e855b28b453db7b0ec226598b76c_171391_0_8801038305_1591077225_205d01b8/video"; String url = "http://9890.vod.myqcloud.com/9890_4e292f9a3dd011e6b4078980237cc3d3.f20.mp4"; + //String url = "http://yongtaizx.xyz/20191230/t2Axgh3k/index.m3u8"; //String url = "https://pointshow.oss-cn-hangzhou.aliyuncs.com/McTk51586843620689.mp4"; //String url = "http://pointshow.oss-cn-hangzhou.aliyuncs.com/transcode/ORIGINAL/Mnbc61586842828593.mp4"; //ssl error diff --git a/dependencies.gradle b/dependencies.gradle index a153784d3..7e64237f0 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -33,7 +33,7 @@ ext { imageLoader = '4.9.0' - gsyVideoVersion = '7.1.4' + gsyVideoVersion = '7.1.5' exo_player2 = '2.11.3' diff --git a/gsyVideoPlayer-exo_player2/build.gradle b/gsyVideoPlayer-exo_player2/build.gradle index 5a563eade..8e362fd42 100644 --- a/gsyVideoPlayer-exo_player2/build.gradle +++ b/gsyVideoPlayer-exo_player2/build.gradle @@ -33,8 +33,8 @@ dependencies { def viewDependencies = rootProject.ext.viewDependencies api viewDependencies.exo_player2 api viewDependencies.exo_player2_rtmp - api project(':gsyVideoPlayer-base') - //api "com.shuyu:gsyVideoPlayer-base:$gsyVideoVersion" + //api project(':gsyVideoPlayer-base') + api "com.shuyu:gsyVideoPlayer-base:$gsyVideoVersion" } diff --git a/gsyVideoPlayer-java/build.gradle b/gsyVideoPlayer-java/build.gradle index 7afef8d67..d21e9c6a4 100644 --- a/gsyVideoPlayer-java/build.gradle +++ b/gsyVideoPlayer-java/build.gradle @@ -41,8 +41,8 @@ dependencies { api viewDependencies.ijkplayer_exo api viewDependencies.transitionseverywhere //api project(':gsyVideoPlayer-proxy_cache') - api project(':gsyVideoPlayer-base') - //api "com.shuyu:gsyVideoPlayer-base:$gsyVideoVersion" + //api project(':gsyVideoPlayer-base') + api "com.shuyu:gsyVideoPlayer-base:$gsyVideoVersion" api "com.shuyu:gsyvideoplayer-androidvideocache:$gsyVideoVersion" } diff --git a/gsyVideoPlayer/build.gradle b/gsyVideoPlayer/build.gradle index 017094818..9da0cab07 100644 --- a/gsyVideoPlayer/build.gradle +++ b/gsyVideoPlayer/build.gradle @@ -35,8 +35,8 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - api project(':gsyVideoPlayer-java') - api project(':gsyVideoPlayer-exo_player2') + //api project(':gsyVideoPlayer-java') + //api project(':gsyVideoPlayer-exo_player2') //api project(':gsyVideoPlayer-armv5') //api project(':gsyVideoPlayer-armv7a') //api project(':gsyVideoPlayer-armv64') @@ -48,16 +48,16 @@ dependencies { //api "com.shuyu:GSYVideoPlayer:$gsyVideoVersion" - //api "com.shuyu:gsyVideoPlayer-java:$gsyVideoVersion" - //api "com.shuyu:GSYVideoPlayer-exo2:$gsyVideoVersion" - //api "com.shuyu:gsyVideoPlayer-armv5:$gsyVideoVersion" - //api "com.shuyu:gsyVideoPlayer-armv7a:$gsyVideoVersion" - //api "com.shuyu:gsyVideoPlayer-arm64:$gsyVideoVersion" - //api "com.shuyu:gsyVideoPlayer-x64:$gsyVideoVersion" - //api "com.shuyu:gsyVideoPlayer-x86:$gsyVideoVersion" + api "com.shuyu:gsyVideoPlayer-java:$gsyVideoVersion" + api "com.shuyu:GSYVideoPlayer-exo2:$gsyVideoVersion" + api "com.shuyu:gsyVideoPlayer-armv5:$gsyVideoVersion" + api "com.shuyu:gsyVideoPlayer-armv7a:$gsyVideoVersion" + api "com.shuyu:gsyVideoPlayer-arm64:$gsyVideoVersion" + api "com.shuyu:gsyVideoPlayer-x64:$gsyVideoVersion" + 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" }