squallzhjch 6c386505d6 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS ...

 Conflicts:

	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt

	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt

	app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt

	collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt

2023-07-21 15:30:20 +08:00

..

androidTest/java/com/navinfo/collect/library

创建工程

2023-03-21 17:06:56 +08:00

main

Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

2023-07-21 15:30:20 +08:00

test/java/com/navinfo/collect/library

创建工程

2023-03-21 17:06:56 +08:00