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

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

Browse Source
This commit is contained in:
qiji4215
2023-11-09 15:15:08 +08:00
parent 791fe30bf4 c2e2d33025
commit e7985f195c
21 changed files with 1195 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/res/drawable/laneinfo_3_4.xml
View File

@@ -4,12 +4,21 @@
android:viewportWidth="24"
android:viewportHeight="30">
<path
android:pathData="M10.947,29.277l-0.034,-19.755l2.048,0.838l0.032,18.901z"
android:fillColor="#00C800"/>
android:pathData="M10.938,29.033l0.027,-20.687l2.037,-0.136l-0.016,20.83z"
android:strokeWidth="1"
android:fillColor="#00C800"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
android:pathData="M11.226,11.553l10.101,-6.226l-0.601,4.448l2.223,-1.305l0.684,-5.724l-5.484,-2.023l-2.296,1.506l4.597,1.476l-9.535,5.817z"
android:fillColor="#00C800"/>
android:pathData="M14.223,4.92C15.325,4.562 17.12,4.485 17.12,4.485L20.138,4.497L17.274,1.022L19.861,0.96L23.471,5.48L19.867,10.106L17.113,10.037L20.251,6.347L16.921,6.331C16.921,6.331 15.296,6.324 14.165,7.119C13.035,7.913 12.992,9.509 12.986,9.896C12.981,10.284 10.68,8.767 11.057,8.081C11.711,6.524 12.646,5.428 14.223,4.92Z"
android:strokeWidth="1"
android:fillColor="#00C800"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
android:pathData="M12.769,18.262C12.502,12.908 3.819,12.899 3.917,18.379L3.943,26.328L0.432,23.234L0.367,25.297L5.004,29.196L9.432,25.322L9.439,23.058L5.942,26.233L5.96,18.779C6.043,15.185 10.721,15.318 10.908,18.685L12.769,18.262Z"
android:fillColor="#00C800"/>
android:pathData="M12.931,18.041C12.664,12.687 3.981,12.678 4.079,18.158L4.105,26.107L0.594,23.013L0.529,25.076L5.166,28.975L9.594,25.101L9.6,22.837L6.104,26.012L6.122,18.558C6.205,14.964 10.883,15.097 11.07,18.464L12.931,18.041Z"
android:strokeWidth="1"
android:fillColor="#00C800"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
</vector>

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

@@ -51,9 +51,9 @@
android:layout_marginRight="5dp"
android:background="@color/transparent"
android:src="@drawable/icon_delete"
app:layout_constraintBottom_toBottomOf="@id/evaluation_bar_save"
app:layout_constraintRight_toLeftOf="@id/evaluation_bar_save"
app:layout_constraintTop_toTopOf="@id/evaluation_bar_save"
app:layout_constraintBottom_toBottomOf="@id/evaluation_bar_save" />
app:layout_constraintTop_toTopOf="@id/evaluation_bar_save" />
<ImageButton
@@ -62,9 +62,9 @@
android:layout_height="40dp"
android:background="@color/transparent"
android:src="@drawable/measuring_tool_distance"
app:layout_constraintBottom_toBottomOf="@id/evaluation_bar_save"
app:layout_constraintRight_toLeftOf="@id/evaluation_bar_delete"
app:layout_constraintTop_toTopOf="@id/evaluation_bar_save"
app:layout_constraintBottom_toBottomOf="@id/evaluation_bar_save"/>
app:layout_constraintTop_toTopOf="@id/evaluation_bar_save" />
<androidx.core.widget.NestedScrollView
android:layout_width="0dp"
@@ -84,6 +84,7 @@
android:layout_height="match_parent"
android:layout_marginBottom="7dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -97,8 +98,7 @@
<TextView
android:id="@+id/evaluation_id"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
android:layout_height="wrap_content" />
</LinearLayout>
@@ -152,7 +152,7 @@
android:id="@+id/evaluation_problem_type"
style="@style/evaluation_fragment_text_style"
android:onClick="@{fragment::onClick}"
android:text="@{viewModel.liveDataQsRecordBean.problemType}" />
android:text="" />
</LinearLayout>
@@ -223,6 +223,7 @@
android:text="问题描述" />
<com.navinfo.omqs.ui.widget.MyEditeText
android:id="@+id/evaluation_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_rect_white_2dp_bg"
@@ -235,7 +236,6 @@
android:paddingLeft="12dp"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:text="@={viewModel.liveDataQsRecordBean.description}"
android:textSize="12sp" />
</LinearLayout>

107
app/src/main/res/layout/fragment_line_info_edit.xml Normal file
View File

@@ -0,0 +1,107 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout 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="match_parent"
android:layout_marginTop="55dp"
tools:context=".ui.fragment.evaluationresult.LaneInfoEditFragment">
<LinearLayout
android:layout_width="@dimen/fragment_phenomenon_width"
android:layout_height="match_parent"
android:layout_gravity="right"
android:background="@drawable/shape_middle_fragment_bg"
android:clickable="true"
android:orientation="vertical">
<HorizontalScrollView
android:id="@+id/lane_info_top_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:requiresFadingEdge="horizontal"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
>
<LinearLayout
android:id="@+id/lane_info_top_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/gray"
android:orientation="horizontal"
android:padding="5dp" />
</HorizontalScrollView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
<RadioGroup
android:id="@+id/lane_info_radiogroup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal">
<RadioButton
android:id="@+id/lane_info_radio_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:text="普通车道"
android:textColor="@color/lane_info_0" />
<RadioButton
android:id="@+id/lane_info_radio_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="false"
android:text="附加车道"
android:textColor="@color/lane_info_1" />
<RadioButton
android:id="@+id/lane_info_radio_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="false"
android:text="公交车道"
android:textColor="@color/lane_info_2" />
</RadioGroup>
<ImageButton
android:id="@+id/lane_info_backspace"
android:layout_width="60dp"
android:layout_height="wrap_content"
android:src="@drawable/icon_back_n" />
</LinearLayout>
<GridView
android:id="@+id/lane_info_gridview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:horizontalSpacing="2dp"
android:numColumns="8"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:scrollbars="none"
android:verticalSpacing="2dp" />
<GridView
android:id="@+id/lane_info_gridview2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:horizontalSpacing="2dp"
android:numColumns="2"
android:layout_marginTop="8dp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:scrollbars="none"
android:verticalSpacing="2dp" />
</LinearLayout>
</FrameLayout>

11
app/src/main/res/layout/laneinfo_item.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/laneinfo_item_layout"
android:padding="2dp"
android:orientation="horizontal"
android:background="@color/gray"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="60dp">
</LinearLayout>

6
app/src/main/res/navigation/middle_fragment_nav_graph.xml
View File

@@ -30,5 +30,9 @@
android:name="com.navinfo.omqs.ui.fragment.tasklink.TaskLinkMiddleFragment"
android:label="新增评测Link属性选择页面"
tools:layout="@layout/fragment_task_link_middle"></fragment>
<fragment
android:id="@+id/LineInfoEditFragment"
android:name="com.navinfo.omqs.ui.fragment.evaluationresult.LaneInfoEditFragment"
android:label="车信问题编辑页面"
tools:layout="@layout/fragment_line_info_edit"></fragment>
</navigation>