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 7f3cbe1e..324811b2 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 @@ -100,6 +100,17 @@ class MainActivity : BaseActivity() { //处理页面跳转 viewModel.navigation(this, it) } + + viewModel.liveDataMenuState.observe(this) { + binding.mainActivityMenu.isSelected = it + if(it==true){ + binding.mainActivityMenuLayout.visibility = View.VISIBLE + }else{ + binding.mainActivityMenuLayout.visibility = View.GONE + } + + } + binding.mainActivitySignRecyclerview.layoutManager = LinearLayoutManager(this) binding.mainActivitySignRecyclerview.adapter = signAdapter //增加4dp的间隔 @@ -157,6 +168,43 @@ class MainActivity : BaseActivity() { viewModel.onClickCameraButton(this) } + /** + * 开关菜单 + */ + fun onClickMenu() { + //显示菜单图层 + viewModel.onClickMenu() + } + + /** + * 点击计算 + */ + fun onClickCalcDisance() { + + } + + /** + * 点击轨迹 + */ + fun onClickTrace() { + + } + + /** + * 点击搜索 + */ + fun onClickSerach() { + + } + + /** + * 点击2\3D + */ + fun onClick2DOr3D() { + + } + + /** * 点击录音按钮 */ 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 68c3a84c..fc07504d 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 @@ -77,6 +77,10 @@ class MainViewModel @Inject constructor( var volume: ImageView? = null var mSoundMeter: SoundMeter? = null + var menuState :Boolean = false + + val liveDataMenuState = MutableLiveData() + init { mapController.markerHandle.setOnQsRecordItemClickListener(object : OnQsRecordItemClickListener { @@ -185,6 +189,14 @@ class MainViewModel @Inject constructor( mapController.locationLayerHandler.animateToCurrentPosition() } + /** + * 点击菜单 + */ + fun onClickMenu() { + menuState = !menuState + liveDataMenuState.postValue(menuState) + } + override fun onCleared() { super.onCleared() if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { diff --git a/app/src/main/res/drawable-xhdpi/icon_2d_3d.png b/app/src/main/res/drawable-xhdpi/icon_2d_3d.png new file mode 100644 index 00000000..d8659521 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_2d_3d.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_calc_disance.png b/app/src/main/res/drawable-xhdpi/icon_calc_disance.png new file mode 100644 index 00000000..ff3b3254 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_calc_disance.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_close.png b/app/src/main/res/drawable-xhdpi/icon_close.png new file mode 100644 index 00000000..099a7865 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_close.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_open.png b/app/src/main/res/drawable-xhdpi/icon_open.png new file mode 100644 index 00000000..3b0afa06 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_open.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_page_video_a1.png b/app/src/main/res/drawable-xhdpi/icon_page_video_a1.png index b9efa62b..79cb8662 100644 Binary files a/app/src/main/res/drawable-xhdpi/icon_page_video_a1.png and b/app/src/main/res/drawable-xhdpi/icon_page_video_a1.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_serach.png b/app/src/main/res/drawable-xhdpi/icon_serach.png new file mode 100644 index 00000000..5438c39e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_serach.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_trace.png b/app/src/main/res/drawable-xhdpi/icon_trace.png new file mode 100644 index 00000000..0e796e05 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_trace.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_2d_3d.png b/app/src/main/res/drawable-xxhdpi/icon_2d_3d.png new file mode 100644 index 00000000..9c70cab2 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_2d_3d.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_calc_disance.png b/app/src/main/res/drawable-xxhdpi/icon_calc_disance.png new file mode 100644 index 00000000..eecd40b6 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_calc_disance.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_close.png b/app/src/main/res/drawable-xxhdpi/icon_close.png new file mode 100644 index 00000000..61cc1a08 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_close.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_open.png b/app/src/main/res/drawable-xxhdpi/icon_open.png new file mode 100644 index 00000000..1f27b29b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_open.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_page_video_a1.png b/app/src/main/res/drawable-xxhdpi/icon_page_video_a1.png index 17427efe..f22442cb 100644 Binary files a/app/src/main/res/drawable-xxhdpi/icon_page_video_a1.png and b/app/src/main/res/drawable-xxhdpi/icon_page_video_a1.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_serach.png b/app/src/main/res/drawable-xxhdpi/icon_serach.png new file mode 100644 index 00000000..51d0c7ae Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_serach.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_trace.png b/app/src/main/res/drawable-xxhdpi/icon_trace.png new file mode 100644 index 00000000..71b9dc90 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_trace.png differ diff --git a/app/src/main/res/drawable/chk_icon_menu_open_close_xml.xml b/app/src/main/res/drawable/chk_icon_menu_open_close_xml.xml new file mode 100644 index 00000000..b817ee12 --- /dev/null +++ b/app/src/main/res/drawable/chk_icon_menu_open_close_xml.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 159693fb..fa21ab51 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -56,6 +56,73 @@ app:layout_constraintLeft_toLeftOf="@id/main_activity_person_center" app:layout_constraintTop_toBottomOf="@id/main_activity_person_center" /> + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_evaluation_result.xml b/app/src/main/res/layout/fragment_evaluation_result.xml index c63a2edc..201be1fa 100644 --- a/app/src/main/res/layout/fragment_evaluation_result.xml +++ b/app/src/main/res/layout/fragment_evaluation_result.xml @@ -53,12 +53,11 @@ android:orientation="vertical"> - @@ -98,7 +97,7 @@ @@ -120,12 +119,11 @@ - - -