diff --git a/app/build.gradle b/app/build.gradle index 65565db419f2cc8bd77807e08f316a7c23ba1d5e..cf14b5bfa1acecee69b4e211696a6284fb7d2219 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { minSdkVersion globalConfiguration.androidMinSdkVersion targetSdkVersion globalConfiguration.androidTargetSdkVersion - versionCode 1 - versionName "1.0" + versionCode 2 + versionName "1.3.8" ndk { @@ -25,10 +25,16 @@ android { } buildTypes { + release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + + debug { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } } } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 960a34898e6d14d27624c1f909646fb33aedf1e8..39b7c73b0b3574594228263b8da7204e04b4c655 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -15,3 +15,69 @@ #-keepclassmembers class fqcn.of.javascript.interface.for.webview { # public *; #} +# 指定代码的压缩级别 +-optimizationpasses 5 +# 是否使用大小写混合 +-dontusemixedcaseclassnames +# 是否混淆第三方jar +-dontskipnonpubliclibraryclasses +# 混淆时是否做预校验 +-dontpreverify +# 混淆时是否记录日志 +-verbose +# 混淆时所采用的算法 +-optimizations !code/simplification/arithmetic,!field/*,!class/merging/* +-ignorewarnings +#-ignorewarnings +-keepattributes *Annotation* +-keepattributes Signature +-keepattributes SourceFile,LineNumberTable +-keepattributes Exceptions,InnerClasses,Deprecated,LocalVariable*Table,Synthetic,EnclosingMethod +-keepattributes EnclosingMethod + +# Keep native methods +-keepclassmembers class * { + native ; +} + + +-keepclassmembers class fqcn.of.javascript.interface.for.webview { + public *; +} + + +-keepclassmembers class * implements java.io.Serializable { + static final long serialVersionUID; + private static final java.io.ObjectStreamField[] serialPersistentFields; + private void writeObject(java.io.ObjectOutputStream); + private void readObject(java.io.ObjectInputStream); + java.lang.Object writeReplace(); + java.lang.Object readResolve(); +} + +-keep public class * implements java.io.Serializable { + public *; +} + +-keep class **.R$*{ + *; +} + +-keepclassmembers class * { + public (org.json.JSONObject); +} + +-keepclasseswithmembernames class * { +native ; +} + +-keepclassmembers enum * { +public static **[] values(); +public static ** valueOf(java.lang.String); +} + + +-keep class com.shuyu.gsyvideoplayer.** { *; } +-dontwarn com.shuyu.gsyvideoplayer.** +-keep class tv.danmaku.ijk.** { *; } +-dontwarn tv.danmaku.ijk.** \ No newline at end of file diff --git a/videoCache/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/videoCache/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties index 63e8a6c87891e5cc27c2cec1c920aeff42df0326..669214900c9d8e36b734fa6222b07216bb50f448 100644 --- a/videoCache/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties +++ b/videoCache/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties @@ -1 +1 @@ -#Fri Dec 02 23:33:54 GMT+08:00 2016 +#Sat Dec 03 14:06:59 GMT+08:00 2016 diff --git a/videoCache/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/videoCache/build/intermediates/incremental/packageDebugResources/compile-file-map.properties index 41e40de437a913e7421dc0122496cf6a4a27e7ca..901753824613f7a716379c6f46ba71d4367ac33b 100644 --- a/videoCache/build/intermediates/incremental/packageDebugResources/compile-file-map.properties +++ b/videoCache/build/intermediates/incremental/packageDebugResources/compile-file-map.properties @@ -1 +1 @@ -#Fri Dec 02 23:33:52 GMT+08:00 2016 +#Sat Dec 03 14:06:58 GMT+08:00 2016 diff --git a/videoCache/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties b/videoCache/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties index 4375b4c5f51a749a79fc7491314f27b9149dd275..1e1bd540e963df82389ad2f7762a62855b4a1ff4 100644 --- a/videoCache/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties +++ b/videoCache/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties @@ -1 +1 @@ -#Fri Dec 02 23:34:58 GMT+08:00 2016 +#Sat Dec 03 14:06:48 GMT+08:00 2016 diff --git a/videoCache/build/intermediates/res/resources-debug-androidTest.ap_ b/videoCache/build/intermediates/res/resources-debug-androidTest.ap_ index 98690cbb63ee5840ae1f0f3e9e4bcaf64f8f93d1..e55bbe9a0cce59e5f806192ea888b45126b25da2 100644 Binary files a/videoCache/build/intermediates/res/resources-debug-androidTest.ap_ and b/videoCache/build/intermediates/res/resources-debug-androidTest.ap_ differ