From 2e2d6718f16f74a1aaf775cfd0143f04c842f055 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Fri, 1 Sep 2023 14:27:12 +0800
Subject: [PATCH] merge code

---
 app/src/main/assets/omdb_config.json                            | 1 +
 .../java/com/navinfo/omqs/ui/fragment/tasklist/TaskFragment.kt  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index b6ce48bf..999531a6 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -31,6 +31,7 @@
 				"name": "道路线",
 				"zoomMin": 15,
 				"zoomMax": 17,
+				"catch":false,
 				"checkLinkId": false
 			},
 			"2002": {
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskFragment.kt
index 84b031ca..08a0ddb7 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskFragment.kt
@@ -12,6 +12,7 @@ import android.widget.Toast
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.tabs.TabLayout
 import com.navinfo.collect.library.data.entity.HadLinkDvoBean
 import com.navinfo.omqs.R
 import com.navinfo.omqs.databinding.FragmentTaskBinding
@@ -143,6 +144,7 @@ class TaskFragment : BaseFragment() {
             requireContext()
         ).setTitle("标记原因").setView(view)
         var editText = view.findViewById<EditText>(R.id.dialog_edittext)
+        view.findViewById<TabLayout>(R.id.search_tab_layout).visibility=View.GONE
         editText.setText(bean.reason)
         inputDialog.setNegativeButton("取消") { dialog, _ ->
             dialog.dismiss()