解决冲突

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

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

vtm

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