Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
Conflicts: app/src/main/java/com/navinfo/omqs/Constant.kt app/src/main/java/com/navinfo/omqs/bean/OfflineMapCityBean.kt app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt app/src/main/res/layout/adapter_offline_map_city.xml
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
package com.navinfo.omqs
|
||||
|
||||
import io.realm.Realm
|
||||
|
||||
class Constant {
|
||||
companion object {
|
||||
/**
|
||||
@@ -7,7 +9,9 @@ class Constant {
|
||||
*/
|
||||
lateinit var ROOT_PATH: String
|
||||
lateinit var MAP_PATH: String
|
||||
lateinit var DATA_PATH: String
|
||||
lateinit var OFFLINE_MAP_PATH: String
|
||||
|
||||
/**
|
||||
* 服务器地址
|
||||
*/
|
||||
@@ -20,7 +24,7 @@ class Constant {
|
||||
const val message_version_right_off = "1" //立即发送
|
||||
|
||||
const val MESSAGE_PAGE_SIZE = 30 //消息列表一页最多数量
|
||||
|
||||
lateinit var realm: Realm
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user