Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

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

@@ -475,7 +475,7 @@ class MainViewModel @Inject constructor(
                     point.longitude,
                     point.latitude
                 ),
-                buffer = 1.0, catchAll = false
+                buffer = 2.5, catchAll = false
             )
 
             if (itemList.size == 1) {
@@ -503,8 +503,8 @@ class MainViewModel @Inject constructor(
 
 /*                val linkList = realmOperateHelper.queryLine(
                     point = point,
-                    buffer = 2.5,
-                    table = "OMDB_LANE_MARK_BOUNDARYTYPE"
+                    buffer = 1.0,
+                    table = "OMDB_RD_LINK_KIND"
                 )*/
 
                 var hisRoadName = false

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()