From 33d17eea0df582b6fda84d3b052900ee32398952 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Mon, 11 Sep 2023 17:17:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt  | 6 +++---
 1 file changed, 3 insertions(+), 3 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 89378a1f..404bae2e 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
@@ -382,7 +382,7 @@ class MainViewModel @Inject constructor(
                 naviMutex.lock()
                 naviEngine = NaviEngine()
                 val pathList = mutableListOf<Route>()
-                val realm = Realm.getDefaultInstance()
+                val realm = realmOperateHelper.getSelectTaskRealmInstance()
                 for (link in taskBean.hadLinkDvoList) {
                     //测线不参与导航
                     if (link.linkStatus == 3) {
@@ -426,6 +426,7 @@ class MainViewModel @Inject constructor(
                     }
                     pathList.add(route)
                 }
+                realm.close()
                 //用来存储最终的导航路径
                 val newRouteList = mutableListOf<Route>()
                 //比对路径排序用的
@@ -510,7 +511,6 @@ class MainViewModel @Inject constructor(
         } else {
 //            Toast.makeText(context, "数据未安装,无法计算导航路径", Toast.LENGTH_SHORT).show()
         }
-        realm.close()
     }
 
 
@@ -812,7 +812,7 @@ class MainViewModel @Inject constructor(
                                     .and()
                                     .equalTo(
                                         "properties['linkIn']", it
-                                    ).findFirst()
+                                    ).findAll()
                             if (entityList.isNotEmpty()) {
                                 val outList = entityList.distinct()
                                 for (i in outList.indices) {