diff --git a/.idea/misc.xml b/.idea/misc.xml index cd77a1f062..21e99e2dc0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index a4902d69a3..a6f1083172 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -39,13 +39,13 @@ android { } buildTypes { debug { - signingConfig signingConfigs.release debuggable = true + signingConfig signingConfigs.release } release { - minifyEnabled false - zipAlignEnabled false - shrinkResources false + minifyEnabled true + zipAlignEnabled true + shrinkResources true signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 336140b797..8af53f731e 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -156,6 +156,27 @@ public static *** w(...); } +#kotlin +-keep class kotlin.* { *; } +-keepclassmembernames class kotlinx.*{ + volatile ; +} +-keep class kotlin.Metadata { *; } +-dontwarn kotlin.* +-dontwarn kotlin.** +-keepclassmembers class **$WhenMappings { + ; +} +-keepclassmembers class kotlin.Metadata { + public ; +} +-assumenosideeffects class kotlin.jvm.internal.Intrinsics { + static void checkParameterIsNotNull(java.lang.Object, java.lang.String); +} +-keepclassmembers class kotlin.Metadata { *; } +-keep @kotlin.Metadata class * +-keepclasseswithmembers @kotlin.Metadata class * { *; } + #----------------------------------------第三方库---------------------------------------------- #-----高德地图----- #3D 地图 V5.0.0之后： @@ -225,6 +246,10 @@ #-----Okio----- # Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java. -dontwarn org.codehaus.mojo.animal_sniffer.* +-dontwarn com.squareup.** +-dontwarn okio.** +-keep public class org.codehaus.* { *; } +-keep public class java.nio.* { *; } #-----OkHttp----- # JSR 305 annotations are for embedding nullability information. @@ -277,7 +302,7 @@ } #-----ZhiDaoService----- --keep class com.zhidao.auto.*{*;} +-keep class com.zhidao.auto.platform.*{*;} -keep class com.zhidaohulian.*{*;} -keep class com.elegant.analytics.*{*;} -keep class com.zhidao.socketsdk.*{*;} diff --git a/foudations/mogo-commons/build.gradle b/foudations/mogo-commons/build.gradle index 0f2fc4036c..846b3ad4b3 100644 --- a/foudations/mogo-commons/build.gradle +++ b/foudations/mogo-commons/build.gradle @@ -22,7 +22,9 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true + zipAlignEnabled true + consumerProguardFiles 'consumer-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/foudations/mogo-commons/consumer-rules.pro b/foudations/mogo-commons/consumer-rules.pro index e69de29bb2..89e45961cb 100644 --- a/foudations/mogo-commons/consumer-rules.pro +++ b/foudations/mogo-commons/consumer-rules.pro @@ -0,0 +1,2 @@ +#-----Foundation-Commons----- +-keep class com.mogo.commons.data.BaseData.*{*;} \ No newline at end of file diff --git a/foudations/mogo-commons/proguard-rules.pro b/foudations/mogo-commons/proguard-rules.pro index f1b424510d..31bc92ec67 100644 --- a/foudations/mogo-commons/proguard-rules.pro +++ b/foudations/mogo-commons/proguard-rules.pro @@ -19,3 +19,6 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile + +#-----Foundation-Commons----- +-keep class com.mogo.commons.data.BaseData.*{*;} \ No newline at end of file diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/SubscribeImpl.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/SubscribeImpl.java index 26a38797cf..5d9217849e 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/SubscribeImpl.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/SubscribeImpl.java @@ -3,7 +3,6 @@ package com.mogo.commons.network; import com.mogo.commons.data.BaseData; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.RequestOptions; -import com.mogo.utils.network.utils.GsonUtil; import com.mogo.utils.network.utils.Util; import io.reactivex.Observer; diff --git a/gradle.properties b/gradle.properties index da46466c07..496100f81d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -59,9 +59,9 @@ MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.2.1.17 # 探路 MOGO_MODULE_TANLU_VERSION=1.3.0.3-byd # 车聊聊 -CARCHATTING_VERSION=1.3.2 +CARCHATTING_VERSION=1.4.1 # 车聊聊接口 -CARCHATTINGPROVIDER_VERSION=1.3.2 +CARCHATTINGPROVIDER_VERSION=1.3.4 # 视频引导 MOGO_MODULE_GUIDESHOW_VERSION=1.0.2-SNAPSHOT # 视频引导接口 @@ -69,7 +69,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.2.8 +MOGO_MODULE_V2X_VERSION=1.3.0 # 推送 MOGO_MODULE_PUSH_VERSION=1.1.5.6 MOGO_MODULE_PUSH_BASE_VERSION=1.1.5.5 diff --git a/libraries/map-amap/build.gradle b/libraries/map-amap/build.gradle index 780c7af6f6..7a544f1602 100644 --- a/libraries/map-amap/build.gradle +++ b/libraries/map-amap/build.gradle @@ -15,7 +15,9 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true + zipAlignEnabled true + consumerProguardFiles 'consumer-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/libraries/map-amap/consumer-rules.pro b/libraries/map-amap/consumer-rules.pro index e69de29bb2..ca417b30e0 100644 --- a/libraries/map-amap/consumer-rules.pro +++ b/libraries/map-amap/consumer-rules.pro @@ -0,0 +1,2 @@ +#-----library-MapAMap----- +-keep class com.mogo.map.impl.amap.hook.BnHooker.*{*;} \ No newline at end of file diff --git a/libraries/map-amap/proguard-rules.pro b/libraries/map-amap/proguard-rules.pro index f1b424510d..7ecfa157e5 100644 --- a/libraries/map-amap/proguard-rules.pro +++ b/libraries/map-amap/proguard-rules.pro @@ -19,3 +19,6 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile + +#-----library-MapAMap----- +-keep class com.mogo.map.impl.amap.hook.BnHooker.*{*;} \ No newline at end of file diff --git a/libraries/mogo-map-api/build.gradle b/libraries/mogo-map-api/build.gradle index cac5399ae1..c3702d08cf 100644 --- a/libraries/mogo-map-api/build.gradle +++ b/libraries/mogo-map-api/build.gradle @@ -15,7 +15,9 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true + zipAlignEnabled true + consumerProguardFiles 'consumer-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/libraries/mogo-map-api/consumer-rules.pro b/libraries/mogo-map-api/consumer-rules.pro index e69de29bb2..09dc3bb755 100644 --- a/libraries/mogo-map-api/consumer-rules.pro +++ b/libraries/mogo-map-api/consumer-rules.pro @@ -0,0 +1,2 @@ +#-----library-MapApi---- +-keep class com.mogo.map.search.geo.MogoRegeocodeResult.*{*;} \ No newline at end of file diff --git a/libraries/mogo-map-api/proguard-rules.pro b/libraries/mogo-map-api/proguard-rules.pro index f1b424510d..162887db27 100644 --- a/libraries/mogo-map-api/proguard-rules.pro +++ b/libraries/mogo-map-api/proguard-rules.pro @@ -19,3 +19,6 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile + +#-----library-MapApi---- +-keep class com.mogo.map.search.geo.MogoRegeocodeResult.*{*;} \ No newline at end of file diff --git a/modules/mogo-module-apps/build.gradle b/modules/mogo-module-apps/build.gradle index fa04f473f9..ad68ce796a 100644 --- a/modules/mogo-module-apps/build.gradle +++ b/modules/mogo-module-apps/build.gradle @@ -24,7 +24,9 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true + zipAlignEnabled true + consumerProguardFiles 'consumer-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/modules/mogo-module-apps/consumer-rules.pro b/modules/mogo-module-apps/consumer-rules.pro index e69de29bb2..12282873e2 100644 --- a/modules/mogo-module-apps/consumer-rules.pro +++ b/modules/mogo-module-apps/consumer-rules.pro @@ -0,0 +1 @@ +#-----AppModule----- diff --git a/modules/mogo-module-authorize/build.gradle b/modules/mogo-module-authorize/build.gradle index d4c26dedca..e386a95ef6 100644 --- a/modules/mogo-module-authorize/build.gradle +++ b/modules/mogo-module-authorize/build.gradle @@ -3,7 +3,6 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' apply plugin: 'com.alibaba.arouter' -apply plugin: 'android-aspectjx' android { compileSdkVersion rootProject.ext.android.compileSdkVersion @@ -29,7 +28,9 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true + zipAlignEnabled true + consumerProguardFiles 'consumer-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } @@ -51,7 +52,6 @@ dependencies { implementation rootProject.ext.dependencies.androidxconstraintlayout implementation rootProject.ext.dependencies.arouter kapt rootProject.ext.dependencies.aroutercompiler - implementation rootProject.ext.dependencies.aspectj if (Boolean.valueOf(RELEASE)) { implementation rootProject.ext.dependencies.mogoutils diff --git a/modules/mogo-module-authorize/consumer-rules.pro b/modules/mogo-module-authorize/consumer-rules.pro index e69de29bb2..551d2e9258 100644 --- a/modules/mogo-module-authorize/consumer-rules.pro +++ b/modules/mogo-module-authorize/consumer-rules.pro @@ -0,0 +1,2 @@ +#-----AuthorizeModule----- +-keep class com.mogo.module.authorize.module.bean.*{*;} \ No newline at end of file diff --git a/modules/mogo-module-authorize/proguard-rules.pro b/modules/mogo-module-authorize/proguard-rules.pro index f1b424510d..4cb63f1b17 100644 --- a/modules/mogo-module-authorize/proguard-rules.pro +++ b/modules/mogo-module-authorize/proguard-rules.pro @@ -19,3 +19,6 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile + +#-----AuthorizeModule----- +-keep class com.mogo.module.authorize.module.bean.*{*;} \ No newline at end of file diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/aspectj/VoiceForbiddenWhenAuthorize.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/aspectj/VoiceForbiddenWhenAuthorize.kt deleted file mode 100644 index c64cf27a3d..0000000000 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/aspectj/VoiceForbiddenWhenAuthorize.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.mogo.module.authorize.aspectj - -import org.aspectj.lang.annotation.Aspect -import org.aspectj.lang.annotation.Pointcut - -@Aspect -class VoiceForbiddenWhenAuthorize { - - companion object{ - const val TAG = "VoiceForbiddenWhenAuthorize" - } - - @Pointcut() - fun authorizeTrackPoint(){ - - } -} \ No newline at end of file diff --git a/modules/mogo-module-common/build.gradle b/modules/mogo-module-common/build.gradle index c3f39b9c50..f70ce5fcab 100644 --- a/modules/mogo-module-common/build.gradle +++ b/modules/mogo-module-common/build.gradle @@ -15,7 +15,9 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true + zipAlignEnabled true + consumerProguardFiles 'consumer-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/modules/mogo-module-common/consumer-rules.pro b/modules/mogo-module-common/consumer-rules.pro index e69de29bb2..22c03b07cd 100644 --- a/modules/mogo-module-common/consumer-rules.pro +++ b/modules/mogo-module-common/consumer-rules.pro @@ -0,0 +1,4 @@ +#-----CommonModule----- +-keep class com.mogo.module.common.entity.* +-keep class com.mogo.module.common.entity.*{*;} +-keep class com.mogo.module.common.entity.MarkerResponse.*{*;} diff --git a/modules/mogo-module-common/proguard-rules.pro b/modules/mogo-module-common/proguard-rules.pro index f1b424510d..c8815c139a 100644 --- a/modules/mogo-module-common/proguard-rules.pro +++ b/modules/mogo-module-common/proguard-rules.pro @@ -19,3 +19,8 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile + +#-----CommonModule----- +-keep class com.mogo.module.common.entity.* +-keep class com.mogo.module.common.entity.*{*;} +-keep class com.mogo.module.common.entity.MarkerResponse.*{*;} diff --git a/modules/mogo-module-event-panel/build.gradle b/modules/mogo-module-event-panel/build.gradle index 4fdf60062d..5cc5e8326b 100644 --- a/modules/mogo-module-event-panel/build.gradle +++ b/modules/mogo-module-event-panel/build.gradle @@ -25,7 +25,9 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true + zipAlignEnabled true + consumerProguardFiles 'consumer-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/modules/mogo-module-event-panel/consumer-rules.pro b/modules/mogo-module-event-panel/consumer-rules.pro index e69de29bb2..a04fddd20a 100644 --- a/modules/mogo-module-event-panel/consumer-rules.pro +++ b/modules/mogo-module-event-panel/consumer-rules.pro @@ -0,0 +1,3 @@ +#-----EventPanel------ +-keep class com.zhidao.mogo.module.event.panel.bean.*{*;} +-keep class com.zhidao.mogo.module.event.panel.dao.*{*;} \ No newline at end of file diff --git a/modules/mogo-module-event-panel/proguard-rules.pro b/modules/mogo-module-event-panel/proguard-rules.pro index 481bb43481..0916f583a9 100644 --- a/modules/mogo-module-event-panel/proguard-rules.pro +++ b/modules/mogo-module-event-panel/proguard-rules.pro @@ -18,4 +18,8 @@ # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +#-renamesourcefileattribute SourceFile + +#-----EventPanel------ +-keep class com.zhidao.mogo.module.event.panel.bean.*{*;} +-keep class com.zhidao.mogo.module.event.panel.dao.*{*;} \ No newline at end of file diff --git a/modules/mogo-module-extensions/build.gradle b/modules/mogo-module-extensions/build.gradle index 56876478a7..bbf30570dd 100644 --- a/modules/mogo-module-extensions/build.gradle +++ b/modules/mogo-module-extensions/build.gradle @@ -22,7 +22,9 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true + zipAlignEnabled true + consumerProguardFiles 'consumer-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/modules/mogo-module-extensions/consumer-rules.pro b/modules/mogo-module-extensions/consumer-rules.pro index e69de29bb2..b743349fdc 100644 --- a/modules/mogo-module-extensions/consumer-rules.pro +++ b/modules/mogo-module-extensions/consumer-rules.pro @@ -0,0 +1,2 @@ +#-----ExtensionModule----- +-keep class com.mogo.module.extensions.userinfo.UserInfoResponse.*{*;} \ No newline at end of file diff --git a/modules/mogo-module-extensions/proguard-rules.pro b/modules/mogo-module-extensions/proguard-rules.pro index f1b424510d..ca80442aa4 100644 --- a/modules/mogo-module-extensions/proguard-rules.pro +++ b/modules/mogo-module-extensions/proguard-rules.pro @@ -19,3 +19,6 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile + +#-----ExtensionModule----- +-keep class com.mogo.module.extensions.userinfo.UserInfoResponse.*{*;} \ No newline at end of file diff --git a/modules/mogo-module-gps-simulator-debug/build.gradle b/modules/mogo-module-gps-simulator-debug/build.gradle index 12fbf4774d..e9fdf98d81 100644 --- a/modules/mogo-module-gps-simulator-debug/build.gradle +++ b/modules/mogo-module-gps-simulator-debug/build.gradle @@ -21,7 +21,9 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true + zipAlignEnabled true + consumerProguardFiles 'consumer-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/modules/mogo-module-gps-simulator-debug/consumer-rules.pro b/modules/mogo-module-gps-simulator-debug/consumer-rules.pro index e69de29bb2..b5cb3815dd 100644 --- a/modules/mogo-module-gps-simulator-debug/consumer-rules.pro +++ b/modules/mogo-module-gps-simulator-debug/consumer-rules.pro @@ -0,0 +1,2 @@ +#-----GPS-DEBUG-SIMULATOR----- +-keep class com.mogo.module.gps.simulator.CationVo.*{*;} \ No newline at end of file diff --git a/modules/mogo-module-gps-simulator-debug/proguard-rules.pro b/modules/mogo-module-gps-simulator-debug/proguard-rules.pro index f1b424510d..a49a405e6a 100644 --- a/modules/mogo-module-gps-simulator-debug/proguard-rules.pro +++ b/modules/mogo-module-gps-simulator-debug/proguard-rules.pro @@ -19,3 +19,6 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile + +#-----GPS-DEBUG-SIMULATOR----- +-keep class com.mogo.module.gps.simulator.CationVo.*{*;} diff --git a/modules/mogo-module-guide/build.gradle b/modules/mogo-module-guide/build.gradle index bc18471261..ec45c26aaa 100644 --- a/modules/mogo-module-guide/build.gradle +++ b/modules/mogo-module-guide/build.gradle @@ -28,7 +28,9 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true + zipAlignEnabled true + consumerProguardFiles 'consumer-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/modules/mogo-module-main/build.gradle b/modules/mogo-module-main/build.gradle index e06cc617ba..40f32d957a 100644 --- a/modules/mogo-module-main/build.gradle +++ b/modules/mogo-module-main/build.gradle @@ -21,7 +21,9 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true + zipAlignEnabled true + consumerProguardFiles 'consumer-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/modules/mogo-module-main/consumer-rules.pro b/modules/mogo-module-main/consumer-rules.pro index e69de29bb2..bf396b0707 100644 --- a/modules/mogo-module-main/consumer-rules.pro +++ b/modules/mogo-module-main/consumer-rules.pro @@ -0,0 +1,2 @@ +#-----MainModule----- +-keep class com.mogo.module.main.cards.CardIntroduceConfig.*{*;} \ No newline at end of file diff --git a/modules/mogo-module-main/proguard-rules.pro b/modules/mogo-module-main/proguard-rules.pro index f1b424510d..41fecb124b 100644 --- a/modules/mogo-module-main/proguard-rules.pro +++ b/modules/mogo-module-main/proguard-rules.pro @@ -19,3 +19,6 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile + +#-----MainModule----- +-keep class com.mogo.module.main.cards.CardIntroduceConfig.*{*;} \ No newline at end of file diff --git a/modules/mogo-module-media/build.gradle b/modules/mogo-module-media/build.gradle index 0ddfae0634..b646098a91 100644 --- a/modules/mogo-module-media/build.gradle +++ b/modules/mogo-module-media/build.gradle @@ -22,7 +22,9 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true + zipAlignEnabled true + consumerProguardFiles 'consumer-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/modules/mogo-module-media/consumer-rules.pro b/modules/mogo-module-media/consumer-rules.pro index e69de29bb2..8504431d1b 100644 --- a/modules/mogo-module-media/consumer-rules.pro +++ b/modules/mogo-module-media/consumer-rules.pro @@ -0,0 +1,10 @@ +#-----MediaModule----- +-dontwarn com.mogo.module.media.** +-keep class com.mogo.module.media.listener.* { *; } +-keep class com.mogo.module.media.model.* { *; } +-keep class com.mogo.module.media.view.* { *; } +-keep class com.mogo.module.media.widget.* { *; } +-keep class com.mogo.module.media.api.* { *; } +-keep class com.mogo.module.media.constants.* { *; } +-keep class com.mogo.module.media.presenter.* { *; } +-keep class com.mogo.module.media.receiver.* { *; } \ No newline at end of file diff --git a/modules/mogo-module-media/proguard-rules.pro b/modules/mogo-module-media/proguard-rules.pro index 82dae0c3b9..b3de1dc352 100644 --- a/modules/mogo-module-media/proguard-rules.pro +++ b/modules/mogo-module-media/proguard-rules.pro @@ -19,12 +19,14 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile + +#-----MediaModule----- -dontwarn com.mogo.module.media.** --keep class com.mogo.module.media.listener.** { *; } --keep class com.mogo.module.media.model.** { *; } --keep class com.mogo.module.media.view.** { *; } --keep class com.mogo.module.media.widget.** { *; } --keep class com.mogo.module.media.api.** { *; } --keep class com.mogo.module.media.constants.** { *; } --keep class com.mogo.module.media.presenter.** { *; } --keep class com.mogo.module.media.receiver.** { *; } \ No newline at end of file +-keep class com.mogo.module.media.listener.* { *; } +-keep class com.mogo.module.media.model.* { *; } +-keep class com.mogo.module.media.view.* { *; } +-keep class com.mogo.module.media.widget.* { *; } +-keep class com.mogo.module.media.api.* { *; } +-keep class com.mogo.module.media.constants.* { *; } +-keep class com.mogo.module.media.presenter.* { *; } +-keep class com.mogo.module.media.receiver.* { *; } \ No newline at end of file diff --git a/modules/mogo-module-search/build.gradle b/modules/mogo-module-search/build.gradle index 53027f6e57..fb5375842c 100644 --- a/modules/mogo-module-search/build.gradle +++ b/modules/mogo-module-search/build.gradle @@ -29,7 +29,9 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true + zipAlignEnabled true + consumerProguardFiles 'consumer-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/modules/mogo-module-search/consumer-rules.pro b/modules/mogo-module-search/consumer-rules.pro index e69de29bb2..448a36ef40 100644 --- a/modules/mogo-module-search/consumer-rules.pro +++ b/modules/mogo-module-search/consumer-rules.pro @@ -0,0 +1,4 @@ +#-----SearchModule----- +-keep class com.mogo.module.navi.bean.*{*;} +-keep class com.mogo.module.navi.dao.*{*;} +-keep class com.mogo.module.navi.database.*{*;} \ No newline at end of file diff --git a/modules/mogo-module-search/proguard-rules.pro b/modules/mogo-module-search/proguard-rules.pro index f1b424510d..80452f518d 100644 --- a/modules/mogo-module-search/proguard-rules.pro +++ b/modules/mogo-module-search/proguard-rules.pro @@ -19,3 +19,8 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile + +#-----SearchModule----- +-keep class com.mogo.module.navi.bean.*{*;} +-keep class com.mogo.module.navi.dao.*{*;} +-keep class com.mogo.module.navi.database.*{*;} diff --git a/modules/mogo-module-service/build.gradle b/modules/mogo-module-service/build.gradle index 56451b4364..df5f5652fb 100644 --- a/modules/mogo-module-service/build.gradle +++ b/modules/mogo-module-service/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'com.android.library' +apply plugin: 'com.android.library' apply plugin: 'com.alibaba.arouter' android { @@ -24,7 +25,9 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true + zipAlignEnabled true + consumerProguardFiles 'consumer-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/modules/mogo-module-service/consumer-rules.pro b/modules/mogo-module-service/consumer-rules.pro index e69de29bb2..18d8776434 100644 --- a/modules/mogo-module-service/consumer-rules.pro +++ b/modules/mogo-module-service/consumer-rules.pro @@ -0,0 +1,4 @@ +#-----ServiceModule----- +-keep class com.mogo.module.service.carinfo.CarStateInfo.*{*;} +-keep class com.mogo.module.service.network.RefreshBody.*{*;} +-keep class com.mogo.module.service.network.bean.DemoUserInfoEntity.*{*;} \ No newline at end of file diff --git a/modules/mogo-module-service/proguard-rules.pro b/modules/mogo-module-service/proguard-rules.pro index f1b424510d..d09743b263 100644 --- a/modules/mogo-module-service/proguard-rules.pro +++ b/modules/mogo-module-service/proguard-rules.pro @@ -19,3 +19,8 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile + +#-----ServiceModule----- +-keep class com.mogo.module.service.carinfo.CarStateInfo.*{*;} +-keep class com.mogo.module.service.network.RefreshBody.*{*;} +-keep class com.mogo.module.service.network.bean.DemoUserInfoEntity.*{*;} \ No newline at end of file diff --git a/modules/mogo-module-share/build.gradle b/modules/mogo-module-share/build.gradle index 5a6e9d9be2..f92067fb12 100644 --- a/modules/mogo-module-share/build.gradle +++ b/modules/mogo-module-share/build.gradle @@ -24,7 +24,9 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true + zipAlignEnabled true + consumerProguardFiles 'consumer-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/modules/mogo-module-share/consumer-rules.pro b/modules/mogo-module-share/consumer-rules.pro index e69de29bb2..2aeb062b9a 100644 --- a/modules/mogo-module-share/consumer-rules.pro +++ b/modules/mogo-module-share/consumer-rules.pro @@ -0,0 +1,2 @@ +#-----ShareModule----- +-keep class com.mogo.module.share.bean.*{*;} \ No newline at end of file diff --git a/modules/mogo-module-share/proguard-rules.pro b/modules/mogo-module-share/proguard-rules.pro index f1b424510d..8afcc916d8 100644 --- a/modules/mogo-module-share/proguard-rules.pro +++ b/modules/mogo-module-share/proguard-rules.pro @@ -19,3 +19,6 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile + +#-----ShareModule----- +-keep class com.mogo.module.share.bean.*{*;} \ No newline at end of file