From 6bc71f97b6c9a712f21e1a4c150c5ef886e6ed1f Mon Sep 17 00:00:00 2001 From: maiwenchang Date: Sun, 15 Mar 2020 22:22:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=830.8.0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.English.md | 18 +++++++++--------- README.md | 18 +++++++++--------- app/build.gradle | 10 +++++++--- .../main/res/layout/activity_api_common.xml | 1 + .../res/layout/activity_api_raw_assets.xml | 1 + app/src/main/res/layout/activity_tiny.xml | 2 ++ app/src/main/res/layout/item_video_view.xml | 3 ++- artplayer-exo/build.gradle | 4 ++++ artplayer-ijk/build.gradle | 4 ++++ artplayer-java/build.gradle | 4 ++++ artplayer-ui/build.gradle | 4 ++++ build.gradle | 12 +++++++++--- 12 files changed, 56 insertions(+), 25 deletions(-) diff --git a/README.English.md b/README.English.md index 5745fe6..e762224 100644 --- a/README.English.md +++ b/README.English.md @@ -38,24 +38,24 @@ This is a flexible video player. MediaPlayer is completely separate from VideoVi ``` dependencies { // required - implementation 'org.salient.artvideoplayer:artplayer-java:0.7.0' + implementation 'org.salient.artvideoplayer:artplayer-java:0.8.0' // Default control panel: optional - implementation 'org.salient.artvideoplayer:artplayer-ui:0.7.0' + implementation 'org.salient.artvideoplayer:artplayer-ui:0.8.0' //ijkPlayer: optional - implementation 'org.salient.artvideoplayer:artplayer-ijk:0.7.0' - implementation "org.salient.artvideoplayer:artplayer-armv7a:0.7.0" + implementation 'org.salient.artvideoplayer:artplayer-ijk:0.8.0' + implementation "org.salient.artvideoplayer:artplayer-armv7a:0.8.0" //Other ABIs: optional - implementation "org.salient.artvideoplayer:artplayer-armv5:0.7.0" - implementation "org.salient.artvideoplayer:artplayer-x86:0.7.0" + implementation "org.salient.artvideoplayer:artplayer-armv5:0.8.0" + implementation "org.salient.artvideoplayer:artplayer-x86:0.8.0" // Other ABIs: optional (minSdk version >= 21) - implementation "org.salient.artvideoplayer:artplayer-arm64:0.7.0" - implementation "org.salient.artvideoplayer:artplayer-x86_64:0.7.0" + implementation "org.salient.artvideoplayer:artplayer-arm64:0.8.0" + implementation "org.salient.artvideoplayer:artplayer-x86_64:0.8.0" //ExoPlayer2 : optional - implementation "org.salient.artvideoplayer:artplayer-exo:0.7.0" + implementation "org.salient.artvideoplayer:artplayer-exo:0.8.0" } ``` diff --git a/README.md b/README.md index 7e18ddc..11c9605 100644 --- a/README.md +++ b/README.md @@ -38,20 +38,20 @@ ``` dependencies { // required - implementation 'org.salient.artvideoplayer:artplayer-java:0.7.0' + implementation 'org.salient.artvideoplayer:artplayer-java:0.8.0' // Default control panel: optional - implementation 'org.salient.artvideoplayer:artplayer-ui:0.7.0' + implementation 'org.salient.artvideoplayer:artplayer-ui:0.8.0' //ijkPlayer: optional - implementation 'org.salient.artvideoplayer:artplayer-ijk:0.7.0' - implementation "org.salient.artvideoplayer:artplayer-armv7a:0.7.0" + implementation 'org.salient.artvideoplayer:artplayer-ijk:0.8.0' + implementation "org.salient.artvideoplayer:artplayer-armv7a:0.8.0" //Other ABIs: optional - implementation "org.salient.artvideoplayer:artplayer-armv5:0.7.0" - implementation "org.salient.artvideoplayer:artplayer-x86:0.7.0" + implementation "org.salient.artvideoplayer:artplayer-armv5:0.8.0" + implementation "org.salient.artvideoplayer:artplayer-x86:0.8.0" // Other ABIs: optional (minSdk version >= 21) - implementation "org.salient.artvideoplayer:artplayer-arm64:0.7.0" - implementation "org.salient.artvideoplayer:artplayer-x86_64:0.7.0" + implementation "org.salient.artvideoplayer:artplayer-arm64:0.8.0" + implementation "org.salient.artvideoplayer:artplayer-x86_64:0.8.0" //ExoPlayer2 : optional - implementation "org.salient.artvideoplayer:artplayer-exo:0.7.0" + implementation "org.salient.artvideoplayer:artplayer-exo:0.8.0" } ``` diff --git a/app/build.gradle b/app/build.gradle index a5e259a..a3d40b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -48,6 +48,10 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 } + lintOptions { + abortOnError false + } + dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation "androidx.appcompat:appcompat:$rootProject.androidxLibraryVersion" @@ -76,15 +80,15 @@ android { implementation project(':artplayer-exo') //ijkPlayer : optional - implementation "org.salient.artvideoplayer:artplayer-armv7a:$rootProject.libraryVersionName" + implementation "org.salient.artvideoplayer:artplayer-armv7a:$rootProject.artPlayerVersion" //ijkPlayer : required for ijkPlayer, enough for most devices. //implementation "org.salient.artvideoplayer:artplayer-ijk:$rootProject.libraryVersionName" implementation project(':artplayer-ijk') // Other ABIs for ijkPlayer : optional - implementation "org.salient.artvideoplayer:artplayer-armv5:$rootProject.libraryVersionName" - implementation "org.salient.artvideoplayer:artplayer-x86:$rootProject.libraryVersionName" + implementation "org.salient.artvideoplayer:artplayer-armv5:$rootProject.artPlayerVersion" + implementation "org.salient.artvideoplayer:artplayer-x86:$rootProject.artPlayerVersion" //implementation project(':artplayer-x86_64') //implementation project(':artplayer-arm64') diff --git a/app/src/main/res/layout/activity_api_common.xml b/app/src/main/res/layout/activity_api_common.xml index 56d0e9e..c23dd00 100644 --- a/app/src/main/res/layout/activity_api_common.xml +++ b/app/src/main/res/layout/activity_api_common.xml @@ -38,6 +38,7 @@ android:id="@+id/salientVideoView" android:layout_width="match_parent" android:layout_height="0dp" + app:layout_constraintTop_toTopOf="parent" app:layout_constraintDimensionRatio="16:9" /> diff --git a/app/src/main/res/layout/activity_api_raw_assets.xml b/app/src/main/res/layout/activity_api_raw_assets.xml index de26252..ea1d4ea 100644 --- a/app/src/main/res/layout/activity_api_raw_assets.xml +++ b/app/src/main/res/layout/activity_api_raw_assets.xml @@ -65,6 +65,7 @@ android:id="@+id/salientVideoView" android:layout_width="match_parent" android:layout_height="0dp" + app:layout_constraintTop_toTopOf="parent" app:layout_constraintDimensionRatio="16:9" /> diff --git a/app/src/main/res/layout/activity_tiny.xml b/app/src/main/res/layout/activity_tiny.xml index a073e36..0377e99 100644 --- a/app/src/main/res/layout/activity_tiny.xml +++ b/app/src/main/res/layout/activity_tiny.xml @@ -3,12 +3,14 @@ android:layout_width="match_parent" android:layout_height="match_parent" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" tools:context=".activity.tiny.TinyWindowActivity"> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintDimensionRatio="16:9"/> \ No newline at end of file diff --git a/artplayer-exo/build.gradle b/artplayer-exo/build.gradle index fcb62b7..b038e45 100644 --- a/artplayer-exo/build.gradle +++ b/artplayer-exo/build.gradle @@ -23,6 +23,10 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 } + lintOptions { + abortOnError false + } + } dependencies { diff --git a/artplayer-ijk/build.gradle b/artplayer-ijk/build.gradle index 8849941..1b463d6 100644 --- a/artplayer-ijk/build.gradle +++ b/artplayer-ijk/build.gradle @@ -23,6 +23,10 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 } + lintOptions { + abortOnError false + } + } dependencies { diff --git a/artplayer-java/build.gradle b/artplayer-java/build.gradle index 96eb57e..554b9bd 100644 --- a/artplayer-java/build.gradle +++ b/artplayer-java/build.gradle @@ -32,6 +32,10 @@ android { jniLibs.srcDirs = ['libs'] } } + + lintOptions { + abortOnError false + } } dependencies { diff --git a/artplayer-ui/build.gradle b/artplayer-ui/build.gradle index 3d102ef..8d65763 100644 --- a/artplayer-ui/build.gradle +++ b/artplayer-ui/build.gradle @@ -21,6 +21,10 @@ android { } } + lintOptions { + abortOnError false + } + } dependencies { diff --git a/build.gradle b/build.gradle index 6952c97..a60c5a9 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.6.1' - classpath 'com.novoda:bintray-release:0.8.1' + classpath 'com.novoda:bintray-release:0.9.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -27,6 +27,8 @@ allprojects { charSet 'UTF-8' links "http://docs.oracle.com/javase/8/docs/api" } + options.addStringOption('Xdoclint:none', '-quiet') + options.addStringOption('encoding', 'UTF-8') } } @@ -42,7 +44,11 @@ ext { androidxLibraryVersion = '1.1.0' ijkPlayerVersion = '0.8.8' exoPlayerVersion = '2.11.3' + artPlayerVersion = "0.8.0" + + libraryVersionCode = 8 + libraryVersionName = "0.8.0" + + - libraryVersionCode = 7 - libraryVersionName = "0.7.0" } \ No newline at end of file