wangcongtao 233ba7b89f Merge branch 'qa_merge_shunyi_vr_map' into dev2 ...

# Conflicts:
#	config.gradle
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudLocationInfo.java
#	services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java

2021-01-26 09:26:48 +08:00

..

src/main

Merge branch 'qa_merge_shunyi_vr_map' into dev2

2021-01-26 09:26:48 +08:00

.gitignore

增加自研地图模块

2020-06-16 11:45:58 +08:00

build.gradle

opt

2021-01-25 18:42:18 +08:00

consumer-rules.pro

proguard

2021-01-04 16:29:06 +08:00

gradle.properties

add switch map logic

2020-06-17 17:56:43 +08:00

proguard-rules.pro

增加自研地图模块

2020-06-16 11:45:58 +08:00