Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
tongchenfei
2020-07-22 17:55:28 +08:00
314 changed files with 1125 additions and 1109 deletions

View File

@@ -15,9 +15,7 @@ android {
buildTypes {
release {
minifyEnabled true
zipAlignEnabled true
consumerProguardFiles 'consumer-rules.pro'
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}

View File

@@ -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

View File

@@ -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