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/adapter_task_list.xml
This commit is contained in:
squallzhjch
2023-05-06 15:39:31 +08:00
parent 3733634eb5 be9e582048
commit 8e4d1c7e0e
37 changed files with 245 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/res/layout/adapter_offline_map_city.xml
View File

@@ -39,7 +39,6 @@
android:gravity="center"
android:shadowColor="@android:color/transparent"
android:text="下载"
android:textColor="@color/btn_blue_solid"
android:textSize="@dimen/card_title_font_2size" />
<TextView

58
app/src/main/res/layout/adapter_qs_record_list.xml
View File

@@ -1,53 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<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:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
tools:context="com.navinfo.omqs.ui.fragment.qsrecordlist.QsRecordListAdapter">
<TextView
android:id="@+id/qs_record_index"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@mipmap/marker"
android:maxLength="3"
android:text=""
android:layout_marginRight="@dimen/default_widget_padding"
style="@style/content_font_default_size_13sp" />
<TextView
android:id="@+id/qs_record_classType"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@mipmap/point_blue"
android:text="问题分类"
style="@style/content_font_default"
android:textSize="@dimen/default_font_size" />
<TextView
android:id="@+id/qs_record_problemLink"
style="@style/content_font_default"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/qs_record_classType"
android:drawableLeft="@mipmap/point_blue"
android:layout_marginLeft="@dimen/default_widget_padding"
android:text="问题环节" />
<TextView
android:id="@+id/qs_record_problem_type"
style="@style/content_font_default_size_13sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxEms="6"
android:singleLine="true"
android:ellipsize="end"
android:layout_toRightOf="@id/qs_record_index"
android:text="问题分类" />
<TextView
android:id="@+id/qs_record_time"
style="@style/content_font_default_size_13sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/default_widget_padding"
android:layout_toRightOf="@id/qs_record_classType"
android:maxLines="1"
android:text="" />
<TextView
android:id="@+id/qs_record_problem_type"
style="@style/content_font_default_size_10sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/qs_record_classType"
android:drawableLeft="@mipmap/point_blue"
android:layout_toRightOf="@id/qs_record_index"
android:layout_marginTop="5dp"
android:text="问题类型" />
<TextView
android:id="@+id/qs_record_phenomenon"
style="@style/content_font_default_size_13sp"
style="@style/content_font_default_size_10sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/qs_record_problem_type"
android:maxLines="2"
android:layout_below="@id/qs_record_classType"
android:drawableLeft="@mipmap/point_blue"
android:layout_marginLeft="@dimen/default_widget_padding"
android:layout_marginTop="5dp"
android:text="问题现象" />

1
app/src/main/res/layout/adapter_task_list.xml
View File

@@ -26,6 +26,7 @@
android:layout_height="wrap_content"
android:layout_below="@id/task_name"
android:layout_marginTop="5dp"
android:textColor="@color/gray_121"
android:text="省市名称"
android:textSize="@dimen/card_title_font_3size" />

99
app/src/main/res/layout/fragment_qs_record_list.xml
View File

@@ -13,30 +13,85 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
style="@style/left_pannel_title_layout">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/record_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="5dp"
app:layout_constraintBottom_toBottomOf="parent"
android:background="@drawable/selector_bg_round_button"
android:foreground="@drawable/ripple_btn_press"
style="@style/btn_round"
android:src="@drawable/ic_baseline_keyboard_arrow_left_24"></androidx.appcompat.widget.AppCompatImageView>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/record_title"
android:layout_width="wrap_content"
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/evaluation_appbar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/left_pannel_title_font"
android:textStyle="bold"
android:text="我的数据"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"></androidx.appcompat.widget.AppCompatTextView>
app:layout_constraintTop_toTopOf="parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/img_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/eight"
android:layout_alignParentLeft="true"
android:layout_centerInParent="true"
android:src="@drawable/btn_back_xml" />
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:paddingTop="@dimen/ten"
android:paddingBottom="@dimen/five"
android:text="测评结果"
android:textColor="@color/highFontColor"
android:textSize="@dimen/default_font_size" />
<TextView
android:id="@+id/tv_title_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_title"
android:paddingLeft="@dimen/ten"
android:layout_alignStart="@+id/tv_title"
android:paddingBottom="@dimen/ten"
android:textSize="@dimen/card_title_font_3size"
android:text="（共0个）"
android:textColor="@color/cv_gray_153" />
<ImageView
android:id="@+id/img_refrush"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:padding="@dimen/eight"
android:layout_centerInParent="true"
android:layout_marginRight="@dimen/eight"
android:background="@drawable/icon_refrush" />
<ImageView
android:id="@+id/img_order"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:padding="@dimen/eight"
android:layout_marginRight="@dimen/eight"
android:layout_toLeftOf="@+id/img_refrush"
android:background="@drawable/icon_order" />
<ImageView
android:id="@+id/img_filter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:padding="@dimen/eight"
android:layout_marginRight="@dimen/eight"
android:layout_toLeftOf="@+id/img_order"
android:background="@drawable/icon_filter" />
</RelativeLayout>
</com.google.android.material.appbar.AppBarLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.cardview.widget.CardView

13
app/src/main/res/layout/personal_center_head.xml
View File

@@ -3,33 +3,36 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="@dimen/nav_header_height"
android:background="@color/blue"
android:background="@color/colorPrimary"
android:gravity="bottom"
android:orientation="vertical"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
android:theme="@style/ThemeOverlay.AppCompat.Dark">
android:theme="@style/Theme.AppCompat.Light">
<ImageView
android:id="@+id/imageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/nav_header_desc"
android:contentDescription="@string/app_name"
android:paddingTop="@dimen/nav_header_vertical_spacing"
app:srcCompat="@mipmap/ic_launcher_round" />
app:srcCompat="@mipmap/logo" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/nav_header_vertical_spacing"
android:text="@string/nav_header_title"
android:text="@string/app_name"
style="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/line_gray"
android:text="@string/nav_header_subtitle" />
</LinearLayout>