From b164338ec748e112071a9e7c9709ba64addd59ce Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Sat, 6 May 2023 15:58:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=B7=A6=E4=BE=A7?=
=?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=A0=87=E9=A2=98=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../res/drawable/fm_card_map_down_status_bg.xml | 8 ++++----
app/src/main/res/layout/adapter_task_list.xml | 15 ++++++++-------
.../main/res/layout/fragment_layer_manager.xml | 2 +-
app/src/main/res/layout/fragment_offline_map.xml | 2 +-
app/src/main/res/layout/fragment_task_list.xml | 2 +-
app/src/main/res/values/dimens.xml | 4 ++--
6 files changed, 17 insertions(+), 16 deletions(-)
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 25e52a9f..ce2676d0 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,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false">
<shape>
- <padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
+ <padding android:bottom="2dp" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="2dp"></padding>
<solid android:color="@color/cv_gray_153" />
<corners android:radius="@dimen/default_btn_corner"></corners>
<stroke android:width="1.1dp" android:color="@color/cv_gray_153" />
@@ -10,7 +10,7 @@
</item>
<item android:state_pressed="true">
<shape>
- <padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
+ <padding android:bottom="2dp" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="2dp"></padding>
<solid android:color="@color/white" />
<corners android:radius="@dimen/default_btn_corner"></corners>
<stroke android:width="1.1dp" android:color="@color/colorSecondary" />
@@ -18,7 +18,7 @@
</item>
<item android:state_checked="true">
<shape>
- <padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
+ <padding android:bottom="2dp" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="2dp"></padding>
<solid android:color="@color/white" />
<corners android:radius="@dimen/default_btn_corner"></corners>
<stroke android:width="1.1dp" android:color="@color/colorSecondary" />
@@ -26,7 +26,7 @@
</item>
<item android:state_selected="true">
<shape>
- <padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
+ <padding android:bottom="2dp" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="2dp"></padding>
<solid android:color="@color/cvm_red" />
<corners android:radius="@dimen/default_btn_corner"></corners>
<stroke android:width="1.1dp" android:color="@color/cvm_red" />
diff --git a/app/src/main/res/layout/adapter_task_list.xml b/app/src/main/res/layout/adapter_task_list.xml
index 69d797fe..386f29d4 100644
--- a/app/src/main/res/layout/adapter_task_list.xml
+++ b/app/src/main/res/layout/adapter_task_list.xml
@@ -15,9 +15,11 @@
android:id="@+id/task_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginRight="5dp"
+ android:layout_toLeftOf="@id/task_download_btn"
android:text="任务名称"
- android:textSize="12sp" />
+ android:textStyle="bold"
+ android:textColor="@color/black"
+ android:textSize="@dimen/default_font_size" />
<TextView
android:id="@+id/task_city_name"
@@ -35,10 +37,10 @@
style="@style/map_size_font_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginRight="5dp"
- android:layout_below="@id/task_city_name"
- android:layout_toLeftOf="@id/task_upload_btn"
android:layout_alignParentLeft="true"
+ android:layout_toLeftOf="@id/task_upload_btn"
+ android:layout_below="@id/task_city_name"
+ android:textColor="@color/gray_121"
android:text="版本号"
android:textSize="@dimen/card_title_font_3size" />
@@ -49,6 +51,7 @@
android:layout_height="wrap_content"
android:layout_below="@id/task_data_version"
android:layout_marginTop="5dp"
+ android:drawableLeft="@mipmap/point_blue"
android:text="路线颜色"
android:textSize="@dimen/card_title_font_3size" />
@@ -62,7 +65,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
@@ -76,7 +78,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
diff --git a/app/src/main/res/layout/fragment_layer_manager.xml b/app/src/main/res/layout/fragment_layer_manager.xml
index 44d94c43..a70aafe6 100644
--- a/app/src/main/res/layout/fragment_layer_manager.xml
+++ b/app/src/main/res/layout/fragment_layer_manager.xml
@@ -30,7 +30,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/left_pannel_title_font"
- android:textStyle="bold"
+ android:textColor="@color/highFontColor"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/fragment_offline_map.xml b/app/src/main/res/layout/fragment_offline_map.xml
index 94a8c19d..62c43931 100644
--- a/app/src/main/res/layout/fragment_offline_map.xml
+++ b/app/src/main/res/layout/fragment_offline_map.xml
@@ -31,8 +31,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/left_pannel_title_font"
- android:textStyle="bold"
android:text="离线地图"
+ android:textColor="@color/highFontColor"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/fragment_task_list.xml b/app/src/main/res/layout/fragment_task_list.xml
index a2703040..a2b2a365 100644
--- a/app/src/main/res/layout/fragment_task_list.xml
+++ b/app/src/main/res/layout/fragment_task_list.xml
@@ -31,8 +31,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/left_pannel_title_font"
- android:textStyle="bold"
android:text="任务列表"
+ android:textColor="@color/highFontColor"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e8059a21..60098140 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -6,7 +6,7 @@
<dimen name="nav_header_vertical_spacing">8dp</dimen>
<dimen name="nav_header_height">176dp</dimen>
<dimen name="default_widget_padding">10dp</dimen>
- <dimen name="left_pannel_title_font" comment="左侧弹出框顶部标题字体大小">22sp</dimen>
+ <dimen name="left_pannel_title_font" comment="左侧弹出框顶部标题字体大小">20sp</dimen>
<dimen name="default_font_size" comment="默认字体大小，style中父最顶层">15sp</dimen>
<dimen name="card_title_font_size">24sp</dimen>
<dimen name="card_title_font_2size">13sp</dimen>
@@ -37,5 +37,5 @@
<!-- 相机设置窗体IV高度-->
<dimen name="camear_dialog_iv_hight" comment="相机设置窗体高度">75dp</dimen>
<dimen name="head_img_width">48dp</dimen>
- <dimen name="default_btn_corner">6dp</dimen>
+ <dimen name="default_btn_corner">36dp</dimen>
</resources>
\ No newline at end of file