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

Conflicts: vtm
2023-06-02 14:20:18 +08:00
parent e4f28405dc c643f2e08d
commit c6bf940dc4
13 changed files with 528 additions and 159 deletions
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
@@ -228,7 +228,7 @@ class LoginViewModel @Inject constructor(
            .name("OMQS.realm")
            .encryptionKey(password)
 //            .modules(Realm.getDefaultModule(), MyRealmModule())
-            .schemaVersion(1)
+            .schemaVersion(2)
            .build()
        Realm.setDefaultConfiguration(config)
        // 拷贝配置文件到用户目录下
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
@@ -111,7 +111,7 @@ class PersonalCenterFragment : BaseFragment(), FSAFActivityCallbacks {
                    viewModel.readRealmData()
                    // 定位到指定位置
                    niMapController.mMapView.vtmMap.animator()
-                        .animateTo(GeoPoint(28.724637921467508 ,115.83412668023867  ))
+                        .animateTo(GeoPoint(40.031657799200346, 116.32207834810715  ))
                }
                R.id.personal_center_menu_task_list -> {
                    findNavController().navigate(R.id.TaskManagerFragment)