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-06-01 10:18:19 +08:00
parent 02cf95b83d b8015a8b20
commit 6cc0a20aa6
20 changed files with 590 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,7 @@
android:paddingLeft="8dp"
android:paddingTop="6dp"
android:paddingRight="8dp"
android:paddingBottom="4dp"
android:paddingBottom="8dp"
tools:context="com.navinfo.omqs.ui.fragment.tasklist.TaskListAdapter">
<ImageView
@@ -30,66 +30,57 @@
android:textColor="#15141F"
android:textSize="14sp" />
<TextView
android:id="@+id/task_city_name"
style="@style/map_size_font_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/task_name"
android:layout_alignLeft="@id/task_name"
android:layout_marginTop="5dp"
android:text="省市名称"
android:textColor="@color/gray_121"
android:textSize="13sp" />
<TextView
android:id="@+id/task_data_version"
style="@style/map_size_font_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/task_city_name"
android:layout_below="@id/task_name"
android:layout_alignLeft="@id/task_name"
android:layout_toLeftOf="@id/task_upload_btn"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:text="版本号"
android:textColor="@color/gray_121"
android:textSize="13sp" />
<TextView
android:id="@+id/task_color"
android:id="@+id/task_city_name"
style="@style/map_size_font_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/task_data_version"
android:layout_alignLeft="@id/task_name"
android:layout_marginTop="5dp"
android:drawableLeft="@drawable/point_blue"
android:text="路线颜色"
android:textSize="@dimen/card_title_font_3size" />
android:text="省市名称"
android:textColor="@color/gray_121"
android:textSize="13sp" />
<TextView
<com.navinfo.omqs.ui.widget.TextProgressButtonBar
android:id="@+id/task_download_btn"
style="@style/btn_default_stroke_horizontal_round"
android:layout_width="72dp"
android:layout_width="75dp"
android:layout_height="22dp"
android:layout_alignBottom="@id/task_city_name"
android:layout_alignParentRight="true"
android:layout_below="@id/task_data_version"
android:layout_gravity="center"
android:layout_marginTop="5dp"
android:gravity="center"
android:text="下载"
android:textSize="@dimen/card_title_font_2size" />
app:backgroundcolor="#888FB3"
app:text="下载"
app:textSize="@dimen/card_title_font_2size"
app:textcolor="@color/white" />
<TextView
<com.navinfo.omqs.ui.widget.TextProgressButtonBar
android:id="@+id/task_upload_btn"
style="@style/btn_default_stroke_horizontal_round"
android:layout_width="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:layout_toLeftOf="@id/task_download_btn"
android:gravity="center"
android:minWidth="60dp"
android:shadowColor="@android:color/transparent"
android:text="同步"
android:textSize="@dimen/card_title_font_2size" />
android:layout_width="75dp"
android:layout_height="22dp"
android:layout_alignBottom="@id/task_city_name"
android:layout_alignParentRight="true"
android:layout_gravity="center"
android:layout_marginTop="5dp"
android:visibility="gone"
app:backgroundcolor="#888FB3"
app:text="未上传"
app:textSize="@dimen/card_title_font_2size"
app:textcolor="@color/white" />
<TextView
android:id="@+id/task_status"
@@ -104,13 +95,14 @@
android:textColor="@color/white"
android:textSize="@dimen/card_title_font_2size" />
<com.navinfo.omqs.ui.widget.MyProgressBar
android:id="@+id/task_progress"
<TextView
android:id="@+id/task_progress_text"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="16dp"
android:layout_below="@id/task_download_btn"
android:paddingTop="10dp"
android:progressDrawable="@drawable/progress_bg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/task_download_btn"
android:layout_alignBottom="@id/task_download_btn"
android:layout_toLeftOf="@id/task_download_btn"
android:gravity="center"
android:visibility="invisible" />
</RelativeLayout>

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

@@ -7,25 +7,6 @@
android:background="@drawable/shape_middle_fragment_bg"
tools:context="com.navinfo.omqs.ui.fragment.evaluationresult.PhenomenonFragment">
<!-- <ImageView-->
<!-- android:id="@+id/phenomenon_drawer"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:background="@drawable/progress_bg"-->
<!-- android:paddingLeft="10dp"-->
<!-- android:paddingTop="30dp"-->
<!-- android:paddingRight="10dp"-->
<!-- android:paddingBottom="30dp"-->
<!-- android:src="@drawable/btn_back_xml" />-->
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/phenomenon_middle_recyclerview"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="35dp"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toLeftOf="@id/phenomenon_right_recyclerview"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/phenomenon_left_recyclerview"
android:layout_width="148dp"
@@ -42,29 +23,4 @@
app:layout_constraintLeft_toRightOf="@id/phenomenon_left_recyclerview"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!-- <LinearLayout-->
<!-- android:id="@+id/group"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:orientation="vertical">-->
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:orientation="horizontal">-->
<!-- <RelativeLayout-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_weight="2">-->
<!-- -->
<!-- </RelativeLayout>-->
<!-- -->
<!-- </LinearLayout>-->
<!-- </LinearLayout>-->
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,51 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout 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_width="@dimen/fragment_problem_link_width"
android:layout_height="match_parent"
android:gravity="right|center_vertical"
android:orientation="horizontal"
android:paddingTop="@dimen/fragment_margin_top"
android:paddingLeft="@dimen/fragment_margin_left"
android:background="@drawable/shape_middle_fragment_bg"
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"
android:background="@drawable/progress_bg"
android:paddingLeft="10dp"
android:paddingTop="30dp"
android:paddingRight="10dp"
android:paddingBottom="30dp"
android:src="@drawable/selector_btn_back_xml" />
<LinearLayout
android:id="@+id/group"
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/link_right_recyclerview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<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" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/link_right_recyclerview"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="4"
android:background="@color/white" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
android:layout_height="match_parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

1
app/src/main/res/values-w1024dp/dimens.xml
View File

@@ -9,4 +9,5 @@
<dimen name="main_activity_geometry_w" comment="地图主页坐标框宽度">230dp</dimen>
<dimen name="main_activity_geometry_h" comment="地图主页坐标框高度">28dp</dimen>
<dimen name="fragment_phenomenon_width" comment="问题现象面板宽度">360dp</dimen>
<dimen name="fragment_problem_link_width" comment="问题原因面板宽度">213dp</dimen>
</resources>

12
app/src/main/res/values/attrs.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="ProgressButton">
<attr name="backgroundcolor" format="color" />
<attr name="foreground" format="reference|color|integer"/>
<attr name="textcolor" format="color" />
<attr name="max" format="integer"/>
<attr name="progress" format="integer"/>
<attr name="textSize" format="dimension" />
<attr name="text" format="string" />
</declare-styleable>
</resources>

2
app/src/main/res/values/dimens.xml
View File

@@ -39,6 +39,6 @@
<dimen name="right_fragment_w" comment="右侧fragment宽度">213dp</dimen>
<dimen name="main_activity_geometry_w" comment="地图主页坐标框宽度">230dp</dimen>
<dimen name="main_activity_geometry_h" comment="地图主页坐标框高度">28dp</dimen>
<dimen name="fragment_problem_link_width" comment="问题原因面板宽度">213dp</dimen>
</resources>