diff --git a/README.md b/README.md index e4693f5b..bd0a3034 100644 --- a/README.md +++ b/README.md @@ -39,17 +39,17 @@ allprojects { dependencies { # 必选,可兼容市面上绝大部分设备 - implementation 'com.github.dueeeke.dkplayer:dkplayer-java:2.5.3' - implementation 'com.github.dueeeke.dkplayer:dkplayer-armv7a:2.5.3' + implementation 'com.github.dueeeke.dkplayer:dkplayer-java:2.5.4' + implementation 'com.github.dueeeke.dkplayer:dkplayer-armv7a:2.5.4' # 可选,用于兼容一些其他的CPU架构 - implementation 'com.github.dueeeke.dkplayer:dkplayer-armv5:2.5.3' - implementation 'com.github.dueeeke.dkplayer:dkplayer-arm64:2.5.3' - implementation 'com.github.dueeeke.dkplayer:dkplayer-x86:2.5.3' - implementation 'com.github.dueeeke.dkplayer:dkplayer-x86_64:2.5.3' + implementation 'com.github.dueeeke.dkplayer:dkplayer-armv5:2.5.4' + implementation 'com.github.dueeeke.dkplayer:dkplayer-arm64:2.5.4' + implementation 'com.github.dueeeke.dkplayer:dkplayer-x86:2.5.4' + implementation 'com.github.dueeeke.dkplayer:dkplayer-x86_64:2.5.4' # 可选,里面包含StandardVideoController的实现 - implementation 'com.github.dueeeke.dkplayer:dkplayer-ui:2.5.3' + implementation 'com.github.dueeeke.dkplayer:dkplayer-ui:2.5.4' } ``` 或者将library下载并导入项目中使用 diff --git a/app/build.gradle b/app/build.gradle index 3c6d2c10..a3b7e93d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { applicationId "com.dueeeke.dkplayer" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 27 - versionName "2.5.3" + versionCode 28 + versionName "2.5.4" ndk { //打包时保留armeabi-v7a x86 so @@ -72,7 +72,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.2' releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2' - testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2' + debugImplementation 'com.squareup.leakcanary:leakcanary-support-fragment:1.6.2' implementation "com.android.support:recyclerview-v7:$rootProject.supportLibraryVersion" implementation 'com.github.bumptech.glide:glide:3.7.0' implementation 'com.yanzhenjie:permission:2.0.0-rc12' diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 176bb62c..47f008f3 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -26,5 +26,12 @@ -keep class tv.danmaku.ijk.** { *; } -dontwarn tv.danmaku.ijk.** --keep class com.devlin_n.magic_player.** { *; } --dontwarn com.devlin_n.magic_player.** \ No newline at end of file +-keep class com.dueeeke.videoplayer.** { *; } +-dontwarn com.dueeeke.videoplayer.** + + +-dontwarn com.yanzhenjie.permission.** + +-keep class android.support.** { *; } + +-keep class com.bumptech.glide.** { *; } \ No newline at end of file diff --git a/dkplayer-java/build.gradle b/dkplayer-java/build.gradle index 0af9ab57..cda275cd 100644 --- a/dkplayer-java/build.gradle +++ b/dkplayer-java/build.gradle @@ -14,7 +14,7 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - compileOnly "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion" + implementation "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion" api "tv.danmaku.ijk.media:ijkplayer-java:$rootProject.ijkPlayerVersion" api 'com.danikula:videocache:2.7.1' }