From 63e1d91e87a2b541dcf67ede97f848cc3823c552 Mon Sep 17 00:00:00 2001 From: guoshuyu Date: Tue, 21 Aug 2018 14:45:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9module=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.gitignore | 0 .../bintray.gradle | 0 .../build.gradle | 0 .../gradle.properties | 0 .../proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../main/java/tv/danmaku/ijk/media/exo2/Exo2PlayerManager.java | 0 .../java/tv/danmaku/ijk/media/exo2/ExoPlayerCacheManager.java | 0 .../main/java/tv/danmaku/ijk/media/exo2/ExoSourceManager.java | 0 .../main/java/tv/danmaku/ijk/media/exo2/IjkExo2MediaPlayer.java | 0 .../main/java/tv/danmaku/ijk/media/exo2/demo/EventLogger.java | 0 .../src/main/res/values/strings.xml | 0 gsyVideoPlayer-java/build.gradle | 2 +- gsyVideoPlayer/build.gradle | 2 +- settings.gradle | 2 +- 15 files changed, 3 insertions(+), 3 deletions(-) rename {gsyvideoplayer-androidvideocache => gsyVideoPlayer-exo_player2}/.gitignore (100%) rename {gsyvideoplayer-androidvideocache => gsyVideoPlayer-exo_player2}/bintray.gradle (100%) rename {gsyvideoplayer-exo2 => gsyVideoPlayer-exo_player2}/build.gradle (100%) rename {gsyvideoplayer-exo2 => gsyVideoPlayer-exo_player2}/gradle.properties (100%) rename {gsyvideoplayer-exo2 => gsyVideoPlayer-exo_player2}/proguard-rules.pro (100%) rename {gsyvideoplayer-exo2 => gsyVideoPlayer-exo_player2}/src/main/AndroidManifest.xml (100%) rename {gsyvideoplayer-exo2 => gsyVideoPlayer-exo_player2}/src/main/java/tv/danmaku/ijk/media/exo2/Exo2PlayerManager.java (100%) rename {gsyvideoplayer-exo2 => gsyVideoPlayer-exo_player2}/src/main/java/tv/danmaku/ijk/media/exo2/ExoPlayerCacheManager.java (100%) rename {gsyvideoplayer-exo2 => gsyVideoPlayer-exo_player2}/src/main/java/tv/danmaku/ijk/media/exo2/ExoSourceManager.java (100%) rename {gsyvideoplayer-exo2 => gsyVideoPlayer-exo_player2}/src/main/java/tv/danmaku/ijk/media/exo2/IjkExo2MediaPlayer.java (100%) rename {gsyvideoplayer-exo2 => gsyVideoPlayer-exo_player2}/src/main/java/tv/danmaku/ijk/media/exo2/demo/EventLogger.java (100%) rename {gsyvideoplayer-exo2 => gsyVideoPlayer-exo_player2}/src/main/res/values/strings.xml (100%) 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 e747d07..b818467 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 bc8d387..c6565ae 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 9549ab0..4d60071 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' -- GitLab