From 3d462539d682f887313b6500f05a138b5a935389 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Mon, 23 May 2022 14:12:47 +0800
Subject: [PATCH] =?UTF-8?q?[taxi/bus-d=20270]=20bus=20=E4=B9=98=E5=AE=A2?=
 =?UTF-8?q?=E5=B1=8FUI=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/bus_p_base_fragment.xml   | 21 ++++++++++++-------
 .../src/main/res/values-sw320dp/dimens.xml    |  1 +
 .../src/main/res/values/colors.xml            |  1 +
 .../src/main/res/values/dimens.xml            |  3 ++-
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
index 523a6fc82d..fd30dd553b 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
@@ -8,7 +8,7 @@
         android:id="@+id/steering_wheel"
         android:layout_width="@dimen/dp_300"
         android:layout_height="@dimen/dp_300"
-        android:layout_marginLeft="@dimen/dp_90"
+        android:layout_marginLeft="@dimen/dp_50"
         android:layout_marginTop="@dimen/dp_112"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -20,24 +20,29 @@
         android:layout_marginLeft="@dimen/bus_p_curent_station_panel_margin"
         android:layout_marginTop="@dimen/dp_112"
         android:scaleType="fitXY"
-        android:visibility="invisible"
+        android:visibility="gone"
         android:layout_gravity="center_horizontal"
         android:src="@drawable/bus_p_un_auto_nor"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
 
-    <androidx.cardview.widget.CardView
+    <com.mogo.och.common.module.wigets.OCHBorderShadowLayout
         android:id="@+id/iv_bg"
         android:layout_width="@dimen/bus_p_curent_station_panel_width"
         android:layout_height="@dimen/bus_p_curent_station_panel_height"
-        android:layout_marginLeft="@dimen/bus_p_curent_station_panel_margin"
+        android:layout_marginLeft="@dimen/bus_p_curent_station_panel_margin_left"
         android:layout_marginBottom="@dimen/bus_p_curent_station_panel_margin"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        android:alpha="0.99"
-        app:cardElevation="@dimen/dp_5"
-        app:cardBackgroundColor="@color/bus_p_panel_cur_station_panel_color"
-        app:cardCornerRadius="20px"/>
+        app:bgColor="@color/bus_p_panel_cur_station_panel_color"
+        app:blurRadius="@dimen/dp_12"
+        app:shadowRadius="@dimen/dp_20"
+        app:shadowColor="@color/bus_p_panel_edge_shadow"
+        app:xOffset="0px"
+        app:yOffset="0px">
+
+    </com.mogo.och.common.module.wigets.OCHBorderShadowLayout>
+
     <TextView
         android:id="@+id/bus_p_cur_station_title"
         android:layout_width="wrap_content"
diff --git a/OCH/mogo-och-bus-passenger/src/main/res/values-sw320dp/dimens.xml b/OCH/mogo-och-bus-passenger/src/main/res/values-sw320dp/dimens.xml
index d79687928f..e1eebd7bcb 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/values-sw320dp/dimens.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/values-sw320dp/dimens.xml
@@ -50,6 +50,7 @@
     <dimen name="bus_p_curent_station_panel_width">638px</dimen>
     <dimen name="bus_p_curent_station_panel_height">316px</dimen>
     <dimen name="bus_p_curent_station_panel_margin">50px</dimen>
+    <dimen name="bus_p_curent_station_panel_margin_left">38px</dimen>
     <dimen name="bus_p_curent_station_txt_size">44px</dimen>
     <dimen name="bus_p_curent_station_txt_size1">55px</dimen>
     <dimen name="bus_p_curent_station_tip_size1">40px</dimen>
diff --git a/OCH/mogo-och-bus-passenger/src/main/res/values/colors.xml b/OCH/mogo-och-bus-passenger/src/main/res/values/colors.xml
index 06035c5d4b..8e63faf83d 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/values/colors.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/values/colors.xml
@@ -26,4 +26,5 @@
  <color name="bus_p_panel_cur_station_panel_color">#E6E9EFFC</color>
  <color name="bus_p_route_view_left_edge_shadow">#33394C63</color>
  <color name="bus_p_traffic_txt_color">#2D3E5F</color>
+ <color name="bus_p_panel_edge_shadow">#33394C63</color>
 </resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml b/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml
index 6ad2fdc16a..c32aec9eff 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml
@@ -50,7 +50,8 @@
 
     <dimen name="bus_p_curent_station_panel_width">638px</dimen>
     <dimen name="bus_p_curent_station_panel_height">316px</dimen>
-    <dimen name="bus_p_curent_station_panel_margin">50px</dimen>
+    <dimen name="bus_p_curent_station_panel_margin">38px</dimen>
+    <dimen name="bus_p_curent_station_panel_margin_left">38px</dimen>
     <dimen name="bus_p_curent_station_txt_size">44px</dimen>
     <dimen name="bus_p_curent_station_txt_size1">55px</dimen>
     <dimen name="bus_p_curent_station_tip_size1">40px</dimen>