From 8501f64b2cd69d4c43941e3a0b7a3313f7592e02 Mon Sep 17 00:00:00 2001 From: squallzhjch Date: Sat, 6 May 2023 14:30:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BA=BF=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../omqs/ui/activity/map/MainActivity.kt | 14 +++++--- .../omqs/ui/activity/map/MainViewModel.kt | 4 +++ .../baseline_timeline_24.xml | 0 .../baseline_timeline_select_24.xml | 5 +++ .../drawable/selector_road_line_btn_bg.xml | 5 +++ .../res/drawable/selector_road_line_src.xml | 5 +++ .../res/drawable/shape_card_bg_default.xml | 35 +++++++++++++------ .../res/drawable/shape_card_bg_select.xml | 26 ++++++++++++++ app/src/main/res/layout/activity_main.xml | 17 +++++---- 9 files changed, 89 insertions(+), 22 deletions(-) rename app/src/main/res/{drawable => drawable-v24}/baseline_timeline_24.xml (100%) create mode 100644 app/src/main/res/drawable-v24/baseline_timeline_select_24.xml create mode 100644 app/src/main/res/drawable/selector_road_line_btn_bg.xml create mode 100644 app/src/main/res/drawable/selector_road_line_src.xml create mode 100644 app/src/main/res/drawable/shape_card_bg_select.xml 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 7ff32e0c..afdec6e8 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 @@ -114,9 +114,9 @@ class MainActivity : BaseActivity() { viewModel.liveDataMenuState.observe(this) { binding.mainActivityMenu.isSelected = it - if(it==true){ + if (it == true) { binding.mainActivityMenuLayout.visibility = View.VISIBLE - }else{ + } else { binding.mainActivityMenuLayout.visibility = View.GONE } @@ -138,7 +138,10 @@ class MainActivity : BaseActivity() { lifecycleScope.launch { // 初始化地图图层控制接收器 - FlowEventBus.subscribe>(lifecycle, Constant.EVENT_LAYER_MANAGER_CHANGE) { + FlowEventBus.subscribe>( + lifecycle, + Constant.EVENT_LAYER_MANAGER_CHANGE + ) { viewModel.refreshOMDBLayer(it) } } @@ -227,15 +230,16 @@ class MainActivity : BaseActivity() { * 点击录音按钮 */ fun voiceOnclick() { - val naviController = findNavController(R.id.main_activity_right_fragment) + val naviController = findNavController(R.id.main_activity_right_fragment) naviController.navigate(R.id.EvaluationResultFragment) } /** * 点击线选择 */ - fun selectLineOnclick(){ + fun selectLineOnclick() { viewModel.setSelectRoad(!viewModel.isSelectRoad()) + binding.mainActivitySelectLine.isSelected = viewModel.isSelectRoad() } fun voiceOnTouchStart() { 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 ffd27a22..06620940 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 @@ -425,6 +425,10 @@ class MainViewModel @Inject constructor( */ fun setSelectRoad(select: Boolean) { bSelectRoad = select + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + mapController.lineHandler.removeLine() + liveDataSignList.value = mutableListOf() + } } fun isSelectRoad(): Boolean { diff --git a/app/src/main/res/drawable/baseline_timeline_24.xml b/app/src/main/res/drawable-v24/baseline_timeline_24.xml similarity index 100% rename from app/src/main/res/drawable/baseline_timeline_24.xml rename to app/src/main/res/drawable-v24/baseline_timeline_24.xml diff --git a/app/src/main/res/drawable-v24/baseline_timeline_select_24.xml b/app/src/main/res/drawable-v24/baseline_timeline_select_24.xml new file mode 100644 index 00000000..70bddb36 --- /dev/null +++ b/app/src/main/res/drawable-v24/baseline_timeline_select_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/selector_road_line_btn_bg.xml b/app/src/main/res/drawable/selector_road_line_btn_bg.xml new file mode 100644 index 00000000..d4f61e9e --- /dev/null +++ b/app/src/main/res/drawable/selector_road_line_btn_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_road_line_src.xml b/app/src/main/res/drawable/selector_road_line_src.xml new file mode 100644 index 00000000..76e005e3 --- /dev/null +++ b/app/src/main/res/drawable/selector_road_line_src.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_card_bg_default.xml b/app/src/main/res/drawable/shape_card_bg_default.xml index 8abc0e3e..e716c562 100644 --- a/app/src/main/res/drawable/shape_card_bg_default.xml +++ b/app/src/main/res/drawable/shape_card_bg_default.xml @@ -1,11 +1,26 @@ - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/shape_card_bg_select.xml b/app/src/main/res/drawable/shape_card_bg_select.xml new file mode 100644 index 00000000..7dc4311f --- /dev/null +++ b/app/src/main/res/drawable/shape_card_bg_select.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index a847d7db..e1d7c190 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -67,6 +67,16 @@ app:layout_constraintRight_toRightOf="parent" tools:ignore="MissingConstraints"> + + + -