xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

Browse Source 
 Conflicts:
	app/src/main/res/layout/activity_main.xml
This commit is contained in:
squallzhjch
2023-05-06 11:03:57 +08:00
parent d86ec46943 e4729d2202
commit 9f7bf771c2
35 changed files with 377 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

176
app/src/main/res/layout/activity_main.xml
View File

@@ -42,9 +42,9 @@
android:layout_height="48dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:background="@null"
android:onClick="@{()->mainActivity.openMenu()}"
android:src="@drawable/baseline_person_24"
android:background="@null"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -57,116 +57,41 @@
app:layout_constraintTop_toBottomOf="@id/main_activity_person_center" />
<LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:layout_marginTop="10dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintRight_toRightOf="parent"
tools:ignore="MissingConstraints">
<LinearLayout
android:id="@+id/main_activity_menu_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:orientation="horizontal">
<ImageButton
android:id="@+id/main_activity_serach"
android:onClick="@{()->mainActivity.onClickSerach()}"
android:background="@drawable/icon_serach"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<ImageButton
android:id="@+id/main_activity_2d_3d"
android:background="@drawable/icon_2d_3d"
android:onClick="@{()->mainActivity.onClick2DOr3D()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<ImageButton
android:id="@+id/main_activity_camera"
android:background="@drawable/icon_page_video_a1"
android:onClick="@{()->mainActivity.openCamera()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<ImageButton
android:id="@+id/main_activity_trace"
android:onClick="@{()->mainActivity.onClickTrace()}"
android:background="@drawable/icon_trace"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<ImageButton
android:id="@+id/main_activity_calc_disance"
android:background="@drawable/icon_calc_disance"
android:onClick="@{()->mainActivity.onClickCalcDisance()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<ImageButton
android:layout_marginTop="5dp"
android:id="@+id/main_activity_menu"
android:background="@drawable/chk_icon_menu_open_close_xml"
android:onClick="@{()->mainActivity.onClickMenu()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="8dp"
android:layout_marginBottom="108dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toLeftOf="@+id/main_activity_right_fragment"
app:layout_constraintRight_toRightOf="parent"
tools:ignore="MissingConstraints">
<ImageButton
android:id="@+id/main_activity_select_line"
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@drawable/baseline_timeline_24"
android:onClick="@{()->mainActivity.selectLineOnclick()}"
android:background="@drawable/shape_card_bg_default" />
<ImageButton
android:id="@+id/main_activity_voice"
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@drawable/icon_add_voice"
android:background="@null" />
android:background="@null"
android:src="@drawable/icon_add_voice" />
<ImageButton
android:id="@+id/main_activity_line"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@null"
android:onClick="@{()->mainActivity.voiceOnclick()}"
android:src="@drawable/icon_add_data"
android:background="@null" />
android:src="@drawable/icon_add_data" />
<ImageButton
android:id="@+id/main_activity_location"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@null"
android:onClick="@{()->viewModel.onClickLocationButton()}"
android:src="@drawable/icon_location"
android:background="@null" />
android:src="@drawable/icon_location" />
</LinearLayout>
<fragment
android:id="@+id/main_activity_middle_fragment"
android:name="androidx.navigation.fragment.NavHostFragment"
@@ -182,15 +107,90 @@
<fragment
android:id="@id/main_activity_right_fragment"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="2.5"
app:layout_constraintLeft_toRightOf="@id/main_activity_middle_fragment"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:navGraph="@navigation/right_fragment_nav_graph" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
app:layout_constraintRight_toLeftOf="@+id/main_activity_right_fragment"
android:layout_marginRight="10dp"
android:orientation="horizontal"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="MissingConstraints">
<LinearLayout
android:id="@+id/main_activity_menu_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="gone">
<ImageButton
android:id="@+id/main_activity_select_line"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@drawable/shape_card_bg_default"
android:onClick="@{()->mainActivity.selectLineOnclick()}"
android:src="@drawable/baseline_timeline_24" />
<ImageButton
android:id="@+id/main_activity_serach"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_serach"
android:onClick="@{()->mainActivity.onClickSerach()}" />
<ImageButton
android:id="@+id/main_activity_2d_3d"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_2d_3d"
android:onClick="@{()->mainActivity.onClick2DOr3D()}" />
<ImageButton
android:id="@+id/main_activity_camera"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_page_video_a1"
android:onClick="@{()->mainActivity.openCamera()}" />
<ImageButton
android:id="@+id/main_activity_trace"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_trace"
android:onClick="@{()->mainActivity.onClickTrace()}" />
<ImageButton
android:id="@+id/main_activity_calc_disance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_calc_disance"
android:onClick="@{()->mainActivity.onClickCalcDisance()}" />
</LinearLayout>
<ImageButton
android:id="@+id/main_activity_menu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:background="@drawable/chk_icon_menu_open_close_xml"
android:onClick="@{()->mainActivity.onClickMenu()}" />
</LinearLayout>
<ImageButton
android:id="@+id/main_activity_camera2"
@@ -198,9 +198,9 @@
android:layout_height="48dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:background="@null"
android:onClick="@{()->mainActivity.openCamera()}"
android:src="@drawable/baseline_person_24"
android:background="@null"
android:visibility="gone"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />

