diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 838a920b..30920313 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -36,7 +36,7 @@ android:allowBackup="true" android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="@xml/backup_rules" - android:icon="@mipmap/ic_launcher" + android:icon="@drawable/icon_logo" android:label="@string/app_name" android:largeHeap="true" android:requestLegacyExternalStorage="true" 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 dc1cc16d..b048abf0 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 @@ -111,6 +111,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的间隔 @@ -175,6 +186,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 2204275a..bb0219f7 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 @@ -83,6 +83,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 { @@ -221,6 +225,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..9c70cab2 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_add_data.png b/app/src/main/res/drawable-xhdpi/icon_add_data.png index 5461259d..c70122f1 100644 Binary files a/app/src/main/res/drawable-xhdpi/icon_add_data.png and b/app/src/main/res/drawable-xhdpi/icon_add_data.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_add_voice.png b/app/src/main/res/drawable-xhdpi/icon_add_voice.png index 82f24c24..9be4643f 100644 Binary files a/app/src/main/res/drawable-xhdpi/icon_add_voice.png and b/app/src/main/res/drawable-xhdpi/icon_add_voice.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..eecd40b6 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..61cc1a08 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_location.png b/app/src/main/res/drawable-xhdpi/icon_location.png index d8eaac08..61d0be51 100644 Binary files a/app/src/main/res/drawable-xhdpi/icon_location.png and b/app/src/main/res/drawable-xhdpi/icon_location.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_logo.png b/app/src/main/res/drawable-xhdpi/icon_logo.png new file mode 100644 index 00000000..8614d83f Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_logo.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..1f27b29b 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_save.png b/app/src/main/res/drawable-xhdpi/icon_save.png new file mode 100644 index 00000000..3959e452 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_save.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..51d0c7ae 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..71b9dc90 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..0fad4581 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_add_data.png b/app/src/main/res/drawable-xxhdpi/icon_add_data.png index bf9a8e89..3248fa7c 100644 Binary files a/app/src/main/res/drawable-xxhdpi/icon_add_data.png and b/app/src/main/res/drawable-xxhdpi/icon_add_data.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_add_voice.png b/app/src/main/res/drawable-xxhdpi/icon_add_voice.png index 8aa8f5a6..0435274c 100644 Binary files a/app/src/main/res/drawable-xxhdpi/icon_add_voice.png and b/app/src/main/res/drawable-xxhdpi/icon_add_voice.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..84768467 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..8df0e0eb 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_location.png b/app/src/main/res/drawable-xxhdpi/icon_location.png index 0105061f..ce19c87f 100644 Binary files a/app/src/main/res/drawable-xxhdpi/icon_location.png and b/app/src/main/res/drawable-xxhdpi/icon_location.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_logo.png b/app/src/main/res/drawable-xxhdpi/icon_logo.png new file mode 100644 index 00000000..8614d83f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_logo.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..982c6261 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..1547202e 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_save.png b/app/src/main/res/drawable-xxhdpi/icon_save.png new file mode 100644 index 00000000..3959e452 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_save.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..61c8031e 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..cd9c40ea 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/drawable/fm_card_map_down_status_bg.xml b/app/src/main/res/drawable/fm_card_map_down_status_bg.xml index 397d7c2b..10796f89 100644 --- a/app/src/main/res/drawable/fm_card_map_down_status_bg.xml +++ b/app/src/main/res/drawable/fm_card_map_down_status_bg.xml @@ -2,30 +2,30 @@ - - + + - - + + - - + + - - + + diff --git a/app/src/main/res/drawable/icon_down_arrow.png b/app/src/main/res/drawable/icon_down_arrow.png new file mode 100644 index 00000000..0c6cf5de Binary files /dev/null and b/app/src/main/res/drawable/icon_down_arrow.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 51891135..071b3a81 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 78d85177..201be1fa 100644 --- a/app/src/main/res/layout/fragment_evaluation_result.xml +++ b/app/src/main/res/layout/fragment_evaluation_result.xml @@ -40,7 +40,7 @@ + + + android:text="要素分类" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:text="问题描述" /> + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 58004db6..0df40610 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -164,6 +164,7 @@ #FF3B30 #108ee9 #2631DD + #000000 #d1d1d1 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index beac16ef..c6bf628b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - OMQualityInspection + LandScope Settings 个人中心 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5ef5bea3..a3eca443 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -32,6 +32,28 @@ wrap_content + + + + + +