Merge branch 'dev' of lhm/ich-android into dev

app/build.gradle

@@ -34,12 +34,14 @@ android {
     buildTypes {
         release {
             minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             buildConfigField "String", "EMQX_HOST", "\"tcp://8.135.102.238:1883\""
             buildConfigField "String", "ICSP_HOST", "\"http://icsp-api.ds-bay.com\""
         }
         debug {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             buildConfigField "String", "EMQX_HOST", "\"tcp://183.3.221.143:1883\""
             buildConfigField "String", "ICSP_HOST", "\"http://icsp-testend.ds-bay.com\""

app/proguard-rules.pro

@@ -89,6 +89,9 @@
 -keep class androidx.** {*;}
 -keep interface androidx.** {*;}
 -keep public class * extends androidx.**
+-keep class com.google.android.material.** {*;}
+-dontwarn com.google.android.material.**
+-dontnote com.google.android.material.**
 -dontwarn androidx.**
 
 # support v4/7库
@@ -102,11 +105,6 @@
 -keep interface android.support.design.** { *; }
 -keep public class android.support.design.R$* { *; }
 
-# androidx
--keep class com.google.android.material.** {*;}
--dontwarn com.google.android.material.**
--dontnote com.google.android.material.**
-
 # 资源文件
 -keep class **.R$* {*;}
 
@@ -148,9 +146,16 @@
 }
 
 # 避免okhttp3混淆
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-dontwarn okhttp3.**
 -dontwarn com.squareup.okhttp3.**
 -keep class com.squareup.okhttp3.** { *;}
 -dontwarn okio.**
+-dontwarn com.squareup.**
+-keep public class org.codehaus.* { *; }
+-keep public class java.nio.* { *; }
+-dontwarn org.codehaus.mojo.animal_sniffer.*
 
 # 避免小铁sdk混淆
 -keep class com.cherry.sdk.controller.** { *; }
@@ -158,4 +163,36 @@
 -keep class com.cherry.sdk.controller.command.** { *; }
 -keep class com.cherry.sdk.controller.data.** { *; }
 -keep class com.cherry.sdk.controller.module.** { *; }
--keep class com.cherry.sdk.controller.utils.** { *; }
+-keep class com.cherry.sdk.controller.utils.** { *; }
+
+# 远程更新下载jar混淆配置
+-dontwarn com.arialyy.aria.**
+-keep class com.arialyy.aria.**{*;}
+-keep class **$$DownloadListenerProxy{ *; }
+-keep class **$$UploadListenerProxy{ *; }
+-keep class **$$DownloadGroupListenerProxy{ *; }
+-keep class **$$DGSubListenerProxy{ *; }
+-keepclasseswithmembernames class * {
+    @Download.* <methods>;
+    @Upload.* <methods>;
+    @DownloadGroup.* <methods>;
+}
+
+# XUpdate混淆配置
+-keep class com.xuexiang.xupdate.entity.** { *; }
+# 注意，如果你使用的是自定义Api解析器解析，还需要给你自定义Api实体配上混淆，如下是本demo中配置的自定义Api实体混淆规则：
+-keep class com.xuexiang.xupdatedemo.entity.** { *; }
+
+# gson
+-dontwarn sun.misc.**
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+-keepclassmembers,allowobfuscation class * {
+  @com.google.gson.annotations.SerializedName <fields>;
+}
+
+# okhttputils
+-dontwarn com.zhy.http.**
+-keep class com.zhy.http.**{*;}
+-keep interface com.zhy.http.**{*;}

app/src/main/java/com/emato/ich/utils/BaseUtils.java

@@ -118,8 +118,8 @@ public class BaseUtils {
     }
 
     public static String getClientId() {
-//        return StringUtils.isNullOrEmpty(MAC) ? Md5Utils.string2Md5_16(getMac()).toUpperCase() : Md5Utils.string2Md5_16(MAC).toUpperCase();
-        return "222222222";// 8F00B204E9800998
+        return StringUtils.isNullOrEmpty(MAC) ? Md5Utils.string2Md5_16(getMac()).toUpperCase() : Md5Utils.string2Md5_16(MAC).toUpperCase();
+//        return "222222222";// 8F00B204E9800998
     }
 
     public static String getMac2() {