xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决代码冲突

Browse Source
This commit is contained in:
squallzhjch 2023-07-14 16:45:31 +08:00
parent eea7cb6fdf
commit e3695fb6cb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,12 +188,12 @@ 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!!