解决冲突

app/src/main/java/com/navinfo/omqs/Constant.kt

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

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

@@ -36,7 +36,7 @@ class ImportOMDBHelper @AssistedInject constructor(@Assisted("context") val cont
     @Inject
     lateinit var gson: Gson
     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的配置文件

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

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