From e34d2afe1abea4121d2279d62cd4bd9bbd0e3350 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 20 Jul 2020 17:16:53 +0800 Subject: [PATCH] .. --- app/proguard-rules.pro | 3 +++ .../mogo-base-services-sdk/consumer-rules.pro | 2 ++ .../mogo-base-services-sdk/proguard-rules.pro | 5 ++++- foudations/mogo-commons/consumer-rules.pro | 6 +++++- foudations/mogo-commons/proguard-rules.pro | 6 +++++- foudations/mogo-utils/build.gradle | 3 ++- foudations/mogo-utils/consumer-rules.pro | 5 +++++ foudations/mogo-utils/proguard-rules.pro | 6 ++++++ gradle.properties | 2 +- libraries/map-amap/consumer-rules.pro | 5 ++++- libraries/map-amap/proguard-rules.pro | 5 ++++- libraries/mogo-map-api/consumer-rules.pro | 2 +- libraries/mogo-map-api/proguard-rules.pro | 2 +- libraries/mogo-map/build.gradle | 3 ++- modules/mogo-module-apps/consumer-rules.pro | 3 +++ modules/mogo-module-apps/proguard-rules.pro | 5 +++++ modules/mogo-module-extensions/build.gradle | 1 - modules/mogo-module-extensions/consumer-rules.pro | 3 ++- modules/mogo-module-extensions/proguard-rules.pro | 3 ++- modules/mogo-module-share/build.gradle | 1 - modules/mogo-module-splash/build.gradle | 3 ++- modules/mogo-module-splash/consumer-rules.pro | 2 ++ modules/mogo-module-splash/proguard-rules.pro | 5 ++++- modules/mogo-module-v2x/consumer-rules.pro | 15 ++++++++++++++- modules/mogo-module-v2x/proguard-rules.pro | 15 ++++++++++++++- services/mogo-service-api/build.gradle | 3 ++- services/mogo-service-api/consumer-rules.pro | 2 ++ services/mogo-service-api/proguard-rules.pro | 3 +++ 28 files changed, 100 insertions(+), 19 deletions(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 30f6390485..26c8031f1c 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -308,7 +308,10 @@ -keep class com.elegant.*{*;} -keep class com.zhidao.socketsdk.*{*;} -keep class com.zhidao.ptech.*{*;} +-keep class com.zhidao.autopilotcore.*{*;} -keep class com.zhidao.autopilot.support.*{*;} +-keep class com.zhidao.voice.library.*{*;} +-keep class com.zhidao.voicesdk.*{*;} diff --git a/foudations/mogo-base-services-sdk/consumer-rules.pro b/foudations/mogo-base-services-sdk/consumer-rules.pro index e69de29bb2..e4c27a022e 100644 --- a/foudations/mogo-base-services-sdk/consumer-rules.pro +++ b/foudations/mogo-base-services-sdk/consumer-rules.pro @@ -0,0 +1,2 @@ +#-----MogoBaseServiceSdk----- +-keep class com.mogo.base.services.locationinfo.MogoLocationSource.*{*;} \ No newline at end of file diff --git a/foudations/mogo-base-services-sdk/proguard-rules.pro b/foudations/mogo-base-services-sdk/proguard-rules.pro index 481bb43481..ba8f820823 100644 --- a/foudations/mogo-base-services-sdk/proguard-rules.pro +++ b/foudations/mogo-base-services-sdk/proguard-rules.pro @@ -18,4 +18,7 @@ # 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 + +#-----MogoBaseServiceSdk----- +-keep class com.mogo.base.services.locationinfo.MogoLocationSource.*{*;} \ No newline at end of file diff --git a/foudations/mogo-commons/consumer-rules.pro b/foudations/mogo-commons/consumer-rules.pro index 89e45961cb..e4e113ccaf 100644 --- a/foudations/mogo-commons/consumer-rules.pro +++ b/foudations/mogo-commons/consumer-rules.pro @@ -1,2 +1,6 @@ #-----Foundation-Commons----- --keep class com.mogo.commons.data.BaseData.*{*;} \ No newline at end of file +-keep class com.mogo.commons.data.BaseData.*{*;} +-keep class com.mogo.commons.voice.VoiceIntentTrack +-keep class com.mogo.commons.voice.VoiceTrack +-keep class com.mogo.commons.voice.VoicePreemptType +-keep interface * implements com.mogo.commons.mvp.IView \ No newline at end of file diff --git a/foudations/mogo-commons/proguard-rules.pro b/foudations/mogo-commons/proguard-rules.pro index 31bc92ec67..c47b3c8771 100644 --- a/foudations/mogo-commons/proguard-rules.pro +++ b/foudations/mogo-commons/proguard-rules.pro @@ -21,4 +21,8 @@ #-renamesourcefileattribute SourceFile #-----Foundation-Commons----- --keep class com.mogo.commons.data.BaseData.*{*;} \ No newline at end of file +-keep class com.mogo.commons.data.BaseData.*{*;} +-keep class com.mogo.commons.voice.VoiceIntentTrack +-keep class com.mogo.commons.voice.VoiceTrack +-keep class com.mogo.commons.voice.VoicePreemptType +-keep interface * implements com.mogo.commons.mvp.IView \ No newline at end of file diff --git a/foudations/mogo-utils/build.gradle b/foudations/mogo-utils/build.gradle index bbd4970b27..eddb231727 100644 --- a/foudations/mogo-utils/build.gradle +++ b/foudations/mogo-utils/build.gradle @@ -15,7 +15,8 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true + zipAlignEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/foudations/mogo-utils/consumer-rules.pro b/foudations/mogo-utils/consumer-rules.pro index e69de29bb2..8deab7089d 100644 --- a/foudations/mogo-utils/consumer-rules.pro +++ b/foudations/mogo-utils/consumer-rules.pro @@ -0,0 +1,5 @@ +#-----MogoUtils----- +-keep class com.mogo.utils.network.CallerType +-keep class com.mogo.utils.network.CallerRestrictTo +-keep class com.mogo.utils.glide.GlideRoundedCornersTransform.CornerType +-keep class com.mogo.utils.logger.LogLevel \ No newline at end of file diff --git a/foudations/mogo-utils/proguard-rules.pro b/foudations/mogo-utils/proguard-rules.pro index f1b424510d..664ac30532 100644 --- a/foudations/mogo-utils/proguard-rules.pro +++ b/foudations/mogo-utils/proguard-rules.pro @@ -19,3 +19,9 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile + +#-----MogoUtils----- +-keep class com.mogo.utils.network.CallerType +-keep class com.mogo.utils.network.CallerRestrictTo +-keep class com.mogo.utils.glide.GlideRoundedCornersTransform.CornerType +-keep class com.mogo.utils.logger.LogLevel \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index d46ad32e32..43e8fa55ee 100644 --- a/gradle.properties +++ b/gradle.properties @@ -61,7 +61,7 @@ MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.2.1.17 # 探路 MOGO_MODULE_TANLU_VERSION=1.3.0.4-byd # 车聊聊 -CARCHATTING_VERSION=1.4.1 +CARCHATTING_VERSION=1.4.4 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.3.4 # 视频引导 diff --git a/libraries/map-amap/consumer-rules.pro b/libraries/map-amap/consumer-rules.pro index ca417b30e0..11e9ffd54b 100644 --- a/libraries/map-amap/consumer-rules.pro +++ b/libraries/map-amap/consumer-rules.pro @@ -1,2 +1,5 @@ #-----library-MapAMap----- --keep class com.mogo.map.impl.amap.hook.BnHooker.*{*;} \ No newline at end of file +-keep class com.mogo.map.impl.amap.hook.BnHooker.*{*;} +-keep class com.mogo.map.impl.amap.marker.CombineMovingPointOverlay.Status +-keep class com.mogo.map.impl.amap.navi.PathPlanningErrorCodeConstants +-keep class com.mogo.map.impl.amap.utils.MapStyleUtils.ColorEnum \ No newline at end of file diff --git a/libraries/map-amap/proguard-rules.pro b/libraries/map-amap/proguard-rules.pro index 7ecfa157e5..7959227525 100644 --- a/libraries/map-amap/proguard-rules.pro +++ b/libraries/map-amap/proguard-rules.pro @@ -21,4 +21,7 @@ #-renamesourcefileattribute SourceFile #-----library-MapAMap----- --keep class com.mogo.map.impl.amap.hook.BnHooker.*{*;} \ No newline at end of file +-keep class com.mogo.map.impl.amap.hook.BnHooker.*{*;} +-keep class com.mogo.map.impl.amap.marker.CombineMovingPointOverlay.Status +-keep class com.mogo.map.impl.amap.navi.PathPlanningErrorCodeConstants +-keep class com.mogo.map.impl.amap.utils.MapStyleUtils.ColorEnum \ No newline at end of file diff --git a/libraries/mogo-map-api/consumer-rules.pro b/libraries/mogo-map-api/consumer-rules.pro index 09dc3bb755..d62120c495 100644 --- a/libraries/mogo-map-api/consumer-rules.pro +++ b/libraries/mogo-map-api/consumer-rules.pro @@ -1,2 +1,2 @@ #-----library-MapApi---- --keep class com.mogo.map.search.geo.MogoRegeocodeResult.*{*;} \ No newline at end of file +-keep class com.mogo.map.*{*;} \ 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 162887db27..11027fe488 100644 --- a/libraries/mogo-map-api/proguard-rules.pro +++ b/libraries/mogo-map-api/proguard-rules.pro @@ -21,4 +21,4 @@ #-renamesourcefileattribute SourceFile #-----library-MapApi---- --keep class com.mogo.map.search.geo.MogoRegeocodeResult.*{*;} \ No newline at end of file +-keep class com.mogo.map.*{*;} \ No newline at end of file diff --git a/libraries/mogo-map/build.gradle b/libraries/mogo-map/build.gradle index 6cfbecae4f..f7a66b9be6 100644 --- a/libraries/mogo-map/build.gradle +++ b/libraries/mogo-map/build.gradle @@ -15,7 +15,8 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true + zipAlignEnabled true 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 12282873e2..501670623e 100644 --- a/modules/mogo-module-apps/consumer-rules.pro +++ b/modules/mogo-module-apps/consumer-rules.pro @@ -1 +1,4 @@ #-----AppModule----- +-keep class com.mogo.module.apps.model.AppEnum +-keep class com.mogo.module.apps.view.*{*;} +-keep class com.mogo.module.apps.AppFilter \ No newline at end of file diff --git a/modules/mogo-module-apps/proguard-rules.pro b/modules/mogo-module-apps/proguard-rules.pro index 8100159367..b420e37edc 100644 --- a/modules/mogo-module-apps/proguard-rules.pro +++ b/modules/mogo-module-apps/proguard-rules.pro @@ -19,3 +19,8 @@ # If you keep the line number information, uncomment this to # hide the original source file mName. #-renamesourcefileattribute SourceFile + +#-----AppModule----- +-keep class com.mogo.module.apps.model.AppEnum +-keep class com.mogo.module.apps.view.*{*;} +-keep class com.mogo.module.apps.AppFilter diff --git a/modules/mogo-module-extensions/build.gradle b/modules/mogo-module-extensions/build.gradle index bbf30570dd..8e197c0c5d 100644 --- a/modules/mogo-module-extensions/build.gradle +++ b/modules/mogo-module-extensions/build.gradle @@ -24,7 +24,6 @@ android { release { 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 b743349fdc..d4a8c4a2f0 100644 --- a/modules/mogo-module-extensions/consumer-rules.pro +++ b/modules/mogo-module-extensions/consumer-rules.pro @@ -1,2 +1,3 @@ #-----ExtensionModule----- --keep class com.mogo.module.extensions.userinfo.UserInfoResponse.*{*;} \ No newline at end of file +-keep class com.mogo.module.extensions.userinfo.UserInfoResponse.*{*;} +-keep class com.mogo.module.extensions.weather.Phenomena \ 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 ca80442aa4..1c02214c88 100644 --- a/modules/mogo-module-extensions/proguard-rules.pro +++ b/modules/mogo-module-extensions/proguard-rules.pro @@ -21,4 +21,5 @@ #-renamesourcefileattribute SourceFile #-----ExtensionModule----- --keep class com.mogo.module.extensions.userinfo.UserInfoResponse.*{*;} \ No newline at end of file +-keep class com.mogo.module.extensions.userinfo.UserInfoResponse.*{*;} +-keep class com.mogo.module.extensions.weather.Phenomena \ No newline at end of file diff --git a/modules/mogo-module-share/build.gradle b/modules/mogo-module-share/build.gradle index f92067fb12..874251d1f9 100644 --- a/modules/mogo-module-share/build.gradle +++ b/modules/mogo-module-share/build.gradle @@ -26,7 +26,6 @@ android { release { minifyEnabled true zipAlignEnabled true - consumerProguardFiles 'consumer-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/modules/mogo-module-splash/build.gradle b/modules/mogo-module-splash/build.gradle index 509929f10c..b7b39cfef0 100644 --- a/modules/mogo-module-splash/build.gradle +++ b/modules/mogo-module-splash/build.gradle @@ -25,7 +25,8 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true + zipAlignEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/modules/mogo-module-splash/consumer-rules.pro b/modules/mogo-module-splash/consumer-rules.pro index e69de29bb2..77f2669d8c 100644 --- a/modules/mogo-module-splash/consumer-rules.pro +++ b/modules/mogo-module-splash/consumer-rules.pro @@ -0,0 +1,2 @@ +#-----ModuleSplash----- +-keep class com.zhidao.mogo.module.splash.SplashConst.*{*;} \ No newline at end of file diff --git a/modules/mogo-module-splash/proguard-rules.pro b/modules/mogo-module-splash/proguard-rules.pro index 481bb43481..f64d6a4170 100644 --- a/modules/mogo-module-splash/proguard-rules.pro +++ b/modules/mogo-module-splash/proguard-rules.pro @@ -18,4 +18,7 @@ # 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 + +#-----ModuleSplash----- +-keep class com.zhidao.mogo.module.splash.SplashConst.*{*;} \ No newline at end of file diff --git a/modules/mogo-module-v2x/consumer-rules.pro b/modules/mogo-module-v2x/consumer-rules.pro index 009c7561da..7892011615 100644 --- a/modules/mogo-module-v2x/consumer-rules.pro +++ b/modules/mogo-module-v2x/consumer-rules.pro @@ -1,3 +1,16 @@ #-----V2XModule----- -keep class com.tencent.* { *; } --keep class com.mogo.module.v2x.entity.* { *; } \ No newline at end of file +-keep class com.mogo.module.v2x.entity.net.* { *; } +-keep class com.mogo.module.v2x.manager.V2XStatusDescriptor +-keep class com.mogo.module.v2x.utils.SpanUtils.Align +-keep class com.mogo.module.v2x.utils.TimeConstants.Unit +-keep interface * implements com.mogo.module.v2x.alarm.V2XAlarmServer.OnFatigueDrivingListener +-keep interface * implements com.mogo.module.v2x.listener.CarStatusListener +-keep interface * implements com.mogo.module.v2x.listener.V2XWindowStatusListener +-keep interface * implements com.mogo.module.v2x.network.V2XApiService +-keep interface * implements com.mogo.module.v2x.network.V2XRefreshCallback +-keep interface * implements com.mogo.module.v2x.scenario.view.*{*;} +-keep interface * implements com.mogo.module.v2x.scenario.IV2XScenario +-keep interface * implements com.mogo.module.v2x.scenario.IV2XScenarioManager +-keep class com.mogo.module.v2x.voice.*{*;} +-keep class com.mogo.module.v2x.V2XConst.*{*;} diff --git a/modules/mogo-module-v2x/proguard-rules.pro b/modules/mogo-module-v2x/proguard-rules.pro index ec6d67332b..f743b6f29d 100644 --- a/modules/mogo-module-v2x/proguard-rules.pro +++ b/modules/mogo-module-v2x/proguard-rules.pro @@ -22,4 +22,17 @@ #-----V2XModule----- -keep class com.tencent.* { *; } --keep class com.mogo.module.v2x.entity.* { *; } \ No newline at end of file +-keep class com.mogo.module.v2x.entity.net.* { *; } +-keep class com.mogo.module.v2x.manager.V2XStatusDescriptor +-keep class com.mogo.module.v2x.utils.SpanUtils.Align +-keep class com.mogo.module.v2x.utils.TimeConstants.Unit +-keep interface * implements com.mogo.module.v2x.alarm.V2XAlarmServer.OnFatigueDrivingListener +-keep interface * implements com.mogo.module.v2x.listener.CarStatusListener +-keep interface * implements com.mogo.module.v2x.listener.V2XWindowStatusListener +-keep interface * implements com.mogo.module.v2x.network.V2XApiService +-keep interface * implements com.mogo.module.v2x.network.V2XRefreshCallback +-keep interface * implements com.mogo.module.v2x.scenario.view.*{*;} +-keep interface * implements com.mogo.module.v2x.scenario.IV2XScenario +-keep interface * implements com.mogo.module.v2x.scenario.IV2XScenarioManager +-keep class com.mogo.module.v2x.voice.*{*;} +-keep class com.mogo.module.v2x.V2XConst.*{*;} \ No newline at end of file diff --git a/services/mogo-service-api/build.gradle b/services/mogo-service-api/build.gradle index 2f30b30043..2a970b6776 100644 --- a/services/mogo-service-api/build.gradle +++ b/services/mogo-service-api/build.gradle @@ -22,7 +22,8 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true + zipAlignEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/services/mogo-service-api/consumer-rules.pro b/services/mogo-service-api/consumer-rules.pro index e69de29bb2..d68b621f9b 100644 --- a/services/mogo-service-api/consumer-rules.pro +++ b/services/mogo-service-api/consumer-rules.pro @@ -0,0 +1,2 @@ +#-----MogoServiceApi----- +-keep class com.mogo.service.*{*;} \ No newline at end of file diff --git a/services/mogo-service-api/proguard-rules.pro b/services/mogo-service-api/proguard-rules.pro index f1b424510d..a94a2438b8 100644 --- a/services/mogo-service-api/proguard-rules.pro +++ b/services/mogo-service-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 + +#-----MogoServiceApi----- +-keep class com.mogo.service.*{*;}