fix: 合并冲突

2023-08-16 13:54:33 +08:00
parent 5f6d363bb8 a0c9dadbd8
commit f388f7c986
23 changed files with 200 additions and 188 deletions
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
@@ -24,14 +24,14 @@ import androidx.navigation.findNavController
 import com.blankj.utilcode.util.ToastUtils
 import com.navinfo.collect.library.data.dao.impl.TraceDataBase
 import com.navinfo.collect.library.data.entity.*
-import com.navinfo.collect.library.enum.DataCodeEnum
+import com.navinfo.collect.library.enums.DataCodeEnum
 import com.navinfo.collect.library.garminvirbxe.HostBean
 import com.navinfo.collect.library.map.NIMapController
 import com.navinfo.collect.library.map.OnGeoPointClickListener
 import com.navinfo.collect.library.map.handler.*
 import com.navinfo.collect.library.utils.GeometryTools
 import com.navinfo.collect.library.utils.GeometryToolsKt
-import com.navinfo.collect.library.utils.RealmDBParamUtils
+import com.navinfo.collect.library.utils.MapParamUtils
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.R
 import com.navinfo.omqs.bean.ImportConfig
@@ -291,7 +291,7 @@ class MainViewModel @Inject constructor(
            initNILocationData()
        }
        sharedPreferences.registerOnSharedPreferenceChangeListener(this)
-        RealmDBParamUtils.setTaskId(sharedPreferences.getInt(Constant.SELECT_TASK_ID, -1))
+        MapParamUtils.setTaskId(sharedPreferences.getInt(Constant.SELECT_TASK_ID, -1))
        socketServer = SocketServer(mapController, traceDataBase, sharedPreferences)
    }

