xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
qiji4215 2023-04-24 16:29:53 +08:00
parent 123583652c
commit 07a6227e7d
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/navinfo/omqs/Constant.kt
View File

@ -20,7 +20,7 @@ class Constant {
lateinit var DATA_PATH: String lateinit var DATA_PATH: String
/** /**
* 用户id * 当前用户ID
*/ */
lateinit var USER_ID: String lateinit var USER_ID: String
@ -32,11 +32,6 @@ class Constant {
*/ */
lateinit var USER_DATA_PATH: String lateinit var USER_DATA_PATH: String
/**
* 当前用户ID
*/
lateinit var CURRENT_USER_ID: String
/** /**
* 离线地图目录 * 离线地图目录
*/ */

2
app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
View File

@ -36,7 +36,7 @@ class ImportOMDBHelper @AssistedInject constructor(@Assisted("context") val cont
@Inject @Inject
lateinit var gson: Gson lateinit var gson: Gson
private val database by lazy { omdbHiltFactory.obtainOmdbDataBaseHelper(context, omdbFile.absolutePath, 1).writableDatabase } private val database by lazy { omdbHiltFactory.obtainOmdbDataBaseHelper(context, omdbFile.absolutePath, 1).writableDatabase }
private val configFile: File = File("${Constant.DATA_PATH}/${Constant.CURRENT_USER_ID}", Constant.OMDB_CONFIG) private val configFile: File = File("${Constant.DATA_PATH}/${Constant.USER_ID}", Constant.OMDB_CONFIG)
/** /**
* 读取config的配置文件 * 读取config的配置文件

1
app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
View File

@ -160,7 +160,6 @@ class LoginViewModel @Inject constructor(
Constant.USER_DATA_PATH = Constant.DATA_PATH + Constant.USER_ID + "/" + Constant.VERSION_ID Constant.USER_DATA_PATH = Constant.DATA_PATH + Constant.USER_ID + "/" + Constant.VERSION_ID
// 在SD卡创建用户目录，解压资源等 // 在SD卡创建用户目录，解压资源等
val userFolder = File("${Constant.DATA_PATH}/${userId}") val userFolder = File("${Constant.DATA_PATH}/${userId}")
Constant.CURRENT_USER_ID = userId
// 初始化Realm // 初始化Realm
Realm.init(context.applicationContext) Realm.init(context.applicationContext)
val password = "encryp".encodeToByteArray().copyInto(ByteArray(64)) val password = "encryp".encodeToByteArray().copyInto(ByteArray(64))