调整UI

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

@@ -16,6 +16,8 @@ import androidx.annotation.RequiresApi
 import androidx.core.view.WindowCompat
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavController
+import androidx.navigation.NavDestination
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -49,7 +51,9 @@ class MainActivity : BaseActivity() {
 
     var switchFragment = false
 
-
+    /**
+     * 检测是否含有tts插件
+     */
     private val someActivityResultLauncher =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
             if (result.resultCode == Activity.RESULT_OK) {
@@ -136,7 +140,6 @@ class MainActivity : BaseActivity() {
         binding.mainActivityVoice.setOnTouchListener(object : View.OnTouchListener {
             @RequiresApi(Build.VERSION_CODES.Q)
             override fun onTouch(v: View?, event: MotionEvent?): Boolean {
-                Log.e("qj", event?.action.toString())
                 when (event?.action) {
                     MotionEvent.ACTION_DOWN -> {
                         voiceOnTouchStart()//Do Something
@@ -147,14 +150,13 @@ class MainActivity : BaseActivity() {
                         Log.e("qj", "voiceOnTouchStop")
                     }
                 }
-
                 return v?.onTouchEvent(event) ?: true
             }
         })
 
         viewModel.liveDataQsRecordIdList.observe(this) {
             //处理页面跳转
-            viewModel.navigation(this, it)
+            viewModel.navigationRightFragment(this, it)
         }
 
         viewModel.liveDataMenuState.observe(this) {
@@ -164,7 +166,6 @@ class MainActivity : BaseActivity() {
             } else {
                 binding.mainActivityMenuGroup.visibility = View.INVISIBLE
             }
-
         }
 
         //道路属性面板
@@ -214,6 +215,16 @@ class MainActivity : BaseActivity() {
                 viewModel.refreshOMDBLayer(it)
             }
         }
+
+        findNavController(R.id.main_activity_right_fragment).addOnDestinationChangedListener { controller, destination, arguments ->
+            if (destination.id == R.id.RightEmptyFragment) {
+                binding.mainActivityRightVisibilityButtonsGroup.visibility = View.VISIBLE
+            } else {
+                binding.mainActivityRightVisibilityButtonsGroup.visibility = View.GONE
+                viewModel.setSelectRoad(false)
+                binding.mainActivitySelectLine.isSelected = false
+            }
+        }
     }
 
     //根据输入的经纬度跳转坐标
@@ -235,7 +246,7 @@ class MainActivity : BaseActivity() {
                         val x = parts[0].toDouble()
                         val y = parts[0].toDouble()
                         mapController.animationHandler.animationByLatLon(y, x)
-                    }else{
+                    } else {
                         Toast.makeText(this, "输入格式不正确", Toast.LENGTH_SHORT).show()
                     }
                 } catch (e: Exception) {

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

@@ -3,7 +3,6 @@ package com.navinfo.omqs.ui.activity.map
 import android.app.Activity
 import android.content.Context
 import android.content.DialogInterface
-import android.graphics.Color
 import android.graphics.drawable.AnimationDrawable
 import android.graphics.drawable.BitmapDrawable
 import android.os.Build
@@ -16,6 +15,7 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.PopupWindow
 import androidx.annotation.RequiresApi
+import androidx.constraintlayout.widget.Group
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -275,15 +275,17 @@ class MainViewModel @Inject constructor(
                         }
                     }
                 }
+                liveDataTopSignList.postValue(topSignList.distinctBy { it.elementCode })
+                liveDataSignList.postValue(signList.distinctBy { it.elementCode })
+                val speechText = SignUtil.getRoadSpeechText(topSignList)
+                withContext(Dispatchers.Main) {
+                    speakMode?.speakText(speechText)
+                }
+                Log.e("jingo", "自动捕捉数据 共${signList.size}条")
+            }else{
+                mapController.lineHandler.removeLine()
+            }
 
-            }
-            liveDataTopSignList.postValue(topSignList.distinctBy { it.elementCode })
-            liveDataSignList.postValue(signList.distinctBy { it.elementCode })
-            val speechText = SignUtil.getRoadSpeechText(topSignList)
-            withContext(Dispatchers.Main) {
-                speakMode?.speakText(speechText)
-            }
-            Log.e("jingo", "自动捕捉数据 共${signList.size}条")
         }
     }
 
@@ -445,27 +447,11 @@ class MainViewModel @Inject constructor(
     /**
      * 处理页面调转
      */
-    fun navigation(activity: MainActivity, list: List<String>) {
+    fun navigationRightFragment(activity: MainActivity, list: List<String>) {
         //获取右侧fragment容器
         val naviController = activity.findNavController(R.id.main_activity_right_fragment)
 
         naviController.currentDestination?.let { navDestination ->
-//            when (val fragment =
-//                activity.supportFragmentManager.findFragmentById(navDestination.id)) {
-//                //判断右侧的fragment是不是质检数据
-////                is EvaluationResultFragment -> {
-////                    val viewModelFragment =
-////                        ViewModelProvider(fragment)[EvaluationResultViewModel::class.java]
-////                    viewModelFragment.notifyData(list)
-////                }
-//                is EmptyFragment -> {
-//                    if (list.size == 1) {
-//                        val bundle = Bundle()
-//                        bundle.putString("QsId", list[0])
-//                        naviController.navigate(R.id.EvaluationResultFragment, bundle)
-//                    }
-//                }
-//            }
             when (navDestination.id) {
                 R.id.RightEmptyFragment -> {
                     if (list.size == 1) {