Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS

 Conflicts:

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

	app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt

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

@@ -7,6 +7,7 @@ import android.widget.Toast
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.blankj.utilcode.util.ResourceUtils
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.bean.LoginUserBean
 import com.navinfo.omqs.db.RoomAppDatabase
@@ -158,19 +159,26 @@ class LoginViewModel @Inject constructor(
         Constant.VERSION_ID = userId
         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))
         // 656e6372797000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
         Log.d("OMQSApplication", "密码是： ${byteArrayToHexString(password)}")
         val config = RealmConfiguration.Builder()
-            .directory(File("${Constant.DATA_PATH}/${userId}"))
+            .directory(userFolder)
             .name("OMQS.realm")
             .encryptionKey(password)
 //            .modules(Realm.getDefaultModule(), MyRealmModule())
             .schemaVersion(1)
             .build()
         Realm.setDefaultConfiguration(config)
+        // 拷贝配置文件到用户目录下
+        val omdbConfigFile = File(userFolder.absolutePath, Constant.OMDB_CONFIG);
+        if (!omdbConfigFile.exists()) {
+            ResourceUtils.copyFileFromAssets(Constant.OMDB_CONFIG, omdbConfigFile.absolutePath)
+        }
     }
 
     /**

app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt

@@ -38,7 +38,7 @@ class MainViewModel @Inject constructor(
     private var niLocationList: MutableList<NiLocation> = ArrayList<NiLocation>()
 
     init {
-        mapController.layerManagerHandler.setOnQsRecordItemClickListener(object :
+        mapController.markerHandle.setOnQsRecordItemClickListener(object :
             OnQsRecordItemClickListener {
             override fun onQsRecordList(list: MutableList<String>) {
                 liveDataQsRecordIdList.value = list