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

 Conflicts:

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

app/src/main/res/layout/activity_main.xml

@@ -284,8 +284,8 @@
             android:id="@+id/main_activity_location"
             style="@style/zoom_btns_style"
             android:layout_marginBottom="12dp"
-            android:onClick="@{()->viewModel.onClickLocationButton()}"
-            android:src="@drawable/icon_location"
+            android:onClick="@{()->mainActivity.onClickLocation()}"
+            android:src="@drawable/icon_location_north"
             app:layout_constraintBottom_toTopOf="@id/main_activity_map_update"
             app:layout_constraintRight_toRightOf="@id/main_activity_map_update" />
 

app/src/main/res/layout/fragment_note.xml

@@ -41,7 +41,7 @@
         android:layout_marginRight="5dp"
         android:background="@color/transparent"
         android:src="@drawable/icon_delete"
-        app:layout_constraintRight_toLeftOf="@id/note_bar_cancel"
+        app:layout_constraintRight_toLeftOf="@id/note_bar_save"
         app:layout_constraintTop_toTopOf="@id/note_bar_save" />
 
     <androidx.core.widget.NestedScrollView

app/src/main/res/menu/personal_center_menu.xml

@@ -36,26 +36,29 @@
             android:visible="false"
             android:icon="@drawable/ic_baseline_sim_card_download_24"
             android:title="备份数据" />
+        <item
+            android:id="@+id/personal_center_menu_open_auto_location"
+            android:icon="@drawable/baseline_person_24"
+            android:visible="true"
+            android:title="开启10S自动定位" />
+        <item
+            android:id="@+id/personal_center_menu_rotate_over_look"
+            android:icon="@drawable/baseline_person_24"
+            android:visible="true"
+            android:title="锁定地图旋转及视角" />
+        <item
+            android:id="@+id/personal_center_menu_catch_all"
+            android:icon="@drawable/baseline_person_24"
+            android:visible="true"
+            android:title="全要素捕捉" />
         <item
             android:id="@+id/personal_center_menu_version"
             android:icon="@drawable/ic_baseline_layers_24"
-            android:title="版本：ONE_23QE4_V1.5.0_20230904_A" />
+            android:title="版本：23QE4_V1.5.0_20230912_A" />
     </group>
     <group android:checkableBehavior="single">
         <item android:title="小标题">
             <menu>
-                <item
-                    android:id="@+id/personal_center_menu_open_auto_location"
-                    android:icon="@drawable/baseline_person_24"
-                    android:visible="true"
-                    android:title="开启自动定位" />
-
-                <item
-                    android:id="@+id/personal_center_menu_close_auto_location"
-                    android:icon="@drawable/baseline_person_24"
-                    android:visible="true"
-                    android:title="关闭自动定位" />
-
                 <item
                     android:id="@+id/personal_center_menu_open_all_layer"
                     android:icon="@drawable/baseline_person_24"