解决代码冲突

2023-07-14 16:45:31 +08:00 · 2023-07-14 16:45:31 +08:00 · e3695fb6cb
commit e3695fb6cb
parent eea7cb6fdf
1 changed files with 1 additions and 1 deletions
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklink/TaskLinkViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklink/TaskLinkViewModel.kt
@ -188,12 +188,12 @@ class TaskLinkViewModel @Inject constructor(
 //                taskId = liveDataTaskBean.value!!.id,
                linkPid = UUID.randomUUID().toString(),
                linkStatus = 3,
+                length = mapController.measureLayerHandler.lineLengthLiveData.value!!,
                geometry = GeometryTools.getLineString(mapController.measureLayerHandler.mPathLayer.points),
                linkInfo = LinkInfoBean(
                    kind = liveDataSelectKind.value!!.type,
                    functionLevel = liveDataSelectFunctionLevel.value!!.type,
                    dataLevel = liveDataSelectDataLevel.value!!.type,
-                    length = mapController.measureLayerHandler.lineLengthLiveData.value!!,
                )
            )
            val task: TaskBean = liveDataTaskBean.value!!