diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 26c8031f1c..a72d1b4092 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -180,23 +180,32 @@ #----------------------------------------第三方库---------------------------------------------- #-----高德地图----- #3D 地图 V5.0.0之后: --keep class com.amap.api.maps.*{*;} --keep class com.autonavi.*{*;} --keep class com.amap.api.trace.*{*;} +-keep class com.amap.api.maps.**{*;} +-keep class com.autonavi.**{*;} +-keep class com.amap.api.trace.**{*;} #定位 --keep class com.amap.api.location.*{*;} --keep class com.amap.api.fence.*{*;} --keep class com.autonavi.aps.amapapi.model.*{*;} +-keep class com.amap.api.location.**{*;} +-keep class com.amap.api.fence.**{*;} +-keep class com.loc.**{*;} +-keep class com.autonavi.aps.amapapi.model.**{*;} #搜索 --keep class com.amap.api.services.*{*;} +-keep class com.amap.api.services.**{*;} #导航 --keep class com.amap.api.navi.*{*;} --keep class com.autonavi.*{*;} +-keep class com.amap.api.navi.**{*;} + +#内置语音 V5.6.0之后 +-keep class com.alibaba.idst.nls.**{*;} +-keep class com.google.**{*;} +-keep class com.nlspeech.nlscodec.** {*;} +-keep class com.alibaba.mit.alitts.** {*;} + +-dontwarn android.telephony.** +-keep class android.telephony.TelephonyManager$CellInfoCallback #-----Gson----- -dontwarn sun.misc.** # Application classes that will be serialized/deserialized over Gson --keep class com.google.gson.examples.android.model.* { ; } +-keep class com.google.gson.examples.android.model.** { ; } # Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory, # JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter) -keep class * extends com.google.gson.TypeAdapter @@ -209,8 +218,8 @@ } #-----ARouter----- --keep public class com.alibaba.android.arouter.routes.*{*;} --keep public class com.alibaba.android.arouter.facade.*{*;} +-keep public class com.alibaba.android.arouter.routes.**{*;} +-keep public class com.alibaba.android.arouter.facade.**{*;} -keep class * implements com.alibaba.android.arouter.facade.template.ISyringe{*;} # If you use the byType method to obtain Service, add the following rules to protect the interface: -keep interface * implements com.alibaba.android.arouter.facade.template.IProvider @@ -219,23 +228,39 @@ #-----Glide----- -keep public class * implements com.bumptech.glide.module.GlideModule --keep public class * extends com.bumptech.glide.module.AppGlideModule +-keep public class * extends com.bumptech.glide.module.AppGlideModule { + (...); +} -keep public enum com.bumptech.glide.load.ImageHeaderParser$** { **[] $VALUES; public *; } +-keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder { + *** rewind(); +} + #如果你的 target API 低于 Android API 27,请添加: -dontwarn com.bumptech.glide.load.resource.bitmap.VideoDecoder #-----Fresco----- --keep,allowobfuscation interface com.facebook.common.internal.DoNotStrip +-keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip +-keep,allowobfuscation @interface com.facebook.soloader.DoNotOptimize -keep @com.facebook.common.internal.DoNotStrip class * -keepclassmembers class * { @com.facebook.common.internal.DoNotStrip *; } +-keep @com.facebook.soloader.DoNotOptimize class * +-keepclassmembers class * { + @com.facebook.soloader.DoNotOptimize *; +} -keepclassmembers class * { native ; } + +-keep public class com.facebook.soloader.SoLoader { + public static void init(android.content.Context, int); +} + -dontwarn okio.** -dontwarn com.squareup.okhttp.** -dontwarn okhttp3.** @@ -248,8 +273,6 @@ -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. @@ -275,20 +298,25 @@ # Guarded by a NoClassDefFoundError try/catch and only used when on the classpath. -dontwarn kotlin.Unit # Top-level functions that can only be used by Kotlin. --dontwarn retrofit2.KotlinExtensions.* +-dontwarn retrofit2.KotlinExtensions +-dontwarn retrofit2.KotlinExtensions$* # With R8 full mode, it sees no subtypes of Retrofit interfaces since they are created with a Proxy # and replaces all potential values with null. Explicitly keeping the interfaces prevents this. -if interface * { @retrofit2.http.* ; } -keep,allowobfuscation interface <1> #-----ProtoBuf----- --keep class com.google.protobuf.*{*;} +-keep class com.google.protobuf.** {*;} #-----GSYVideoPlayer----- --keep class tv.danmaku.ijk.* { *; } +-keep class com.shuyu.gsyvideoplayer.video.** { *; } +-dontwarn com.shuyu.gsyvideoplayer.video.** +-keep class com.shuyu.gsyvideoplayer.video.base.** { *; } +-dontwarn com.shuyu.gsyvideoplayer.video.base.** +-keep class com.shuyu.gsyvideoplayer.utils.** { *; } +-dontwarn com.shuyu.gsyvideoplayer.utils.** +-keep class tv.danmaku.ijk.** { *; } -dontwarn tv.danmaku.ijk.** --keep class com.shuyu.gsyvideoplayer.* { *; } --dontwarn com.shuyu.gsyvideoplayer.** #-----EventBus----- -keepattributes *Annotation* @@ -302,16 +330,16 @@ } #-----ZhiDaoService----- --keep class com.zhidao.auto.platform.*{*;} --keep class com.zhidaohulian.*{*;} --keep class com.zhidao.boot.*{*;} --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.*{*;} +-keep class com.zhidao.auto.platform.**{*;} +-keep class com.zhidaohulian.**{*;} +-keep class com.zhidao.boot.**{*;} +-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/gradle.properties b/gradle.properties index 9f6e639d23..9963101c81 100644 --- a/gradle.properties +++ b/gradle.properties @@ -60,9 +60,9 @@ MOGO_MODULE_V2X_VERSION=1.2.1.20 ## 工程外部模块 # 探路 -MOGO_MODULE_TANLU_VERSION=1.3.0.10 +MOGO_MODULE_TANLU_VERSION=1.3.0.19 # 车聊聊 -CARCHATTING_VERSION=1.4.5 +CARCHATTING_VERSION=1.4.6 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.3.4 # 视频引导 @@ -79,7 +79,7 @@ MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.6 # 广告资源位 MOGO_MODULE_AD_CARD_VERSION=1.0.1 # 探路上报和分享模块 -TANLULIB_VERSION=1.3.0.10 +TANLULIB_VERSION=1.3.0.19 MOGO_MODULE_EVENT_PANEL_VERSION = 1.0.0-SNAPSHOT MOGO_MODULE_EVENT_PANEL_NOOP_VERSION = 1.0.0-SNAPSHOT #左侧面板模块 diff --git a/libraries/mogo-map-api/consumer-rules.pro b/libraries/mogo-map-api/consumer-rules.pro index d62120c495..0bd44f06e8 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.*{*;} \ 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 11027fe488..9ce36f6363 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.*{*;} \ No newline at end of file +-keep class com.mogo.map.**{*;} \ No newline at end of file diff --git a/modules/mogo-module-apps/consumer-rules.pro b/modules/mogo-module-apps/consumer-rules.pro index 501670623e..aad1b810ba 100644 --- a/modules/mogo-module-apps/consumer-rules.pro +++ b/modules/mogo-module-apps/consumer-rules.pro @@ -1,4 +1,4 @@ #-----AppModule----- -keep class com.mogo.module.apps.model.AppEnum --keep class com.mogo.module.apps.view.*{*;} +-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 b420e37edc..66c1a6013a 100644 --- a/modules/mogo-module-apps/proguard-rules.pro +++ b/modules/mogo-module-apps/proguard-rules.pro @@ -22,5 +22,5 @@ #-----AppModule----- -keep class com.mogo.module.apps.model.AppEnum --keep class com.mogo.module.apps.view.*{*;} +-keep class com.mogo.module.apps.view.** {*;} -keep class com.mogo.module.apps.AppFilter diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java index af515b21b9..fbaae3255b 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java @@ -47,6 +47,24 @@ public class AppsListActivity extends MvpActivity< AppsListView, AppsListPresent AppServiceHandler.getApis().getStatusManagerApi().setAppListUIShow( TAG, true ); } + @Override + protected void onStart() { + super.onStart(); + try { + AppServiceHandler.getApis().getAdasControllerApi().closeADAS(); + } catch ( Exception e ) { + } + } + + @Override + protected void onRestart() { + super.onRestart(); + try { + AppServiceHandler.getApis().getAdasControllerApi().closeADAS(); + } catch ( Exception e ) { + } + } + @Override protected int getLayoutId() { return R.layout.module_apps_activity_list; diff --git a/modules/mogo-module-authorize/consumer-rules.pro b/modules/mogo-module-authorize/consumer-rules.pro index 551d2e9258..5668c1b3ca 100644 --- a/modules/mogo-module-authorize/consumer-rules.pro +++ b/modules/mogo-module-authorize/consumer-rules.pro @@ -1,2 +1,2 @@ #-----AuthorizeModule----- --keep class com.mogo.module.authorize.module.bean.*{*;} \ No newline at end of file +-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 4cb63f1b17..ff909a2e24 100644 --- a/modules/mogo-module-authorize/proguard-rules.pro +++ b/modules/mogo-module-authorize/proguard-rules.pro @@ -21,4 +21,4 @@ #-renamesourcefileattribute SourceFile #-----AuthorizeModule----- --keep class com.mogo.module.authorize.module.bean.*{*;} \ No newline at end of file +-keep class com.mogo.module.authorize.module.bean.**{*;} \ No newline at end of file diff --git a/modules/mogo-module-back/consumer-rules.pro b/modules/mogo-module-back/consumer-rules.pro index e69de29bb2..6c2f414424 100644 --- a/modules/mogo-module-back/consumer-rules.pro +++ b/modules/mogo-module-back/consumer-rules.pro @@ -0,0 +1,2 @@ +#-----ModuleBack----- +-keep class com.mogo.module.back.BackToLauncherConst.*{*;} \ No newline at end of file diff --git a/modules/mogo-module-back/proguard-rules.pro b/modules/mogo-module-back/proguard-rules.pro index f1b424510d..af838595ca 100644 --- a/modules/mogo-module-back/proguard-rules.pro +++ b/modules/mogo-module-back/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 + +#-----ModuleBack----- +-keep class com.mogo.module.back.BackToLauncherConst.*{*;} \ No newline at end of file diff --git a/modules/mogo-module-common/consumer-rules.pro b/modules/mogo-module-common/consumer-rules.pro index 22c03b07cd..9bcd20fb1c 100644 --- a/modules/mogo-module-common/consumer-rules.pro +++ b/modules/mogo-module-common/consumer-rules.pro @@ -1,4 +1,8 @@ #-----CommonModule----- --keep class com.mogo.module.common.entity.* --keep class com.mogo.module.common.entity.*{*;} --keep class com.mogo.module.common.entity.MarkerResponse.*{*;} +-keep class com.mogo.module.common.entity.** {*;} +-keep class com.mogo.module.common.map.Interrupter +-keep class com.mogo.module.common.map.Scene +-keep class com.mogo.module.common.wm.** {*;} +-keep class com.mogo.module.common.ModuleNames +-keep class com.mogo.module.common.ModuleType +-keep class com.mogo.module.common.MogoModulePaths \ No newline at end of file diff --git a/modules/mogo-module-common/proguard-rules.pro b/modules/mogo-module-common/proguard-rules.pro index c8815c139a..cd20bd521c 100644 --- a/modules/mogo-module-common/proguard-rules.pro +++ b/modules/mogo-module-common/proguard-rules.pro @@ -21,6 +21,8 @@ #-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.*{*;} +-keep class com.mogo.module.common.entity.** {*;} +-keep class com.mogo.module.common.map.Interrupter +-keep class com.mogo.module.common.map.Scene +-keep class com.mogo.module.common.wm.** {*;} +-keep class com.mogo.module.common.MogoModulePaths diff --git a/modules/mogo-module-event-panel-noop/consumer-rules.pro b/modules/mogo-module-event-panel-noop/consumer-rules.pro index e69de29bb2..da191c00b8 100644 --- a/modules/mogo-module-event-panel-noop/consumer-rules.pro +++ b/modules/mogo-module-event-panel-noop/consumer-rules.pro @@ -0,0 +1 @@ +-keep class com.zhidao.mogo.module.event.panel.EventPanelConstants \ No newline at end of file diff --git a/modules/mogo-module-event-panel-noop/proguard-rules.pro b/modules/mogo-module-event-panel-noop/proguard-rules.pro index 481bb43481..58b6896c9d 100644 --- a/modules/mogo-module-event-panel-noop/proguard-rules.pro +++ b/modules/mogo-module-event-panel-noop/proguard-rules.pro @@ -18,4 +18,6 @@ # 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 + +-keep class com.zhidao.mogo.module.event.panel.EventPanelConstants \ No newline at end of file diff --git a/modules/mogo-module-event-panel/consumer-rules.pro b/modules/mogo-module-event-panel/consumer-rules.pro index a04fddd20a..6cd2a10967 100644 --- a/modules/mogo-module-event-panel/consumer-rules.pro +++ b/modules/mogo-module-event-panel/consumer-rules.pro @@ -1,3 +1,5 @@ #-----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 +-keep class com.zhidao.mogo.module.event.panel.bean.** {*;} +-keep class com.zhidao.mogo.module.event.panel.dao.** {*;} +-keep class com.zhidao.mogo.module.event.panel.listener.** {*;} +-keep class com.zhidao.mogo.module.event.panel.EventPanelConstants \ 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 0916f583a9..e778de0a5a 100644 --- a/modules/mogo-module-event-panel/proguard-rules.pro +++ b/modules/mogo-module-event-panel/proguard-rules.pro @@ -21,5 +21,7 @@ #-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 +-keep class com.zhidao.mogo.module.event.panel.bean.** {*;} +-keep class com.zhidao.mogo.module.event.panel.dao.** {*;} +-keep class com.zhidao.mogo.module.event.panel.listener.** {*;} +-keep class com.zhidao.mogo.module.event.panel.EventPanelConstants \ No newline at end of file diff --git a/modules/mogo-module-extensions/consumer-rules.pro b/modules/mogo-module-extensions/consumer-rules.pro index a973ad4250..1c0a524d78 100644 --- a/modules/mogo-module-extensions/consumer-rules.pro +++ b/modules/mogo-module-extensions/consumer-rules.pro @@ -1,5 +1,8 @@ #-----ExtensionModule----- --keep class com.mogo.module.extensions.userinfo.*{*;} +-keep class com.mogo.module.extensions.userinfo.**{*;} -keep class com.mogo.module.extensions.weather.Phenomena +-keep class com.mogo.module.extensions.weather.WeatherCallback -keep interface com.mogo.module.extensions.net.UserInfoNetApiServices --keep class com.mogo.module.extensions.utils.TopViewAnimHelper \ No newline at end of file +-keep class com.mogo.module.extensions.utils.TopViewAnimHelper +-keep class com.mogo.module.extensions.ExtensionsView +-keep class com.mogo.module.extensions.ExtensionsModuleConst \ 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 48ec89a228..83112829d5 100644 --- a/modules/mogo-module-extensions/proguard-rules.pro +++ b/modules/mogo-module-extensions/proguard-rules.pro @@ -21,7 +21,10 @@ #-renamesourcefileattribute SourceFile #-----ExtensionModule----- --keep class com.mogo.module.extensions.userinfo.*{*;} +-keep class com.mogo.module.extensions.userinfo.**{*;} -keep class com.mogo.module.extensions.weather.Phenomena +-keep class com.mogo.module.extensions.weather.WeatherCallback -keep interface com.mogo.module.extensions.net.UserInfoNetApiServices --keep class com.mogo.module.extensions.utils.TopViewAnimHelper \ No newline at end of file +-keep class com.mogo.module.extensions.utils.TopViewAnimHelper +-keep class com.mogo.module.extensions.ExtensionsView +-keep class com.mogo.module.extensions.ExtensionsModuleConst \ No newline at end of file diff --git a/modules/mogo-module-gps-simulator/consumer-rules.pro b/modules/mogo-module-gps-simulator/consumer-rules.pro index e69de29bb2..fd85bbf010 100644 --- a/modules/mogo-module-gps-simulator/consumer-rules.pro +++ b/modules/mogo-module-gps-simulator/consumer-rules.pro @@ -0,0 +1,2 @@ +#-----MogoGSPSimulator----- +-keep class com.mogo.module.gps.simulator.GpsSimulatorConstants \ No newline at end of file diff --git a/modules/mogo-module-gps-simulator/proguard-rules.pro b/modules/mogo-module-gps-simulator/proguard-rules.pro index f1b424510d..5ee323b27c 100644 --- a/modules/mogo-module-gps-simulator/proguard-rules.pro +++ b/modules/mogo-module-gps-simulator/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 + +#-----MogoGSPSimulator----- +-keep class com.mogo.module.gps.simulator.GpsSimulatorConstants diff --git a/modules/mogo-module-left-panel-noop/consumer-rules.pro b/modules/mogo-module-left-panel-noop/consumer-rules.pro index e69de29bb2..f18321e8e7 100644 --- a/modules/mogo-module-left-panel-noop/consumer-rules.pro +++ b/modules/mogo-module-left-panel-noop/consumer-rules.pro @@ -0,0 +1,2 @@ +#-----ModuleLeftPanel----- +-keep class com.zhidao.mogo.module.left.panel.LeftPanelConst \ No newline at end of file diff --git a/modules/mogo-module-left-panel-noop/proguard-rules.pro b/modules/mogo-module-left-panel-noop/proguard-rules.pro index 481bb43481..9e43f5c7e6 100644 --- a/modules/mogo-module-left-panel-noop/proguard-rules.pro +++ b/modules/mogo-module-left-panel-noop/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 + +#-----ModuleLeftPanel----- +-keep class com.zhidao.mogo.module.left.panel.LeftPanelConst \ No newline at end of file diff --git a/modules/mogo-module-left-panel/consumer-rules.pro b/modules/mogo-module-left-panel/consumer-rules.pro index e69de29bb2..f18321e8e7 100644 --- a/modules/mogo-module-left-panel/consumer-rules.pro +++ b/modules/mogo-module-left-panel/consumer-rules.pro @@ -0,0 +1,2 @@ +#-----ModuleLeftPanel----- +-keep class com.zhidao.mogo.module.left.panel.LeftPanelConst \ No newline at end of file diff --git a/modules/mogo-module-left-panel/proguard-rules.pro b/modules/mogo-module-left-panel/proguard-rules.pro index 481bb43481..9e43f5c7e6 100644 --- a/modules/mogo-module-left-panel/proguard-rules.pro +++ b/modules/mogo-module-left-panel/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 + +#-----ModuleLeftPanel----- +-keep class com.zhidao.mogo.module.left.panel.LeftPanelConst \ No newline at end of file diff --git a/modules/mogo-module-main/consumer-rules.pro b/modules/mogo-module-main/consumer-rules.pro index bf396b0707..e5fa092e14 100644 --- a/modules/mogo-module-main/consumer-rules.pro +++ b/modules/mogo-module-main/consumer-rules.pro @@ -1,2 +1,9 @@ #-----MainModule----- --keep class com.mogo.module.main.cards.CardIntroduceConfig.*{*;} \ No newline at end of file +-keep class com.mogo.module.main.cards.CardIntroduceConfig.*{*;} +-keep class com.mogo.module.main.cards.MogoModulesHandler +-keep class com.mogo.module.main.cards.HorizentalBaseTransformer +-keep class com.mogo.module.main.cards.VerticalBaseTransformer +-keep class com.mogo.module.main.constants.**{*;} +-keep class com.mogo.module.main.livedata.**{*;} +-keep class com.mogo.module.main.service.MogoMainService +-keep class com.mogo.module.main.windowview.IWindowViewHandler \ 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 41fecb124b..8cb438dc4b 100644 --- a/modules/mogo-module-main/proguard-rules.pro +++ b/modules/mogo-module-main/proguard-rules.pro @@ -21,4 +21,11 @@ #-renamesourcefileattribute SourceFile #-----MainModule----- --keep class com.mogo.module.main.cards.CardIntroduceConfig.*{*;} \ No newline at end of file +-keep class com.mogo.module.main.cards.CardIntroduceConfig.*{*;} +-keep class com.mogo.module.main.cards.MogoModulesHandler +-keep class com.mogo.module.main.cards.HorizentalBaseTransformer +-keep class com.mogo.module.main.cards.VerticalBaseTransformer +-keep class com.mogo.module.main.constants.**{*;} +-keep class com.mogo.module.main.livedata.**{*;} +-keep class com.mogo.module.main.service.MogoMainService +-keep class com.mogo.module.main.windowview.IWindowViewHandler \ No newline at end of file diff --git a/modules/mogo-module-map/consumer-rules.pro b/modules/mogo-module-map/consumer-rules.pro index e69de29bb2..016baa21f6 100644 --- a/modules/mogo-module-map/consumer-rules.pro +++ b/modules/mogo-module-map/consumer-rules.pro @@ -0,0 +1,2 @@ +#-----ModuleMap----- +-keep class com.mogo.module.map.NavConstants \ No newline at end of file diff --git a/modules/mogo-module-map/proguard-rules.pro b/modules/mogo-module-map/proguard-rules.pro index f1b424510d..707fa663b8 100644 --- a/modules/mogo-module-map/proguard-rules.pro +++ b/modules/mogo-module-map/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 + +#-----ModuleMap----- +-keep class com.mogo.module.map.NavConstants diff --git a/modules/mogo-module-media/consumer-rules.pro b/modules/mogo-module-media/consumer-rules.pro index 8504431d1b..4e16a57537 100644 --- a/modules/mogo-module-media/consumer-rules.pro +++ b/modules/mogo-module-media/consumer-rules.pro @@ -1,10 +1,13 @@ #-----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.** { *; } +-keep class com.mogo.module.media.utils.OnBitmapToLocalListener +-keep class com.mogo.module.media.utils.OnCompressListener +-keep class com.mogo.module.media.MediaConstants \ 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 b3de1dc352..0d676ccbbf 100644 --- a/modules/mogo-module-media/proguard-rules.pro +++ b/modules/mogo-module-media/proguard-rules.pro @@ -22,11 +22,14 @@ #-----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.** { *; } +-keep class com.mogo.module.media.utils.OnBitmapToLocalListener +-keep class com.mogo.module.media.utils.OnCompressListener +-keep class com.mogo.module.media.MediaConstants \ No newline at end of file diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java index 8be84e1222..75a89e1734 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java @@ -273,6 +273,8 @@ public class MediaWindow2 implements IMusicView { @Override public void onAppExit() { - mWindowView.setVisibility(View.GONE); + if ( mWindowView != null ) { + mWindowView.setVisibility(View.GONE); + } } } diff --git a/modules/mogo-module-search/consumer-rules.pro b/modules/mogo-module-search/consumer-rules.pro index 448a36ef40..830135631c 100644 --- a/modules/mogo-module-search/consumer-rules.pro +++ b/modules/mogo-module-search/consumer-rules.pro @@ -1,4 +1,8 @@ #-----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 +-keep class com.mogo.module.navi.bean.**{*;} +-keep class com.mogo.module.navi.constants.**{*;} +-keep class com.mogo.module.navi.dao.**{*;} +-keep class com.mogo.module.navi.database.**{*;} +-keep class * extends com.mogo.module.navi.cp.PersonalInfoManager{ + public static final ; +} diff --git a/modules/mogo-module-search/proguard-rules.pro b/modules/mogo-module-search/proguard-rules.pro index 80452f518d..7b0b77e021 100644 --- a/modules/mogo-module-search/proguard-rules.pro +++ b/modules/mogo-module-search/proguard-rules.pro @@ -21,6 +21,10 @@ #-renamesourcefileattribute SourceFile #-----SearchModule----- --keep class com.mogo.module.navi.bean.*{*;} --keep class com.mogo.module.navi.dao.*{*;} --keep class com.mogo.module.navi.database.*{*;} +-keep class com.mogo.module.navi.bean.**{*;} +-keep class com.mogo.module.navi.constants.**{*;} +-keep class com.mogo.module.navi.dao.**{*;} +-keep class com.mogo.module.navi.database.**{*;} +-keep class * extends com.mogo.module.navi.cp.PersonalInfoManager{ + public static final ; +} \ No newline at end of file diff --git a/modules/mogo-module-service/consumer-rules.pro b/modules/mogo-module-service/consumer-rules.pro index 18d8776434..06d4b04e1d 100644 --- a/modules/mogo-module-service/consumer-rules.pro +++ b/modules/mogo-module-service/consumer-rules.pro @@ -1,4 +1,13 @@ #-----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 +-keep class com.mogo.module.service.network.bean.DemoUserInfoEntity.*{*;} +-keep interface com.mogo.module.service.intent.IntentHandler +-keep interface com.mogo.module.service.marker.IMarkerView +-keep interface com.mogo.module.service.network.RefreshApiService +-keep interface com.mogo.module.service.network.RefreshCallback +-keep interface com.mogo.module.service.network.bean.DemoUserInfoEntity +-keep class com.mogo.module.service.strategy.CarIconDisplayStrategy{ + public static final ; + } + -keep class com.mogo.module.service.ServiceConst \ 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 d09743b263..02a339ca47 100644 --- a/modules/mogo-module-service/proguard-rules.pro +++ b/modules/mogo-module-service/proguard-rules.pro @@ -23,4 +23,13 @@ #-----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 +-keep class com.mogo.module.service.network.bean.DemoUserInfoEntity.*{*;} +-keep interface com.mogo.module.service.intent.IntentHandler +-keep interface com.mogo.module.service.marker.IMarkerView +-keep interface com.mogo.module.service.network.RefreshApiService +-keep interface com.mogo.module.service.network.RefreshCallback +-keep interface com.mogo.module.service.network.bean.DemoUserInfoEntity +-keep class com.mogo.module.service.strategy.CarIconDisplayStrategy{ + public static final ; +} +-keep class com.mogo.module.service.ServiceConst \ No newline at end of file diff --git a/modules/mogo-module-share/consumer-rules.pro b/modules/mogo-module-share/consumer-rules.pro index 2aeb062b9a..3cae82b2c2 100644 --- a/modules/mogo-module-share/consumer-rules.pro +++ b/modules/mogo-module-share/consumer-rules.pro @@ -1,2 +1,5 @@ #-----ShareModule----- --keep class com.mogo.module.share.bean.*{*;} \ No newline at end of file +-keep class com.mogo.module.share.bean.**{*;} +-keep class com.mogo.module.share.constant.**{*;} +-keep class com.mogo.module.share.manager.ISeekHelpListener +-keep class com.mogo.module.share.net.ShareApiService diff --git a/modules/mogo-module-share/proguard-rules.pro b/modules/mogo-module-share/proguard-rules.pro index 8afcc916d8..b436d973dd 100644 --- a/modules/mogo-module-share/proguard-rules.pro +++ b/modules/mogo-module-share/proguard-rules.pro @@ -21,4 +21,7 @@ #-renamesourcefileattribute SourceFile #-----ShareModule----- --keep class com.mogo.module.share.bean.*{*;} \ No newline at end of file +-keep class com.mogo.module.share.bean.**{*;} +-keep class com.mogo.module.share.constant.**{*;} +-keep class com.mogo.module.share.manager.ISeekHelpListener +-keep class com.mogo.module.share.net.ShareApiService \ No newline at end of file diff --git a/modules/mogo-module-splash-noop/consumer-rules.pro b/modules/mogo-module-splash-noop/consumer-rules.pro index e69de29bb2..880adfb994 100644 --- a/modules/mogo-module-splash-noop/consumer-rules.pro +++ b/modules/mogo-module-splash-noop/consumer-rules.pro @@ -0,0 +1 @@ +-keep class com.zhidao.mogo.module.splash.BydConst \ No newline at end of file diff --git a/modules/mogo-module-splash-noop/proguard-rules.pro b/modules/mogo-module-splash-noop/proguard-rules.pro index 481bb43481..f5e721d80f 100644 --- a/modules/mogo-module-splash-noop/proguard-rules.pro +++ b/modules/mogo-module-splash-noop/proguard-rules.pro @@ -18,4 +18,6 @@ # 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 + +-keep class com.zhidao.mogo.module.splash.BydConst \ 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 7892011615..d35f77a3fa 100644 --- a/modules/mogo-module-v2x/consumer-rules.pro +++ b/modules/mogo-module-v2x/consumer-rules.pro @@ -1,6 +1,6 @@ #-----V2XModule----- --keep class com.tencent.* { *; } --keep class com.mogo.module.v2x.entity.net.* { *; } +-keep class com.tencent.** { *; } +-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 @@ -9,8 +9,9 @@ -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.view.**{*;} +-keep interface * implements com.mogo.module.v2x.scenario.impl.**{*;} -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.*{*;} +-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 f743b6f29d..c7797fa760 100644 --- a/modules/mogo-module-v2x/proguard-rules.pro +++ b/modules/mogo-module-v2x/proguard-rules.pro @@ -21,8 +21,8 @@ #-renamesourcefileattribute SourceFile #-----V2XModule----- --keep class com.tencent.* { *; } --keep class com.mogo.module.v2x.entity.net.* { *; } +-keep class com.tencent.** { *; } +-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 @@ -31,8 +31,9 @@ -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.view.**{*;} +-keep interface * implements com.mogo.module.v2x.scenario.impl.**{*;} -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 +-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/consumer-rules.pro b/services/mogo-service-api/consumer-rules.pro index d68b621f9b..8d7cbb31a6 100644 --- a/services/mogo-service-api/consumer-rules.pro +++ b/services/mogo-service-api/consumer-rules.pro @@ -1,2 +1,2 @@ #-----MogoServiceApi----- --keep class com.mogo.service.*{*;} \ No newline at end of file +-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 a94a2438b8..200f328484 100644 --- a/services/mogo-service-api/proguard-rules.pro +++ b/services/mogo-service-api/proguard-rules.pro @@ -21,4 +21,4 @@ #-renamesourcefileattribute SourceFile #-----MogoServiceApi----- --keep class com.mogo.service.*{*;} +-keep class com.mogo.service.** {*;}