修改测量工具的联动功能

修改崩溃bug

app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt

@@ -503,7 +503,7 @@ class MainActivity : BaseActivity() {
     /**
      * 结束测量
      */
-    private fun measuringToolOff() {
+    fun measuringToolOff() {
         //监听测距值
         mapController.measureLayerHandler.measureValueLiveData.removeObservers(this)
         mapController.measureLayerHandler.tempMeasureValueLiveData.removeObservers(this)

app/src/main/java/com/navinfo/omqs/ui/fragment/tasklink/TaskLinkFragment.kt

@@ -97,7 +97,7 @@ class TaskLinkFragment : BaseFragment(), View.OnClickListener {
          * 线长度
          */
         mapController.measureLayerHandler.measureValueLiveData.observe(viewLifecycleOwner) {
-            binding.taskLinkLength.text = "${it}米"
+            binding.taskLinkLength.text = "${it.valueString}${it.unit}"
         }
         mapController.measureLayerHandler.tempMeasureValueLiveData.observe(viewLifecycleOwner) {
             (activity as MainActivity).setHomeCenterText("${it.valueString}${it.unit}")
@@ -110,6 +110,7 @@ class TaskLinkFragment : BaseFragment(), View.OnClickListener {
          * 显示地图准星
          */
         activity?.let {
+            (activity as MainActivity).measuringToolOff()
             (activity as MainActivity).setHomeCenterVisibility(View.VISIBLE)
         }
     }

app/src/main/java/com/navinfo/omqs/ui/fragment/tasklink/TaskLinkViewModel.kt

@@ -296,9 +296,11 @@ class TaskLinkViewModel @Inject constructor(
             if (task != null) {
                 liveDataTaskBean.postValue(realm.copyFromRealm(task))
             }
-            hadLinkDvoBean = realm.copyFromRealm(objects)
-            withContext(Dispatchers.Main) {
-                mapController.measureLayerHandler.initPathLine(hadLinkDvoBean?.geometry!!)
+            if(objects != null) {
+                hadLinkDvoBean = realm.copyFromRealm(objects)
+                withContext(Dispatchers.Main) {
+                    mapController.measureLayerHandler.initPathLine(hadLinkDvoBean?.geometry!!)
+                }
             }
         }
     }