From 1b2c149c437942144c10629d3836d70bacee12f0 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Fri, 11 Aug 2023 15:35:14 +0800
Subject: [PATCH] merge code

---
 .../java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt | 7 +++----
 vtm                                                        | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
index 84761c47..de508611 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
@@ -484,11 +484,10 @@ class MainViewModel @Inject constructor(
             captureLinkState = true
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-/*                val linkList = realmOperateHelper.queryLink(
-                    point = point,
-                )*/
 
-                val linkList = realmOperateHelper.queryLine(point = point, buffer = 2.5, table = "OMDB_LANE_MARK_BOUNDARYTYPE")
+                val linkList = realmOperateHelper.queryLink(point = point,)
+
+                //val linkList = realmOperateHelper.queryLine(point = point, buffer = 2.5, table = "OMDB_LANE_MARK_BOUNDARYTYPE")
 
                 var hisRoadName = false
 
diff --git a/vtm b/vtm
index c1234a9f..8717b07e 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit c1234a9fd22d69d83eb50bdaa8eda6a56247dc94
+Subproject commit 8717b07ebff4dd61226abb19474be6567a736ad8