donghongyu 9b59c2a8f1 Merge branch 'master' into dev_MogoAP_eagle-220_211207_8.0.17 ...

# Conflicts:
#	gradle.properties
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/IdentifyDataDrawer.java

2022-01-14 14:49:29 +08:00

..

java/com/mogo/module/main

Merge branch 'master' into dev_MogoAP_eagle-220_211207_8.0.17

2022-01-14 14:49:29 +08:00

res

[Delete]

2021-12-20 17:01:20 +08:00

AndroidManifest.xml

[Fix]

2022-01-05 18:28:43 +08:00

module-configs.json

dev

2019-12-30 16:35:51 +08:00