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

Conflicts: collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt
2023-04-24 15:36:25 +08:00
parent b446a2562a 8e9bd3bc5d
commit 385e0032c2
15 changed files with 466 additions and 97 deletions
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/PermissionsActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/PermissionsActivity.kt
@@ -10,7 +10,7 @@ import com.hjq.permissions.XXPermissions
 /**
 * 权限申请Activity
 */
-open class PermissionsActivity : BaseActivity() {
+open abstract class PermissionsActivity : BaseActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        val permissionList = mutableListOf<String>()
@@ -50,10 +50,10 @@ open class PermissionsActivity : BaseActivity() {
                            Toast.LENGTH_SHORT
                        )
                            .show()
-                        onPermissionsGranted()
+                        onPermissionsDenied()
                        return
                    } else {
-                        onPermissionsDenied()
+                        onPermissionsGranted()
                    }
                    // 在SD卡创建项目目录
                }
@@ -79,14 +79,10 @@ open class PermissionsActivity : BaseActivity() {
    /**
     * 权限全部同意
     */
-    open fun onPermissionsGranted() {
-
-    }
+    open abstract fun onPermissionsGranted()

    /**
     * 权限
     */
-    open fun onPermissionsDenied() {
-
-    }
+    open abstract fun onPermissionsDenied()
 }
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
@@ -7,14 +7,19 @@ 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
 import com.navinfo.omqs.http.NetResult
 import com.navinfo.omqs.http.NetworkService
 import com.navinfo.omqs.tools.FileManager
 import dagger.hilt.android.lifecycle.HiltViewModel
+import io.realm.Realm
+import io.realm.RealmConfiguration
 import kotlinx.coroutines.*
 import okio.IOException
+import java.io.File
 import javax.inject.Inject

 enum class LoginStatus {
@@ -110,8 +115,7 @@ class LoginViewModel @Inject constructor(
        //文件夹初始化
        try {
            loginStatus.postValue(LoginStatus.LOGIN_STATUS_FOLDER_INIT)
-            createUserFolder(context)
-            // 初始化Realm
+            createUserFolder(context, "1")
        } catch (e: IOException) {
            loginStatus.postValue(LoginStatus.LOGIN_STATUS_FOLDER_FAILURE)
        }
@@ -151,8 +155,28 @@ class LoginViewModel @Inject constructor(
     * 创建用户目录
     */
    @Throws(IOException::class)
-    private fun createUserFolder(context: Context) {
+    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(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)
+        }
    }

    /**
@@ -169,4 +193,8 @@ class LoginViewModel @Inject constructor(
        super.onCleared()
        cancelLogin()
    }
+
+    private fun byteArrayToHexString(byteArray: ByteArray): String {
+        return byteArray.joinToString("") { "%02x".format(it) }
+    }
 }
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
@@ -17,6 +17,7 @@ import com.github.k1rakishou.fsaf.callback.FSAFActivityCallbacks
 import com.github.k1rakishou.fsaf.callback.FileChooserCallback
 import com.navinfo.collect.library.data.RealmUtils
 import com.navinfo.collect.library.data.entity.OMDBEntity
+import com.navinfo.collect.library.map.NIMapController
 import com.navinfo.omqs.R
 import com.navinfo.omqs.databinding.FragmentPersonalCenterBinding
 import com.navinfo.omqs.db.ImportOMDBHelper
@@ -31,6 +32,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.oscim.core.GeoPoint
 import java.io.File
 import java.util.UUID
 import javax.inject.Inject
@@ -48,6 +50,8 @@ class PersonalCenterFragment : BaseFragment(), FSAFActivityCallbacks {

    @Inject
    lateinit var importOMDBHiltFactory: ImportOMDBHiltFactory
+    @Inject
+    lateinit var niMapController: NIMapController


    override fun onCreateView(
@@ -73,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)
                            }
@@ -95,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 = "导入数据..."
+//                            ) {
+//
+//                            }
                        }
                    })
                }
@@ -125,6 +128,8 @@ class PersonalCenterFragment : BaseFragment(), FSAFActivityCallbacks {
                }
                R.id.personal_center_menu_test -> {
                    viewModel.readRealmData()
+                    // 定位到指定位置
+                    niMapController.mMapView.vtmMap.animator().animateTo(GeoPoint(28.608398, 115.67901))
                }
                R.id.personal_center_menu_task_list -> {
                    findNavController().navigate(R.id.TaskListFragment)
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt
@@ -10,6 +10,7 @@ import com.blankj.utilcode.util.UriUtils
 import com.blankj.utilcode.util.ZipUtils
 import com.google.gson.Gson
 import com.navinfo.collect.library.data.entity.*
+import com.navinfo.collect.library.map.NIMapController
 import com.navinfo.collect.library.utils.GeometryTools
 import com.navinfo.omqs.bean.ScProblemTypeBean
 import com.navinfo.omqs.bean.ScRootCauseAnalysisBean
@@ -135,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) {