@@ -324,10 +324,10 @@ class MainViewModel @Inject constructor(
    private suspend fun initQsRecordData() {
        if (currentTaskBean != null) {
            var list = mutableListOf<QsRecordBean>()
-            val realm = Realm.getDefaultInstance()
+            val realm = realmOperateHelper.getRealmDefaultInstance()
            realm.executeTransaction {
                val objects =
-                    realm.where<QsRecordBean>().equalTo("taskId", currentTaskBean!!.id).findAll()
+                    realmOperateHelper.getRealmTools(QsRecordBean::class.java,false).findAll()
                list = realm.copyFromRealm(objects)
            }
            mapController.markerHandle.removeAllQsMarker()
@@ -342,9 +342,9 @@ class MainViewModel @Inject constructor(
     */
    private suspend fun initNoteData() {
        var list = mutableListOf<NoteBean>()
-        val realm = Realm.getDefaultInstance()
+        val realm = realmOperateHelper.getRealmDefaultInstance()
        realm.executeTransaction {
-            val objects = realm.where<NoteBean>().findAll()
+            val objects = realmOperateHelper.getRealmTools(NoteBean::class.java,false).findAll()
            list = realm.copyFromRealm(objects)
        }

@@ -486,13 +486,13 @@ class MainViewModel @Inject constructor(

            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {

-                // val linkList = realmOperateHelper.queryLink(point = point,)
+                 val linkList = realmOperateHelper.queryLink(point = point)

-                val linkList = realmOperateHelper.queryLine(
+/*                val linkList = realmOperateHelper.queryLine(
                    point = point,
                    buffer = 2.5,
                    table = "OMDB_LANE_MARK_BOUNDARYTYPE"
-                )
+                )*/

                var hisRoadName = false

@@ -548,15 +548,16 @@ class MainViewModel @Inject constructor(

                            }

-                            val realm = Realm.getDefaultInstance()
-                            val entity = realm.where(RenderEntity::class.java)
-                                .equalTo("table", "OMDB_RESTRICTION").and().equalTo(
+                            val realm = realmOperateHelper.getRealmDefaultInstance()
+
+                            val entity = realmOperateHelper.getRealmTools(RenderEntity::class.java,true).and()
+                                .equalTo("table", DataCodeEnum.OMDB_RESTRICTION.tableName).and().equalTo(
                                    "properties['linkIn']", it
                                ).findFirst()
                            if (entity != null) {
                                val outLink = entity.properties["linkOut"]
-                                val linkOutEntity = realm.where(RenderEntity::class.java)
-                                    .equalTo("table", "OMDB_RD_LINK").and().equalTo(
+                                val linkOutEntity = realmOperateHelper.getRealmTools(RenderEntity::class.java,true).and()
+                                    .equalTo("table", DataCodeEnum.OMDB_RD_LINK.tableName).and().equalTo(
                                        "properties['${RenderEntity.Companion.LinkTable.linkPid}']",
                                        outLink
                                    ).findFirst()
@@ -1112,14 +1113,6 @@ class MainViewModel @Inject constructor(
    }

    fun click2Dor3D() {
-        viewModelScope.launch(Dispatchers.IO) {
-            Log.e(
-                "qj",
-                "${
-                    Realm.getDefaultInstance().where(RenderEntity::class.java).findAll().size
-                }==安装数量"
-            )
-        }
    }

    /**
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/SignAdapter.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/SignAdapter.kt
@@ -6,7 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import com.navinfo.collect.library.enum.DataCodeEnum
+import com.navinfo.collect.library.enums.DataCodeEnum
 import com.navinfo.omqs.R
 import com.navinfo.omqs.bean.SignBean
 import com.navinfo.omqs.databinding.AdapterSignBinding
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/note/NoteViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/note/NoteViewModel.kt
@@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.navinfo.collect.library.data.entity.NoteBean
 import com.navinfo.collect.library.map.NIMapController
+import com.navinfo.collect.library.utils.MapParamUtils
 import com.navinfo.omqs.ui.dialog.FirstDialog
 import dagger.hilt.android.lifecycle.HiltViewModel
 import io.realm.Realm
@@ -108,6 +109,7 @@ class NoteViewModel @Inject constructor(
                    noteBean.id = mNoteBean!!.id
                    noteBean.description = noteBeanDescription
                }
+                noteBean.taskId = MapParamUtils.getTaskId()
                mNoteBean = noteBean
                val realm = Realm.getDefaultInstance()
                realm.executeTransaction {
--- 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
@@ -3,11 +3,13 @@ package com.navinfo.omqs.ui.fragment.personalcenter
 import android.Manifest
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.annotation.RequiresApi
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import com.blankj.utilcode.util.ToastUtils
@@ -15,7 +17,9 @@ import com.blankj.utilcode.util.UriUtils
 import com.github.k1rakishou.fsaf.FileChooser
 import com.github.k1rakishou.fsaf.callback.FSAFActivityCallbacks
 import com.github.k1rakishou.fsaf.callback.FileChooserCallback
+import com.navinfo.collect.library.enums.DataLayerEnum
 import com.navinfo.collect.library.map.NIMapController
+import com.navinfo.collect.library.utils.MapParamUtils
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.R
 import com.navinfo.omqs.databinding.FragmentPersonalCenterBinding
@@ -67,6 +71,7 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit?
                        override fun onCancel(reason: String) {
                        }

+                        @RequiresApi(Build.VERSION_CODES.N)
                        override fun onResult(uri: Uri) {
                            val file = UriUtils.uri2File(uri)
                            // 开始导入数据
@@ -126,6 +131,16 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit?
 //                        .animateTo(GeoPoint( 40.05108004733645, 116.29187746293708    ))
                        .animateTo(GeoPoint( 40.45403725443716, 115.81488271796577))
                }
+                R.id.personal_center_menu_open_all_layer -> {
+                    MapParamUtils.setDataLayerEnum(DataLayerEnum.SHOW_ALL_LAYERS)
+                    niMapController.layerManagerHandler.updateOMDBVectorTileLayer()
+                    viewModel.realmOperateHelper.updateRealmDefaultInstance()
+                }
+                R.id.personal_center_menu_close_hide_layer -> {
+                    MapParamUtils.setDataLayerEnum(DataLayerEnum.ONLY_ENABLE_LAYERS)
+                    niMapController.layerManagerHandler.updateOMDBVectorTileLayer()
+                    viewModel.realmOperateHelper.updateRealmDefaultInstance()
+                }
 //                R.id.personal_center_menu_task_list -> {
 //                    findNavController().navigate(R.id.TaskManagerFragment)
 //                }
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/signMoreInfo/SignMoreInfoFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/signMoreInfo/SignMoreInfoFragment.kt
@@ -8,7 +8,7 @@ import androidx.fragment.app.activityViewModels
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.navinfo.collect.library.data.entity.RenderEntity
-import com.navinfo.collect.library.enum.DataCodeEnum
+import com.navinfo.collect.library.enums.DataCodeEnum
 import com.navinfo.omqs.R
 import com.navinfo.omqs.bean.SignBean
 import com.navinfo.omqs.databinding.FragmentSignInfoBinding
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt
@@ -16,7 +16,7 @@ import com.navinfo.collect.library.data.entity.TaskBean
 import com.navinfo.collect.library.map.NIMapController
 import com.navinfo.collect.library.map.OnGeoPointClickListener
 import com.navinfo.collect.library.utils.GeometryTools
-import com.navinfo.collect.library.utils.RealmDBParamUtils
+import com.navinfo.collect.library.utils.MapParamUtils
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.db.RealmOperateHelper
 import com.navinfo.omqs.http.NetworkService
@@ -142,7 +142,7 @@ class TaskViewModel @Inject constructor(

        liveDataTaskLinks.value = taskBean.hadLinkDvoList
        showTaskLinks(taskBean)
-        RealmDBParamUtils.setTaskId(taskBean.id)
+        MapParamUtils.setTaskId(taskBean.id)
        mapController.layerManagerHandler.updateOMDBVectorTileLayer()
        mapController.mMapView.updateMap(true)

--- a/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt
@@ -2,7 +2,7 @@ package com.navinfo.omqs.ui.widget

 import android.util.Log
 import com.navinfo.collect.library.data.entity.RenderEntity
-import com.navinfo.collect.library.enum.DataCodeEnum
+import com.navinfo.collect.library.enums.DataCodeEnum
 import com.navinfo.omqs.R
 import com.navinfo.omqs.bean.RoadNameBean
 import com.navinfo.omqs.bean.SignBean