Merge branch 'master' of https://gitlab.navinfo.com/qiji4215/OneMapQS
Conflicts: collect-library/src/main/java/com/navinfo/collect/library/map/handler/AnimationHandler.kt
This commit is contained in:
@@ -2,7 +2,6 @@ package com.navinfo.omqs
|
||||
|
||||
import android.app.Application
|
||||
import android.util.Log
|
||||
import com.navinfo.omqs.db.MyRealmModule
|
||||
import com.navinfo.omqs.tools.FileManager
|
||||
import com.navinfo.omqs.ui.manager.TakePhotoManager
|
||||
import com.navinfo.omqs.util.NetUtils
|
||||
@@ -33,7 +32,7 @@ class OMQSApplication : Application() {
|
||||
.directory(File(Constant.DATA_PATH))
|
||||
.name("OMQS.realm")
|
||||
.encryptionKey(password)
|
||||
.modules(Realm.getDefaultModule(), MyRealmModule())
|
||||
// .modules(Realm.getDefaultModule(), MyRealmModule())
|
||||
.schemaVersion(1)
|
||||
.build()
|
||||
Realm.setDefaultConfiguration(config)
|
||||
|
||||
@@ -2,6 +2,6 @@ package com.navinfo.omqs.db
|
||||
|
||||
import com.navinfo.collect.library.data.entity.QsRecordBean
|
||||
|
||||
@io.realm.annotations.RealmModule(classes = [QsRecordBean::class])
|
||||
class MyRealmModule {
|
||||
}
|
||||
//@io.realm.annotations.RealmModule(classes = [QsRecordBean::class])
|
||||
//class MyRealmModule {
|
||||
//}
|
||||
Reference in New Issue
Block a user