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

 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
	app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt
	collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java
	vtm
This commit is contained in:
squallzhjch
2023-11-21 17:40:52 +08:00
56 changed files with 4534 additions and 2020 deletions

View File

@@ -64,7 +64,7 @@
<item
android:id="@+id/personal_center_menu_version"
android:icon="@drawable/ic_baseline_layers_24"
android:title="版本23QE4_V1.5.8_20231103_A" />
android:title="版本24QE1_V1.1.1_20231115_A" />
</group>
<group android:checkableBehavior="single">
<item android:title="小标题">