23
app/src/main/res/layout/adapter_sound_list.xml
View File

@@ -1,21 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/ivory"
android:background="@color/white"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:paddingRight="10dp"
android:paddingBottom="5dp"
tools:context="com.navinfo.omqs.ui.fragment.evaluationresult.SoundListAdapter">
<LinearLayout
<RelativeLayout
android:id="@+id/rl_sound_content"
android:layout_alignParentRight="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bg_select_sound_xml"
android:background="@drawable/selector_bg_video_button"
android:gravity="center_vertical"
android:minWidth="50dp"
android:orientation="horizontal"
@@ -26,20 +27,22 @@
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="6dp"
android:gravity="left|center"
android:layout_alignParentLeft="true"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:lineSpacingExtra="2dp"
android:text=""
android:textColor="@color/font_blue_reg"
android:textColor="@color/white"
android:textSize="15sp" />
<ImageView
android:id="@+id/iv_sound_anim"
android:paddingLeft="10dp"
android:layout_alignParentRight="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/sound_anim" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</RelativeLayout>

40
app/src/main/res/layout/fragment_evaluation_result.xml
View File

@@ -15,7 +15,7 @@
</data>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_width="256dp"
android:layout_height="match_parent"
android:background="@color/white"
tools:context=".ui.fragment.evaluationresult.EvaluationResultFragment">
@@ -26,14 +26,38 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/evaluation_bar"
style="@style/card_title_font_default"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white"
app:menu="@menu/evaluation_bar_mean"
app:title="Mark" />
android:layout_height="match_parent">
<TextView
android:padding="10dp"
android:id="@+id/evaluation_bar"
style="@style/card_title_font_default"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="Mark" />
<ImageButton
android:id="@+id/evaluation_bar_save"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_alignParentRight="true"
android:background="@drawable/icon_save" />
<ImageButton
android:id="@+id/evaluation_bar_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:layout_centerInParent="true"
android:layout_toLeftOf="@+id/evaluation_bar_save"
android:background="@drawable/btn_delete_xml" />
</RelativeLayout>
</com.google.android.material.appbar.AppBarLayout>

44
app/src/main/res/layout/fragment_phenomenon.xml
View File

@@ -5,7 +5,8 @@
android:layout_height="match_parent"
android:gravity="right|center_vertical"
android:orientation="horizontal"
android:paddingLeft="30dp"
android:paddingTop="@dimen/fragment_margin_top"
android:paddingLeft="@dimen/fragment_margin_left"
tools:context="com.navinfo.omqs.ui.fragment.evaluationresult.PhenomenonFragment">
<ImageView
@@ -25,42 +26,37 @@
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/phenomenon_title_bg"
android:layout_width="match_parent"
android:layout_height="65dp"
android:background="@color/default_blue"
android:clickable="true"
android:focusable="true"
android:gravity="center"
android:text="问题列表"
android:textColor="@color/white"
android:textSize="20sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/phenomenon_left_recyclerview"
<RelativeLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="2"
android:background="@color/white" />
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/phenomenon_middle_recyclerview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white" />
<androidx.recyclerview.widget.RecyclerView
android:layout_below="@id/phenomenon_middle_recyclerview"
android:id="@+id/phenomenon_left_recyclerview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white" />
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/phenomenon_middle_recyclerview"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/white" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/phenomenon_right_recyclerview"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="4"
android:layout_weight="3"
android:background="@color/white" />
</LinearLayout>
</LinearLayout>

17
app/src/main/res/layout/fragment_problem_link.xml
View File

@@ -5,10 +5,12 @@
android:layout_height="match_parent"
android:gravity="right|center_vertical"
android:orientation="horizontal"
android:paddingLeft="100dp"
android:paddingTop="@dimen/fragment_margin_top"
android:paddingLeft="@dimen/fragment_margin_left"
tools:context="com.navinfo.omqs.ui.fragment.evaluationresult.ProblemLinkFragment">
<ImageView
android:visibility="gone"
android:id="@+id/link_drawer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -25,18 +27,6 @@
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/link_title_bg"
android:layout_width="match_parent"
android:layout_height="65dp"
android:background="@color/default_blue"
android:clickable="true"
android:focusable="true"
android:gravity="center"
android:text="问题列表"
android:textColor="@color/white"
android:textSize="20sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -45,6 +35,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/link_middle_recyclerview"
android:layout_width="0dp"
android:visibility="invisible"
android:layout_height="match_parent"
android:layout_weight="2"
android:background="@color/white" />

25
app/src/main/res/layout/text_item_select.xml
View File

@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/item_id"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/item_layout"
android:background="@color/white"
android:layout_width="match_parent"
android:gravity="center"
android:layout_height="wrap_content"
android:padding="5dp"
android:textColor="@color/black"
android:textSize="18sp">
android:layout_height="wrap_content">
</TextView>
<TextView
android:id="@+id/item_id"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="3dp"
android:padding = "3dp"
android:gravity="center"
android:textColor="@color/black"
android:textSize="18sp">
</TextView>
</RelativeLayout>