diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt index 435b15c3..f01bcb63 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt @@ -60,22 +60,20 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener { onBackPressed() } //返回按钮点击 - binding.evaluationBar.setNavigationOnClickListener { + binding.evaluationBar.setOnClickListener() { onBackPressed() } - //标题栏按钮 - binding.evaluationBar.setOnMenuItemClickListener { - when (it.itemId) { - R.id.save -> { - viewModel.saveData() - true - } - R.id.delete -> { - viewModel.deleteData() - true - } - else -> true - } + + //保存事件 + binding.evaluationBarSave.setOnClickListener() { + viewModel.saveData() + } + + //删除事件 + binding.evaluationBarDelete.setOnClickListener() { + + viewModel.deleteData() + } 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 a98a769c..9f4040d3 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 @@ -326,6 +326,7 @@ class EvaluationResultViewModel @Inject constructor( } // realm.close() mapController.markerHandle.removeQsRecordMark(liveDataQsRecordBean.value!!) + mapController.mMapView.vtmMap.updateMap(true) liveDataFinish.postValue(true) } } diff --git a/app/src/main/res/drawable-v24/baseline_camera_alt_24.xml b/app/src/main/res/drawable-v24/baseline_camera_alt_24.xml index a939a65c..9c20aa97 100644 --- a/app/src/main/res/drawable-v24/baseline_camera_alt_24.xml +++ b/app/src/main/res/drawable-v24/baseline_camera_alt_24.xml @@ -1,6 +1,53 @@ - - - + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable-v24/baseline_keyboard_voice_24.xml b/app/src/main/res/drawable-v24/baseline_keyboard_voice_24.xml index 70a2cb47..09bba373 100644 --- a/app/src/main/res/drawable-v24/baseline_keyboard_voice_24.xml +++ b/app/src/main/res/drawable-v24/baseline_keyboard_voice_24.xml @@ -1,5 +1,34 @@ - - + + + + + + + + + diff --git a/app/src/main/res/drawable-xhdpi/icon_camera.png b/app/src/main/res/drawable-xhdpi/icon_camera.png new file mode 100644 index 00000000..1c910fb0 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_camera.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_sound_01.png b/app/src/main/res/drawable-xhdpi/icon_sound_01.png index 2862f172..2b085601 100644 Binary files a/app/src/main/res/drawable-xhdpi/icon_sound_01.png and b/app/src/main/res/drawable-xhdpi/icon_sound_01.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_sound_02.png b/app/src/main/res/drawable-xhdpi/icon_sound_02.png index f9e67e63..a13dad81 100644 Binary files a/app/src/main/res/drawable-xhdpi/icon_sound_02.png and b/app/src/main/res/drawable-xhdpi/icon_sound_02.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_voice.png b/app/src/main/res/drawable-xhdpi/icon_voice.png new file mode 100644 index 00000000..2b778ad9 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_voice.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_camera.png b/app/src/main/res/drawable-xxhdpi/icon_camera.png new file mode 100644 index 00000000..4416e550 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_camera.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_sound_01.png b/app/src/main/res/drawable-xxhdpi/icon_sound_01.png index 2862f172..2b085601 100644 Binary files a/app/src/main/res/drawable-xxhdpi/icon_sound_01.png and b/app/src/main/res/drawable-xxhdpi/icon_sound_01.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_sound_02.png b/app/src/main/res/drawable-xxhdpi/icon_sound_02.png index f9e67e63..a13dad81 100644 Binary files a/app/src/main/res/drawable-xxhdpi/icon_sound_02.png and b/app/src/main/res/drawable-xxhdpi/icon_sound_02.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_sound_03.png b/app/src/main/res/drawable-xxhdpi/icon_sound_03.png index 3e5eadb4..c33d39f0 100644 Binary files a/app/src/main/res/drawable-xxhdpi/icon_sound_03.png and b/app/src/main/res/drawable-xxhdpi/icon_sound_03.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_voice.png b/app/src/main/res/drawable-xxhdpi/icon_voice.png new file mode 100644 index 00000000..ab2df025 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_voice.png differ diff --git a/app/src/main/res/drawable/ripple_btn_video_normal.xml b/app/src/main/res/drawable/ripple_btn_video_normal.xml new file mode 100644 index 00000000..ccc541f1 --- /dev/null +++ b/app/src/main/res/drawable/ripple_btn_video_normal.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_bg_video_button.xml b/app/src/main/res/drawable/selector_bg_video_button.xml new file mode 100644 index 00000000..5815701e --- /dev/null +++ b/app/src/main/res/drawable/selector_bg_video_button.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/shape_btn_video_normal.xml b/app/src/main/res/drawable/shape_btn_video_normal.xml new file mode 100644 index 00000000..6dcd6f1a --- /dev/null +++ b/app/src/main/res/drawable/shape_btn_video_normal.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_btn_video_press.xml b/app/src/main/res/drawable/shape_btn_video_press.xml new file mode 100644 index 00000000..14b565e9 --- /dev/null +++ b/app/src/main/res/drawable/shape_btn_video_press.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/adapter_sound_list.xml b/app/src/main/res/layout/adapter_sound_list.xml index e493ed42..ff58958d 100644 --- a/app/src/main/res/layout/adapter_sound_list.xml +++ b/app/src/main/res/layout/adapter_sound_list.xml @@ -1,21 +1,22 @@ - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_evaluation_result.xml b/app/src/main/res/layout/fragment_evaluation_result.xml index 201be1fa..a7ddc410 100644 --- a/app/src/main/res/layout/fragment_evaluation_result.xml +++ b/app/src/main/res/layout/fragment_evaluation_result.xml @@ -26,14 +26,38 @@ android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="parent"> - + android:layout_height="match_parent"> + + + + + + + + +