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-26 10:46:12 +08:00
2023-04-26 10:53:38 +08:00
2023-05-04 14:18:10 +08:00
2023-03-21 16:57:28 +08:00
2023-05-04 11:02:33 +08:00
2023-03-21 16:57:28 +08:00
2023-03-21 16:57:28 +08:00