Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/fragment/tasklink/TaskLinkViewModel.kt
This commit is contained in:
qiji4215 2023-07-18 10:12:41 +08:00
commit 07c0103de1

View File

@ -188,13 +188,13 @@ class TaskLinkViewModel @Inject constructor(
// taskId = liveDataTaskBean.value!!.id, // taskId = liveDataTaskBean.value!!.id,
linkPid = UUID.randomUUID().toString(), linkPid = UUID.randomUUID().toString(),
linkStatus = 3, linkStatus = 3,
length = mapController.measureLayerHandler.lineLengthLiveData.value!!,
geometry = GeometryTools.getLineString(mapController.measureLayerHandler.mPathLayer.points), geometry = GeometryTools.getLineString(mapController.measureLayerHandler.mPathLayer.points),
linkInfo = LinkInfoBean( linkInfo = LinkInfoBean(
kind = liveDataSelectKind.value!!.type, kind = liveDataSelectKind.value!!.type,
functionLevel = liveDataSelectFunctionLevel.value!!.type, functionLevel = liveDataSelectFunctionLevel.value!!.type,
dataLevel = liveDataSelectDataLevel.value!!.type, dataLevel = liveDataSelectDataLevel.value!!.type,
), )
length = mapController.measureLayerHandler.lineLengthLiveData.value!!,
) )
val task: TaskBean = liveDataTaskBean.value!! val task: TaskBean = liveDataTaskBean.value!!
task.hadLinkDvoList.add(linkBean) task.hadLinkDvoList.add(linkBean)