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)
        // 拷贝配置文件到用户目录下