7.0.0-beta

README.md

@@ -190,7 +190,7 @@ ExoSourceManager.setExoMediaSourceInterceptListener(new ExoMediaSourceInterceptL
 ## 五、近期版本
 
 
-### 7.0.0-beta1
+### 7.0.0-beta1(2019-03-03)
 * orientation 增加 pause
 ```
  orientationUtils.setIsPause(true);

app/build.gradle

@@ -15,8 +15,8 @@ android {
         minSdkVersion globalConfiguration.androidMinSdkVersion
         targetSdkVersion globalConfiguration.androidTargetSdkVersion
 
-        versionCode 5
-        versionName "4.0.0"
+        versionCode 6
+        versionName "5.0.0"
 
         javaCompileOptions {
             annotationProcessorOptions.includeCompileClasspath = true

dependencies.gradle

@@ -32,7 +32,7 @@ ext {
 
     imageLoader = '4.9.0'
 
-    gsyVideoVersion = '6.0.1'
+    gsyVideoVersion = '7.0.0-beta1'
 
     exo_player2 = '2.9.5'
 

doc/UPDATE_VERSION.md

 ## 下方个版本说明，可以当做简单的wiki使用~，效果可参考DEMO。
 
-### 7.0.0-beta1
+### 7.0.0-beta1(2019-03-03)
 * orientation 增加 pause
 ```
  orientationUtils.setIsPause(true);

gsyVideoPlayer-exo_player2/build.gradle

@@ -33,14 +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"
-
-//    compile fileTree(dir: 'libs', include: ['*.jar'])
-//    def viewDependencies = rootProject.ext.viewDependencies
-//    compile viewDependencies.exo_player2
-//    compile viewDependencies.exo_player2_rtmp
-//    compile "com.shuyu:gsyVideoPlayer-base:6.0.2"
+    //api project(':gsyVideoPlayer-base')
+    api "com.shuyu:gsyVideoPlayer-base:$gsyVideoVersion"
 
 }
 

gsyVideoPlayer-java/build.gradle

@@ -40,19 +40,10 @@ dependencies {
     api viewDependencies.ijkplayer_java
     api viewDependencies.ijkplayer_exo
     api viewDependencies.transitionseverywhere
-    api project(':gsyVideoPlayer-proxy_cache')
-    api project(':gsyVideoPlayer-base')
-    //api "com.shuyu:gsyVideoPlayer-base:$gsyVideoVersion"
-    //api "com.shuyu:gsyvideoplayer-androidvideocache:$gsyVideoVersion"
-
-
-//    compile fileTree(dir: 'libs', include: ['*.jar'])
-//    compile androidDependencies.appcompat_v7
-//    def viewDependencies = rootProject.ext.viewDependencies
-//    compile viewDependencies.ijkplayer_java
-//    compile viewDependencies.transitionseverywhere
-//    compile "com.shuyu:gsyvideoplayer-androidvideocache:$gsyVideoVersion"
-//    compile "com.shuyu:gsyVideoPlayer-base:$gsyVideoVersion"
+    //api project(':gsyVideoPlayer-proxy_cache')
+    //api project(':gsyVideoPlayer-base')
+    api "com.shuyu:gsyVideoPlayer-base:$gsyVideoVersion"
+    api "com.shuyu:gsyvideoplayer-androidvideocache:$gsyVideoVersion"
 
 }
 

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"
 
 }