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

Conflicts: app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
2023-04-28 16:20:31 +08:00
parent defcfb66fb efe5d43555
commit 62ce5b1566
36 changed files with 913 additions and 363 deletions
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt
@@ -72,7 +72,7 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener {
        if (arguments != null) {
            val id = requireArguments().getString("QsId")
            if (id != null) {
-                viewModel.loadData(id)
+                viewModel.initData(id)
            } else {
                viewModel.initNewData()
            }
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
@@ -7,6 +7,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.navinfo.collect.library.data.entity.QsRecordBean
+import com.navinfo.collect.library.data.entity.RenderEntity.Companion.LinkTable
 import com.navinfo.collect.library.map.NIMapController
 import com.navinfo.collect.library.utils.GeometryTools
 import com.navinfo.omqs.Constant
@@ -19,6 +20,7 @@ import io.realm.Realm
 import io.realm.kotlin.where
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.oscim.core.GeoPoint
 import java.util.*
 import javax.inject.Inject

@@ -62,31 +64,24 @@ class EvaluationResultViewModel @Inject constructor(
    init {
        liveDataQsRecordBean.value = QsRecordBean(id = UUID.randomUUID().toString())
        Log.e("jingo", "EvaluationResultViewModel 创建了 ${hashCode()}")
-        mapController.markerHandle.run {
-            setOnMapClickListener {
-                liveDataQsRecordBean.value!!.geometry = it.toGeometry()
-                addMarker(it, markerTitle)
+        viewModelScope.launch {
+            mapController.onMapClickFlow.collect {
+                liveDataQsRecordBean.value!!.geometry = GeometryTools.createGeometry(it).toText()
+                mapController.markerHandle.addMarker(it, markerTitle)
                viewModelScope.launch {
-                    val linkList = realmOperateHelper.queryLink(
-                        point = GeometryTools.createPoint(
-                            it.longitude,
-                            it.latitude
-                        ), sort = true
-                    )
-                    if (linkList.isNotEmpty()) {
-                        liveDataQsRecordBean.value!!.linkId = linkList[0].id
-                    }
+                    captureLink(it.longitude, it.latitude)
                }
            }
        }
-
    }

    override fun onCleared() {
        super.onCleared()
        Log.e("jingo", "EvaluationResultViewModel 销毁了 ${hashCode()}")
        mapController.markerHandle.removeMarker(markerTitle)
-        mapController.markerHandle.removeOnMapClickListener()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            mapController.lineHandler.removeLine()
+        }
    }


@@ -100,17 +95,34 @@ class EvaluationResultViewModel @Inject constructor(
        }
        val geoPoint = mapController.locationLayerHandler.getCurrentGeoPoint()
        geoPoint?.let {
-            liveDataQsRecordBean.value!!.geometry = it.toGeometry()
+            liveDataQsRecordBean.value!!.geometry = GeometryTools.createGeometry(it).toText()
            mapController.markerHandle.addMarker(geoPoint, markerTitle)
            viewModelScope.launch {
-                val linkList = realmOperateHelper.queryLink(
-                    GeometryTools.createPoint(
-                        geoPoint.longitude,
-                        geoPoint.latitude
-                    )
-                )
+                captureLink(geoPoint.longitude, geoPoint.latitude)
+            }
+        }
+    }
+
+    /**
+     * 捕捉到路
+     */
+    private suspend fun captureLink(longitude: Double, latitude: Double) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            val linkList = realmOperateHelper.queryLink(
+                point = GeometryTools.createPoint(
+                    longitude,
+                    latitude
+                ),
+            )
+
+            liveDataQsRecordBean.value?.let {
                if (linkList.isNotEmpty()) {
-                    liveDataQsRecordBean.value!!.linkId = linkList[0].id
+                    it.linkId =
+                        linkList[0].properties[LinkTable.linkPid] ?: ""
+                    mapController.lineHandler.showLine(linkList[0].geometry)
+                } else {
+                    it.linkId = ""
+                    mapController.lineHandler.removeLine()
                }
            }
        }
@@ -270,14 +282,31 @@ class EvaluationResultViewModel @Inject constructor(
    /**
     * 根据数据id，查询数据
     */
-    fun loadData(id: String) {
-        viewModelScope.launch(Dispatchers.IO) {
-            val realm = Realm.getDefaultInstance()
-            val objects = realm.where<QsRecordBean>().equalTo("id", id).findFirst()

-            if (objects != null) {
-                oldBean = realm.copyFromRealm(objects)
-                liveDataQsRecordBean.postValue(oldBean!!.copy())
+    fun initData(id: String) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            viewModelScope.launch(Dispatchers.IO) {
+                val realm = Realm.getDefaultInstance()
+                val objects = realm.where<QsRecordBean>().equalTo("id", id).findFirst()
+
+                if (objects != null) {
+                    oldBean = realm.copyFromRealm(objects)
+                    oldBean?.let {
+                        liveDataQsRecordBean.postValue(it.copy())
+                        val p = GeometryTools.createGeoPoint(it.geometry)
+                        mapController.markerHandle.addMarker(
+                            GeoPoint(p.latitude, p.longitude),
+                            markerTitle
+                        )
+
+                        if (it.linkId.isNotEmpty()) {
+                            val link = realmOperateHelper.queryLink(it.linkId)
+                            link?.let { l ->
+                                mapController.lineHandler.showLine(l.geometry)
+                            }
+                        }
+                    }
+                }
            }
        }
    }
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/MiddleAdapter.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/MiddleAdapter.kt
@@ -1,7 +1,9 @@
 package com.navinfo.omqs.ui.fragment.evaluationresult

+import android.os.Build
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.annotation.RequiresApi
 import com.navinfo.omqs.R
 import com.navinfo.omqs.databinding.TextItemSelectBinding
 import com.navinfo.omqs.ui.other.BaseRecyclerViewAdapter
@@ -21,6 +23,7 @@ class MiddleAdapter(private var itemListener: ((Int, String) -> Unit?)? = null)
        return BaseViewHolder(viewBinding)
    }

+    @RequiresApi(Build.VERSION_CODES.M)
    override fun onBindViewHolder(holder: BaseViewHolder, position: Int) {
        val bd = holder.viewBinding as TextItemSelectBinding
        val title = data[position]
--- 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
@@ -109,8 +109,7 @@ class PersonalCenterFragment : BaseFragment(), FSAFActivityCallbacks {
                R.id.personal_center_menu_test -> {
                    viewModel.readRealmData()
                    // 定位到指定位置
-                    niMapController.mMapView.vtmMap.animator()
-                        .animateTo(GeoPoint(30.270367985798032, 113.83513667119433))
+                    niMapController.mMapView.vtmMap.animator().animateTo(GeoPoint(30.226256855699773, 113.84660523913344))
                }
                R.id.personal_center_menu_task_list -> {
                    findNavController().navigate(R.id.TaskListFragment)
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListViewModel.kt
@@ -1,11 +1,16 @@
 package com.navinfo.omqs.ui.fragment.tasklist

 import android.content.Context
+import android.graphics.Color
+import android.os.Build
 import android.util.Log
 import android.widget.Toast
+import androidx.annotation.RequiresApi
+import androidx.core.graphics.toColor
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.navinfo.collect.library.map.NIMapController
 import com.navinfo.omqs.bean.TaskBean
 import com.navinfo.omqs.http.NetResult
 import com.navinfo.omqs.http.NetworkService
@@ -19,7 +24,8 @@ import javax.inject.Inject

@HiltViewModel
 class TaskListViewModel @Inject constructor(
-    private val networkService: NetworkService
+    private val networkService: NetworkService,
+    private val niMapController: NIMapController
 ) : ViewModel() {

    val liveDataTaskList = MutableLiveData<List<TaskBean>>()
@@ -70,6 +76,11 @@ class TaskListViewModel @Inject constructor(
            for (item in taskList) {
                FileManager.checkOMDBFileInfo(item)
            }
+//            niMapController.lineHandler.omdbTaskLinkLayer.setLineColor(Color.rgb(0, 255, 0).toColor())
+//            taskList.forEach {
+//                niMapController.lineHandler.omdbTaskLinkLayer.addLineList(it.hadLinkDvoList)
+//            }
+//            niMapController.lineHandler.omdbTaskLinkLayer.update()
            liveDataTaskList.postValue(taskList)
        }