squallzhjch
eace5d2521
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/activity/map/SignAdapter.kt
app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt
app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
2023-05-04 14:18:10 +08:00
..
2023-04-12 15:07:46 +08:00
2023-05-04 14:18:10 +08:00
2023-04-23 16:35:45 +08:00
2023-04-27 13:37:20 +08:00
2023-05-04 14:10:30 +08:00
2023-04-28 16:20:31 +08:00
2023-04-19 15:40:00 +08:00