From c9f084d2894890f3c12d0101ca76a64aefe708e1 Mon Sep 17 00:00:00 2001
From: squallzhjch <zhangjingchao@navinfo.com>
Date: Thu, 21 Sep 2023 20:47:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E9=81=93=E8=B7=AF=E6=96=BD?=
 =?UTF-8?q?=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/omdb_config.json                        | 3 ++-
 .../java/com/navinfo/omqs/ui/activity/map/MainActivity.kt   | 6 +++---
 .../java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt  | 6 ++++--
 .../fragment/evaluationresult/EvaluationResultViewModel.kt  | 4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index 370a37b2..88061ea6 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -35,7 +35,7 @@
 				"zoomMin": 15,
 				"zoomMax": 17,
 				"catch":true,
-				"checkLinkId": true
+				"checkLinkId": false
 			},
 			"2002": {
 				"table": "OMDB_RD_LINK_FUNCTION_CLASS",
@@ -100,6 +100,7 @@
 				"code": 2017,
 				"name": "道路施工",
 				"catch":true,
+				"checkLinkId": false,
 				"zoomMin": 15,
 				"zoomMax": 17
 			},
diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
index 5fc097ed..36968056 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
@@ -478,9 +478,9 @@ class MainActivity : BaseActivity() {
         viewModel.liveDataItemList.observe(this) {
             if (it.isNotEmpty()) {
                 if (leftFragment == null || leftFragment !is ItemListFragment) {
-                    leftFragment = ItemListFragment {
+                    leftFragment = ItemListFragment {fragment->
                         binding.mainActivityLeftFragment.visibility = View.GONE
-                        supportFragmentManager.beginTransaction().remove(leftFragment!!).commit()
+                        supportFragmentManager.beginTransaction().remove(fragment).commit()
                         leftFragment = null
                         null
                     }
@@ -696,7 +696,7 @@ class MainActivity : BaseActivity() {
                     Toast.makeText(this, "输入格式不正确", Toast.LENGTH_SHORT).show()
                 }
             }
-            dialog.dismiss()
+//            dialog.dismiss()
         }
         inputDialog.show()
     }
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 fbe61198..5bed3636 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
@@ -1491,10 +1491,12 @@ class MainViewModel @Inject constructor(
             when (searchEnum) {
                 SearchEnum.LINK -> {
                     viewModelScope.launch(Dispatchers.IO) {
+                        Log.e("jingo","查询link $msg")
                         val link = realmOperateHelper.queryLink(linkPid = msg)
                         if (link != null) {
-                            link?.let { l ->
-                                mapController.lineHandler.showLine(l.geometry)
+                            Log.e("jingo","查询link ${link.geometry}")
+                            withContext(Dispatchers.Main){
+                                mapController.lineHandler.showLine(link.geometry)
                                 dialog.dismiss()
                             }
                         } else {
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
index 258ec4ec..c084c50a 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
@@ -184,8 +184,8 @@ class EvaluationResultViewModel @Inject constructor(
                     if (linkId.isNotEmpty()) {
                         viewModelScope.launch {
                             val link = realmOperateHelper.queryLink(linkId)
-                            link?.let { l ->
-                                mapController.lineHandler.showLine(l.geometry)
+                            if(link != null){
+                                mapController.lineHandler.showLine(link.geometry)
                             }
                         }
                     }