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

解决冲突

Browse Source
This commit is contained in:
squallzhjch 2023-06-02 14:18:49 +08:00
parent ebc4ddf5a9
commit e4f28405dc
2 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
View File

@ -223,7 +223,7 @@ class MainViewModel @Inject constructor(
val linkId = link.properties[RenderEntity.Companion.LinkTable.linkPid] val linkId = link.properties[RenderEntity.Companion.LinkTable.linkPid]
if(linkIdCache!=linkId){ if (linkIdCache != linkId) {
Log.e("jingo", "捕捉到的linkid $linkId ${link.geometry}") Log.e("jingo", "捕捉到的linkid $linkId ${link.geometry}")
mapController.lineHandler.showLine(link.geometry) mapController.lineHandler.showLine(link.geometry)
@ -292,11 +292,12 @@ class MainViewModel @Inject constructor(
} }
linkIdCache = linkId ?: "" linkIdCache = linkId ?: ""
Log.e("jingo", "自动捕捉数据 共${signList.size}条") Log.e("jingo", "自动捕捉数据 共${signList.size}条")
}else{ } else {
mapController.lineHandler.removeLine() mapController.lineHandler.removeLine()
} }
} }
} }
}
/** /**
* 点击我的位置，回到我的位置 * 点击我的位置，回到我的位置

2
vtm

@ -1 +1 @@
Subproject commit dd13e533c38b5738ab404c2737d7ccadeff01323 Subproject commit 1ee201a41f78f169873848209a3f3bdac36f185a