增加看板进数据编辑页面

app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt

@@ -8,6 +8,7 @@ import androidx.databinding.DataBindingUtil
 import androidx.navigation.NavOptions
 import androidx.navigation.findNavController
 import com.navinfo.omqs.R
+import com.navinfo.omqs.bean.SignBean
 import com.navinfo.omqs.databinding.FragmentEvaluationResultBinding
 import com.navinfo.omqs.ui.fragment.BaseFragment
 import com.navinfo.omqs.ui.other.shareViewModels
@@ -18,6 +19,7 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener {
     private lateinit var binding: FragmentEvaluationResultBinding
     private val viewModel by shareViewModels<EvaluationResultViewModel>("QsRecode")
 
+    //    private val args:EmptyFragmentArgs by navArgs()
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View {
@@ -56,15 +58,21 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener {
         /**
          * 读取元数据
          */
-        if (arguments != null) {
-            val id = requireArguments().getString("QsId")
-            if (id != null) {
-                viewModel.initData(id)
-            } else {
-                viewModel.initNewData()
+//        val id = args.qsId
+        var id: String = ""
+        var signBean: SignBean? = null
+        arguments?.let {
+            id = it.getString("QsId", "")
+            try {
+                signBean = it.getParcelable("SignBean")
+            } catch (e: java.lang.Exception) {
             }
+        }
+
+        if (id == null || id.isEmpty()) {
+            viewModel.initNewData(signBean)
         } else {
-            viewModel.initNewData()
+            viewModel.initData(id)
         }
 
 //        //监听大分类数据变化

app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt

@@ -10,6 +10,7 @@ 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.bean.SignBean
 import com.navinfo.omqs.db.RealmOperateHelper
 import com.navinfo.omqs.db.RoomAppDatabase
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -73,7 +74,7 @@ class EvaluationResultViewModel @Inject constructor(
         super.onCleared()
         Log.e("jingo", "EvaluationResultViewModel 销毁了 ${hashCode()}")
         mapController.markerHandle.removeMarker(markerTitle)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             mapController.lineHandler.removeLine()
         }
     }
@@ -82,23 +83,42 @@ class EvaluationResultViewModel @Inject constructor(
     /**
      * 查询数据库，获取问题分类
      */
-    fun initNewData() {
+    fun initNewData(bean: SignBean?) {
         viewModelScope.launch(Dispatchers.IO) {
             getClassTypeList()
             getProblemLinkList()
         }
         val geoPoint = mapController.locationLayerHandler.getCurrentGeoPoint()
-        geoPoint?.let {
-            liveDataQsRecordBean.value!!.geometry = GeometryTools.createGeometry(it).toText()
-            mapController.markerHandle.addMarker(geoPoint, markerTitle)
-            viewModelScope.launch {
-                captureLink(geoPoint.longitude, geoPoint.latitude)
+        if (bean == null) {
+            geoPoint?.let {
+                liveDataQsRecordBean.value!!.geometry = GeometryTools.createGeometry(it).toText()
+                mapController.markerHandle.addMarker(geoPoint, markerTitle)
+                viewModelScope.launch {
+                    captureLink(geoPoint.longitude, geoPoint.latitude)
+                }
             }
+        } else {
+            liveDataQsRecordBean.value?.run {
+                elementId = bean.elementId
+                linkId = bean.linkId
+                if (linkId.isNotEmpty()) {
+                    viewModelScope.launch {
+                        val link = realmOperateHelper.queryLink(linkId)
+                        link?.let { l ->
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                                mapController.lineHandler.showLine(l.geometry)
+                            }
+                        }
+                    }
+                }
+            }
+            val point = GeometryTools.createGeoPoint(bean.geometry)
+            mapController.markerHandle.addMarker(point, markerTitle)
         }
     }
 
     /**
-     * 捕捉到路
+     * 捕捉道路
      */
     private suspend fun captureLink(longitude: Double, latitude: Double) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {

app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/LeftAdapter.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 LeftAdapter(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]

app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListFragment.kt

@@ -50,7 +50,7 @@ class QsRecordListFragment : BaseFragment(){
         binding.qsRecyclerview.addItemDecoration(itemDecoration)
         viewModel.getList(requireContext())
         // itemClick
-        adapter!!.setOnKotlinItemClickListener(object : QsRecordListAdapter.IKotlinItemClickListener {
+        adapter.setOnKotlinItemClickListener(object : QsRecordListAdapter.IKotlinItemClickListener {
             override fun onItemClickListener(position: Int) {
                 viewModel.onItemClickListener(activity as MainActivity,position)
                 findNavController().popBackStack()