diff --git a/gsyvideoplayer-androidvideocache/.gitignore b/gsyVideoPlayer-exo_player2/.gitignore similarity index 100% rename from gsyvideoplayer-androidvideocache/.gitignore rename to gsyVideoPlayer-exo_player2/.gitignore diff --git a/gsyvideoplayer-androidvideocache/bintray.gradle b/gsyVideoPlayer-exo_player2/bintray.gradle similarity index 100% rename from gsyvideoplayer-androidvideocache/bintray.gradle rename to gsyVideoPlayer-exo_player2/bintray.gradle diff --git a/gsyvideoplayer-exo2/build.gradle b/gsyVideoPlayer-exo_player2/build.gradle similarity index 100% rename from gsyvideoplayer-exo2/build.gradle rename to gsyVideoPlayer-exo_player2/build.gradle diff --git a/gsyvideoplayer-exo2/gradle.properties b/gsyVideoPlayer-exo_player2/gradle.properties similarity index 100% rename from gsyvideoplayer-exo2/gradle.properties rename to gsyVideoPlayer-exo_player2/gradle.properties diff --git a/gsyvideoplayer-exo2/proguard-rules.pro b/gsyVideoPlayer-exo_player2/proguard-rules.pro similarity index 100% rename from gsyvideoplayer-exo2/proguard-rules.pro rename to gsyVideoPlayer-exo_player2/proguard-rules.pro diff --git a/gsyvideoplayer-exo2/src/main/AndroidManifest.xml b/gsyVideoPlayer-exo_player2/src/main/AndroidManifest.xml similarity index 100% rename from gsyvideoplayer-exo2/src/main/AndroidManifest.xml rename to gsyVideoPlayer-exo_player2/src/main/AndroidManifest.xml diff --git a/gsyvideoplayer-exo2/src/main/java/tv/danmaku/ijk/media/exo2/Exo2PlayerManager.java b/gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/Exo2PlayerManager.java similarity index 100% rename from gsyvideoplayer-exo2/src/main/java/tv/danmaku/ijk/media/exo2/Exo2PlayerManager.java rename to gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/Exo2PlayerManager.java diff --git a/gsyvideoplayer-exo2/src/main/java/tv/danmaku/ijk/media/exo2/ExoPlayerCacheManager.java b/gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/ExoPlayerCacheManager.java similarity index 100% rename from gsyvideoplayer-exo2/src/main/java/tv/danmaku/ijk/media/exo2/ExoPlayerCacheManager.java rename to gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/ExoPlayerCacheManager.java diff --git a/gsyvideoplayer-exo2/src/main/java/tv/danmaku/ijk/media/exo2/ExoSourceManager.java b/gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/ExoSourceManager.java similarity index 100% rename from gsyvideoplayer-exo2/src/main/java/tv/danmaku/ijk/media/exo2/ExoSourceManager.java rename to gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/ExoSourceManager.java diff --git a/gsyvideoplayer-exo2/src/main/java/tv/danmaku/ijk/media/exo2/IjkExo2MediaPlayer.java b/gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/IjkExo2MediaPlayer.java similarity index 100% rename from gsyvideoplayer-exo2/src/main/java/tv/danmaku/ijk/media/exo2/IjkExo2MediaPlayer.java rename to gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/IjkExo2MediaPlayer.java diff --git a/gsyvideoplayer-exo2/src/main/java/tv/danmaku/ijk/media/exo2/demo/EventLogger.java b/gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/demo/EventLogger.java similarity index 100% rename from gsyvideoplayer-exo2/src/main/java/tv/danmaku/ijk/media/exo2/demo/EventLogger.java rename to gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/demo/EventLogger.java diff --git a/gsyvideoplayer-exo2/src/main/res/values/strings.xml b/gsyVideoPlayer-exo_player2/src/main/res/values/strings.xml similarity index 100% rename from gsyvideoplayer-exo2/src/main/res/values/strings.xml rename to gsyVideoPlayer-exo_player2/src/main/res/values/strings.xml diff --git a/gsyVideoPlayer-java/build.gradle b/gsyVideoPlayer-java/build.gradle index e747d07a290a494f2e9f0174d6c3479d7ccfebfe..b818467bd715cfef7a5255b38d8890d3fdc7359d 100644 --- a/gsyVideoPlayer-java/build.gradle +++ b/gsyVideoPlayer-java/build.gradle @@ -38,7 +38,7 @@ dependencies { api viewDependencies.transitionseverywhere //api dataDependencies.videocache //api "com.shuyu:GSYVideoPlayer-base:$gsyVideoVersion" - api project(':gsyvideoplayer-androidvideocache') + api project(':gsyVideoPlayer-proxy_cache') api project(':gsyVideoPlayer-base') diff --git a/gsyVideoPlayer/build.gradle b/gsyVideoPlayer/build.gradle index bc8d3873df0ffd991c9178f7a309fbda39cf4931..c6565ae300f89094f09677ba8bf7f45d0083df8e 100644 --- a/gsyVideoPlayer/build.gradle +++ b/gsyVideoPlayer/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) api project(':gsyVideoPlayer-java') - api project(':gsyvideoplayer-exo2') + api project(':gsyVideoPlayer-exo_player2') //api project(':gsyVideoPlayer-armv5') //api project(':gsyVideoPlayer-armv7a') //api project(':gsyVideoPlayer-armv64') diff --git a/settings.gradle b/settings.gradle index 9549ab04ac718147188063ffddf61e0358dfc742..4d600710067f0d1996b3667dd8cd79ff893d33e5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app', ':gsyVideoPlayer', ':gsyVideoPlayer-java', ':gsyVideoPlayer-armv5', ':gsyVideoPlayer-armv7a', ':gsyVideoPlayer-armv64', ':gsyVideoPlayer-x86', ':gsyVideoPlayer-x86_64', ':gsyVideoPlayer-ex_so', ':gsyvideoplayer-androidvideocache', ':gsyvideoplayer-exo2', ':gsyVideoPlayer-base' +include ':app', ':gsyVideoPlayer', ':gsyVideoPlayer-java', ':gsyVideoPlayer-armv5', ':gsyVideoPlayer-armv7a', ':gsyVideoPlayer-armv64', ':gsyVideoPlayer-x86', ':gsyVideoPlayer-x86_64', ':gsyVideoPlayer-ex_so', ':gsyVideoPlayer-proxy_cache', ':gsyVideoPlayer-exo_player2', ':gsyVideoPlayer-base'