release 2.1.0 so (2017-10-10）

Astorli · Oct 10, 2017 · 73fbf62 · 73fbf62
1 parent a0ced5e
commit 73fbf62
Show file tree

Hide file tree

Showing 23 changed files with 32 additions and 32 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -63,32 +63,32 @@ dependencies {
     compile project(':gsyVideoPlayer')
 
     //jcenter
-    //compile 'com.shuyu:GSYVideoPlayer:2.0.9'
+    //compile 'com.shuyu:GSYVideoPlayer:2.1.0'
 
-    //compile 'com.shuyu:gsyVideoPlayer-java:2.0.9'
+    //compile 'com.shuyu:gsyVideoPlayer-java:2.1.0'
 
-    //compile 'com.shuyu:gsyVideoPlayer-armv5:2.0.9'
-    //compile 'com.shuyu:gsyVideoPlayer-armv7a:2.0.9'
-    //compile 'com.shuyu:gsyVideoPlayer-arm64:2.0.9'
-    //compile 'com.shuyu:gsyVideoPlayer-x64:2.0.9'
-    //compile 'com.shuyu:gsyVideoPlayer-x86:2.0.9'
+    //compile 'com.shuyu:gsyVideoPlayer-armv5:2.1.0'
+    //compile 'com.shuyu:gsyVideoPlayer-armv7a:2.1.0'
+    //compile 'com.shuyu:gsyVideoPlayer-arm64:2.1.0'
+    //compile 'com.shuyu:gsyVideoPlayer-x64:2.1.0'
+    //compile 'com.shuyu:gsyVideoPlayer-x86:2.1.0'
 
-    //compile 'com.shuyu:gsyVideoPlayer-ex_so:2.0.9'
+    //compile 'com.shuyu:gsyVideoPlayer-ex_so:2.1.0'
 
     //jitpack
 
-    //compile 'com.github.CarGuo:GSYVideoPlayer:v2.0.9'
+    //compile 'com.github.CarGuo:GSYVideoPlayer:v2.1.0'
 
-    //compile 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v2.0.9'
+    //compile 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v2.1.0'
 
-    //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-ex_so:v2.0.9'
+    //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-ex_so:v2.1.0'
 
-    //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-java:v2.0.9'
-    //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-x64:v2.0.9'
-    //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-x86:v2.0.9'
-    //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-arm64:v2.0.9'
-    //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-armv5:v2.0.9'
-    //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-armv7a:v2.0.9'
+    //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-java:v2.1.0'
+    //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-x64:v2.1.0'
+    //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-x86:v2.1.0'
+    //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-arm64:v2.1.0'
+    //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-armv5:v2.1.0'
+    //compile 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-armv7a:v2.1.0'
 
 
 }
diff --git a/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java b/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java
@@ -57,7 +57,7 @@ protected void onCreate(Bundle savedInstanceState) {
         //断网自动重新链接，url前接上ijkhttphook:
         //String url = "ijkhttphook:http://baobab.wdjcdn.com/14564977406580.mp4";
 
-        String url = "http://baobab.wdjcdn.com/14564977406580.mp4";
+        //String url = "http://baobab.wdjcdn.com/14564977406580.mp4";
 
         //String url = "http://hcjs2ra2rytd8v8np1q.exp.bcevod.com/mda-hegtjx8n5e8jt9zv/mda-hegtjx8n5e8jt9zv.m3u8";
         //String url = "http://7xse1z.com1.z0.glb.clouddn.com/1491813192";
@@ -66,7 +66,7 @@ protected void onCreate(Bundle savedInstanceState) {
         //String url = "http://vr.tudou.com/v2proxy/v?sid=95001&id=496378919&st=3&pw=";
         //String url = "http://pl-ali.youku.com/playlist/m3u8?type=mp4&ts=1490185963&keyframe=0&vid=XMjYxOTQ1Mzg2MA==&ep=ciadGkiFU8cF4SvajD8bYyuwJiYHXJZ3rHbN%2FrYDAcZuH%2BrC6DPcqJ21TPs%3D&sid=04901859548541247bba8&token=0524&ctype=12&ev=1&oip=976319194";
         //String url = "http://hls.ciguang.tv/hdtv/video.m3u8";
-        //String url = "https://res.exexm.com/cw_145225549855002";
+        String url = "https://res.exexm.com/cw_145225549855002";
         //String url = "http://storage.gzstv.net/uploads/media/huangmeiyan/jr05-09.mp4";//mepg
 
         //detailPlayer.setUp(url, false, null, "测试视频");

diff --git a/gsyVideoPlayer-armv5/libs/armeabi/libijkffmpeg.so b/gsyVideoPlayer-armv5/libs/armeabi/libijkffmpeg.so
diff --git a/gsyVideoPlayer-armv5/libs/armeabi/libijkplayer.so b/gsyVideoPlayer-armv5/libs/armeabi/libijkplayer.so
diff --git a/gsyVideoPlayer-armv64/libs/arm64-v8a/libijkffmpeg.so b/gsyVideoPlayer-armv64/libs/arm64-v8a/libijkffmpeg.so
diff --git a/gsyVideoPlayer-armv64/libs/arm64-v8a/libijkplayer.so b/gsyVideoPlayer-armv64/libs/arm64-v8a/libijkplayer.so
diff --git a/gsyVideoPlayer-armv7a/libs/armeabi-v7a/libijkffmpeg.so b/gsyVideoPlayer-armv7a/libs/armeabi-v7a/libijkffmpeg.so
diff --git a/gsyVideoPlayer-armv7a/libs/armeabi-v7a/libijkplayer.so b/gsyVideoPlayer-armv7a/libs/armeabi-v7a/libijkplayer.so
diff --git a/gsyVideoPlayer-ex_so/libs/arm64-v8a/libijkffmpeg.so b/gsyVideoPlayer-ex_so/libs/arm64-v8a/libijkffmpeg.so
diff --git a/gsyVideoPlayer-ex_so/libs/arm64-v8a/libijkplayer.so b/gsyVideoPlayer-ex_so/libs/arm64-v8a/libijkplayer.so
diff --git a/gsyVideoPlayer-ex_so/libs/armeabi-v7a/libijkffmpeg.so b/gsyVideoPlayer-ex_so/libs/armeabi-v7a/libijkffmpeg.so
diff --git a/gsyVideoPlayer-ex_so/libs/armeabi-v7a/libijkplayer.so b/gsyVideoPlayer-ex_so/libs/armeabi-v7a/libijkplayer.so
diff --git a/gsyVideoPlayer-ex_so/libs/armeabi/libijkffmpeg.so b/gsyVideoPlayer-ex_so/libs/armeabi/libijkffmpeg.so
diff --git a/gsyVideoPlayer-ex_so/libs/armeabi/libijkplayer.so b/gsyVideoPlayer-ex_so/libs/armeabi/libijkplayer.so
diff --git a/gsyVideoPlayer-ex_so/libs/x86/libijkffmpeg.so b/gsyVideoPlayer-ex_so/libs/x86/libijkffmpeg.so
diff --git a/gsyVideoPlayer-ex_so/libs/x86/libijkplayer.so b/gsyVideoPlayer-ex_so/libs/x86/libijkplayer.so
diff --git a/gsyVideoPlayer-ex_so/libs/x86_64/libijkffmpeg.so b/gsyVideoPlayer-ex_so/libs/x86_64/libijkffmpeg.so
diff --git a/gsyVideoPlayer-ex_so/libs/x86_64/libijkplayer.so b/gsyVideoPlayer-ex_so/libs/x86_64/libijkplayer.so
diff --git a/gsyVideoPlayer-x86/libs/x86/libijkffmpeg.so b/gsyVideoPlayer-x86/libs/x86/libijkffmpeg.so
diff --git a/gsyVideoPlayer-x86/libs/x86/libijkplayer.so b/gsyVideoPlayer-x86/libs/x86/libijkplayer.so
diff --git a/gsyVideoPlayer-x86_64/libs/x86_64/libijkffmpeg.so b/gsyVideoPlayer-x86_64/libs/x86_64/libijkffmpeg.so
diff --git a/gsyVideoPlayer-x86_64/libs/x86_64/libijkplayer.so b/gsyVideoPlayer-x86_64/libs/x86_64/libijkplayer.so
diff --git 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.9'
+    //compile 'com.shuyu:gsyVideoPlayer-java:2.1.0'
 
-    compile 'com.shuyu:gsyVideoPlayer-armv5:2.0.9'
-    compile 'com.shuyu:gsyVideoPlayer-armv7a:2.0.9'
-    compile 'com.shuyu:gsyVideoPlayer-arm64:2.0.9'
-    compile 'com.shuyu:gsyVideoPlayer-x64:2.0.9'
-    compile 'com.shuyu:gsyVideoPlayer-x86:2.0.9'
+    //compile 'com.shuyu:gsyVideoPlayer-armv5:2.1.0'
+    //compile 'com.shuyu:gsyVideoPlayer-armv7a:2.1.0'
+    //compile 'com.shuyu:gsyVideoPlayer-arm64:2.1.0'
+    //compile 'com.shuyu:gsyVideoPlayer-x64:2.1.0'
+    //compile 'com.shuyu:gsyVideoPlayer-x86:2.1.0'
 
     //更多配置版so，增加了concat,rtsp,mpeg，crypto
-    //compile 'com.shuyu:gsyVideoPlayer-ex_so:2.0.9'
+    //compile 'com.shuyu:gsyVideoPlayer-ex_so:2.1.0'
 }
 
 apply from: './bintray.gradle'