From 764c400d0ffd133e2a132a28c827e990d3cb217e Mon Sep 17 00:00:00 2001
From: zhuangyan <ZDauto123456>
Date: Fri, 20 Nov 2020 11:28:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=96=B2=E5=8A=B3=E9=A9=BE?=
 =?UTF-8?q?=E9=A9=B6=E7=9A=84=E5=81=9C=E8=BD=A6=E5=9C=BA=E6=8E=A8=E8=8D=90?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/drawable/bg_fatigue_driving.xml     | 10 ++++++++++
 .../src/main/res/layout/item_v2x_fatigue_driving.xml | 12 ++++++++----
 .../src/main/res/values-ldpi/dimens.xml              |  3 +++
 .../src/main/res/values-mdpi/dimens.xml              |  5 ++++-
 .../src/main/res/values-xhdpi-1920x1000/dimens.xml   |  3 +++
 .../src/main/res/values-xhdpi/dimens.xml             |  3 +++
 .../mogo-module-v2x/src/main/res/values/dimens.xml   |  3 +++
 .../mogo-module-v2x/src/main/res/values/strings.xml  |  2 ++
 8 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 modules/mogo-module-v2x/src/main/res/drawable/bg_fatigue_driving.xml

diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_fatigue_driving.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_fatigue_driving.xml
new file mode 100644
index 0000000000..a963da5710
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_fatigue_driving.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="6px" />
+
+    <gradient
+        android:angle="0"
+        android:endColor="#37DED9"
+        android:startColor="#1DAAA5" />
+</shape>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml
index d20d34fb7d..728d647def 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml
@@ -21,13 +21,17 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageView
+    <TextView
         android:id="@+id/tagEventType"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/v2x_driving_width"
+        android:layout_height="@dimen/v2x_driving_heigt"
         android:layout_marginStart="@dimen/dp_30"
+        android:gravity="center"
+        android:background="@drawable/bg_fatigue_driving"
+        android:textColor="@color/v2x_item_white"
+        android:textSize="@dimen/v2x_recommond_route_size"
         android:layout_marginTop="@dimen/dp_20"
-        android:src="@drawable/icon_parting_icon"
+        android:text="@string/recommended_route"
         app:layout_constraintBottom_toTopOf="@+id/tvAddress"
         app:layout_constraintStart_toEndOf="@+id/ivIconP"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
index 504372c37b..3bd416c637 100644
--- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
@@ -108,5 +108,8 @@
     <dimen name="v2x_right_context_margin">460px</dimen>
     <dimen name="v2x_video_window_height_content">370px</dimen>
     <dimen name="v2x_video_window_height">380px</dimen>
+    <dimen name="v2x_driving_width">84px</dimen>
+    <dimen name="v2x_driving_heigt">26px</dimen>
+    <dimen name="v2x_recommond_route_size">14px</dimen>
 
 </resources>
diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
index 15fbda4e62..3fabb9b780 100644
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -45,7 +45,7 @@
     <dimen name="module_v2x_panel_surrounding_marginbottom">2px</dimen>
     <dimen name="module_v2x_panel_surrounding_stance">30px</dimen>
     <dimen name="module_v2x_surrounding_top">22px</dimen>
-
+    <string name="v2x_recommond_route_size">14px</string>
     <dimen name="module_v2x_surrounding_list_margin_left">12px</dimen>
     <dimen name="module_v2x_surrounding_item_margin_left">16px</dimen>
 
@@ -109,5 +109,8 @@
     <dimen name="v2x_right_context_margin">460px</dimen>
     <dimen name="v2x_video_window_height_content">370px</dimen>
     <dimen name="v2x_video_window_height">380px</dimen>
+    <dimen name="v2x_driving_width">84px</dimen>
+    <dimen name="v2x_driving_heigt">26px</dimen>
+    <dimen name="v2x_recommond_route_size">14px</dimen>
 
 </resources>
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
index ad5a85c3fe..b409158f76 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -84,4 +84,7 @@
 
     <dimen name="module_v2x_event_panel_btn_x">940px</dimen>
     <dimen name="module_v2x_event_panel_btn_y">701px</dimen>
+    <dimen name="v2x_driving_width">150px</dimen>
+    <dimen name="v2x_driving_heigt">46px</dimen>
+    <dimen name="v2x_recommond_route_size">26px</dimen>
 </resources>
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
index eeaac5851d..c9d80ab227 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -106,6 +106,9 @@
     <dimen name="v2x_right_context_margin">830px</dimen>
     <dimen name="v2x_video_window_height_content">664px</dimen>
     <dimen name="v2x_video_window_height">674px</dimen>
+    <dimen name="v2x_driving_width">150px</dimen>
+    <dimen name="v2x_driving_heigt">46px</dimen>
+    <dimen name="v2x_recommond_route_size">26px</dimen>
 
 
 </resources>
diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
index 149ad99723..79bc217c51 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -95,4 +95,7 @@
     <dimen name="module_v2x_event_panel_btn_x">574px</dimen>
     <dimen name="module_v2x_event_panel_in_launcher_btn_x">480px</dimen>
     <dimen name="module_v2x_event_panel_btn_y">384px</dimen>
+    <dimen name="v2x_driving_width">150px</dimen>
+    <dimen name="v2x_driving_heigt">46px</dimen>
+    <dimen name="v2x_recommond_route_size">26px</dimen>
 </resources>
diff --git a/modules/mogo-module-v2x/src/main/res/values/strings.xml b/modules/mogo-module-v2x/src/main/res/values/strings.xml
index fb1828d09f..0d71ffb33d 100644
--- a/modules/mogo-module-v2x/src/main/res/values/strings.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/strings.xml
@@ -9,5 +9,7 @@
     <string name="v2x_surrounding_detail_top_brief">周围5公里，共 %d 条</string>
     <string name="v2x_surrounding_go_to_share">去分享</string>
     <string name="v2x_surrounding_refresh">刷新</string>
+    <string name="recommended_route">停车场推荐</string>
+    <string name="v2x_recommond_route_size">26px</string>
 
 </resources>