修改数据导入功能

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
@@ -156,19 +157,26 @@ class LoginViewModel @Inject constructor(
     @Throws(IOException::class)
     private fun createUserFolder(context: Context, userId: String) {
         // 在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/fragment/personalcenter/PersonalCenterFragment.kt

@@ -77,15 +77,14 @@ class PersonalCenterFragment : BaseFragment(), FSAFActivityCallbacks {
                             val file = UriUtils.uri2File(uri)
                             // 开始导入数据
                             // 656e6372797000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-                            val job = CoroutineUtils.launchWithLoading(
+                            CoroutineUtils.launchWithLoading(
                                 requireContext(),
                                 loadingMessage = "生成数据..."
                             ) {
                                 val importOMDBHelper: ImportOMDBHelper =
                                     importOMDBHiltFactory.obtainImportOMDBHelper(
                                         requireContext(),
-                                        file,
-                                        File(file.parentFile, "config.json")
+                                        file
                                     )
                                 viewModel.obtainOMDBZipData(importOMDBHelper)
                             }
@@ -99,19 +98,19 @@ class PersonalCenterFragment : BaseFragment(), FSAFActivityCallbacks {
 
                         override fun onResult(uri: Uri) {
                             val file = UriUtils.uri2File(uri)
-                            // 开始导入数据
-                            CoroutineUtils.launchWithLoading(
-                                requireContext(),
-                                loadingMessage = "导入数据..."
-                            ) {
-                                val importOMDBHelper: ImportOMDBHelper =
-                                    importOMDBHiltFactory.obtainImportOMDBHelper(
-                                        requireContext(),
-                                        file,
-                                        File(file.parentFile, "config.json")
-                                    )
+                            val importOMDBHelper: ImportOMDBHelper =
+                                importOMDBHiltFactory.obtainImportOMDBHelper(
+                                    requireContext(),
+                                    file
+                                )
                                 viewModel.importOMDBData(importOMDBHelper)
-                            }
+//                            // 开始导入数据
+//                            CoroutineUtils.launchWithLoading(
+//                                requireContext(),
+//                                loadingMessage = "导入数据..."
+//                            ) {
+//
+//                            }
                         }
                     })
                 }

app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt

@@ -136,39 +136,15 @@ class PersonalCenterViewModel @Inject constructor(
     /**
      * 导入OMDB数据
      * */
-    suspend fun importOMDBData(importOMDBHelper: ImportOMDBHelper) {
-        Log.d("OMQSApplication", "开始导入数据")
-//        Realm.getDefaultInstance().beginTransaction()
-        importOMDBHelper.importOmdbZipFile(importOMDBHelper.omdbFile).collect {
-            Realm.getDefaultInstance().beginTransaction()
-            for (map in it) { // 每一个map就是Realm的一条数据
-                val renderEntity = RenderEntity()
-                renderEntity.code = map["QIcode"].toString().toInt()
-                renderEntity.name = map["QIname"].toString()
-                renderEntity.table = map["QItable"].toString()
-                // 其他数据插入到Properties中
-                renderEntity.geometry = map["GEOMETRY"].toString()
-                for (entry in map) {
-                    renderEntity.properties[entry.key] = entry.value.toString()
-                }
-                Realm.getDefaultInstance().insert(renderEntity)
+    fun importOMDBData(importOMDBHelper: ImportOMDBHelper) {
+        viewModelScope.launch(Dispatchers.IO) {
+            Log.d("OMQSApplication", "开始导入数据")
+            importOMDBHelper.importOmdbZipFile(importOMDBHelper.omdbFile).collect {
+                Log.d("importOMDBData", it)
             }
-            Realm.getDefaultInstance().commitTransaction()
+            Log.d("OMQSApplication", "导入数据完成")
         }
-//        Realm.getDefaultInstance().commitTransaction()
 
-//        val gson = Gson()
-//        // 数据导入结束后，开始生成渲染表所需的json文件，并生成压缩包
-//        for (table in importOMDBHelper.openConfigFile().tables/*listOf<String>("HAD_LINK")*/) {
-//            val omdbList = Realm.getDefaultInstance().where(OMDBEntity::class.java).equalTo("table", table.table).findAll()
-//            val outputFile = File(importOMDBHelper.omdbFile, "${table.table}.txt")
-//            // 将读取到的数据转换为json数据文件
-//            for (omdb in omdbList) {
-//                FileIOUtils.writeFileFromString(outputFile, gson.toJson(omdb))
-//            }
-//        }
-
-        Log.d("OMQSApplication", "导入数据完成")
     }
 
     fun importScProblemData(uri: Uri) {