From 38946f2c1882ad1cea9bdb830df69b8d32aff507 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 4 Jan 2024 11:14:17 +0800
Subject: [PATCH] =?UTF-8?q?[6.2.6]=20[taxi=5Fp]=20[=E6=BC=AB=E6=B8=B8?=
 =?UTF-8?q?=E8=83=8C=E6=99=AF=E3=80=81=E8=A7=86=E9=A2=91=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E6=9D=A1=E8=83=8C=E6=99=AF]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/drawable/taxi_p_roma_distance_bg.xml       | 6 ++++++
 .../passenger/src/main/res/drawable/taxi_p_video_bg.xml     | 4 ++--
 .../passenger/src/main/res/layout/taxi_p_base_fragment.xml  | 2 +-
 OCH/taxi/passenger/src/main/res/values/colors.xml           | 3 ++-
 .../src/main/res/drawable/taxi_u_p_roma_distance_bg.xml     | 6 ++++++
 .../src/main/res/drawable/taxt_u_p_bg_video_bg.xml          | 4 ++--
 .../src/main/res/layout/taxt_u_p_base_fragment.xml          | 2 +-
 OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml  | 4 ++++
 8 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 OCH/taxi/passenger/src/main/res/drawable/taxi_p_roma_distance_bg.xml
 create mode 100644 OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_u_p_roma_distance_bg.xml

diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxi_p_roma_distance_bg.xml b/OCH/taxi/passenger/src/main/res/drawable/taxi_p_roma_distance_bg.xml
new file mode 100644
index 0000000000..05ebb05f2e
--- /dev/null
+++ b/OCH/taxi/passenger/src/main/res/drawable/taxi_p_roma_distance_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="@dimen/dp_60"/>
+    <solid android:color="@color/taxi_p_E6E5F0FF"/>
+</shape>
\ No newline at end of file
diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxi_p_video_bg.xml b/OCH/taxi/passenger/src/main/res/drawable/taxi_p_video_bg.xml
index d86b36b5c1..0033c93649 100644
--- a/OCH/taxi/passenger/src/main/res/drawable/taxi_p_video_bg.xml
+++ b/OCH/taxi/passenger/src/main/res/drawable/taxi_p_video_bg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#58141A2D"/>
-    <corners android:radius="8dp"/>
+    <solid android:color="@color/taxi_p_4D7985A7"/>
+    <corners android:radius="@dimen/dp_20"/>
 </shape>
\ No newline at end of file
diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
index 722a0f1c6f..3267295a8f 100644
--- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
+++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
@@ -98,7 +98,7 @@
         android:layout_height="@dimen/dp_120"
         android:layout_marginStart="@dimen/dp_50"
         android:layout_marginTop="100dp"
-        app:roma_distance_bg="@drawable/roma_distance_bg"
+        app:roma_distance_bg="@drawable/taxi_p_roma_distance_bg"
         app:layout_constraintLeft_toRightOf="@+id/romaPView"
         app:layout_constraintTop_toTopOf="parent"
         app:roma_change_dis_color="true" />
diff --git a/OCH/taxi/passenger/src/main/res/values/colors.xml b/OCH/taxi/passenger/src/main/res/values/colors.xml
index da43fd74ed..2909e9d876 100644
--- a/OCH/taxi/passenger/src/main/res/values/colors.xml
+++ b/OCH/taxi/passenger/src/main/res/values/colors.xml
@@ -53,6 +53,7 @@
 
     <color name="taxi_p_333333">#333333</color>
     <color name="taxi_p_373B46">#373B46</color>
-
+    <color name="taxi_p_E6E5F0FF">#E6E5F0FF</color>
+    <color name="taxi_p_4D7985A7">#4D7985A7</color>
 
 </resources>
\ No newline at end of file
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_u_p_roma_distance_bg.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_u_p_roma_distance_bg.xml
new file mode 100644
index 0000000000..05ebb05f2e
--- /dev/null
+++ b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_u_p_roma_distance_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="@dimen/dp_60"/>
+    <solid android:color="@color/taxi_p_E6E5F0FF"/>
+</shape>
\ No newline at end of file
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_bg_video_bg.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_bg_video_bg.xml
index d86b36b5c1..0033c93649 100644
--- a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_bg_video_bg.xml
+++ b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_bg_video_bg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#58141A2D"/>
-    <corners android:radius="8dp"/>
+    <solid android:color="@color/taxi_p_4D7985A7"/>
+    <corners android:radius="@dimen/dp_20"/>
 </shape>
\ No newline at end of file
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
index 4b873f4dd1..344b49ad66 100644
--- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
+++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
@@ -98,7 +98,7 @@
         android:layout_height="@dimen/dp_120"
         android:layout_marginStart="@dimen/dp_50"
         android:layout_marginTop="100dp"
-        app:roma_distance_bg="@drawable/roma_distance_bg"
+        app:roma_distance_bg="@drawable/taxi_u_p_roma_distance_bg"
         app:layout_constraintLeft_toRightOf="@+id/romaPView"
         app:layout_constraintTop_toTopOf="parent"
         app:roma_change_dis_color="true" />
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml b/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml
index ac34307278..864853f159 100644
--- a/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml
+++ b/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml
@@ -61,5 +61,9 @@
     <color name="taxi_p_58C9FF">#58C9FF</color>
     <color name="taxi_p_477CFC">#477CFC</color>
     <color name="taxi_p_A0B3DA">#A0B3DA</color>
+    <color name="taxi_p_E6E5F0FF">#E6E5F0FF</color>
+    <color name="taxi_p_4D7985A7">#4D7985A7</color>
+
+
 
 </resources>
\ No newline at end of file