From 7f108ea74699dc2fdd051d604fd08675d622f6e5 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Mon, 11 Apr 2022 21:01:28 +0800
Subject: [PATCH] =?UTF-8?q?[driver=20passenger=20]=20bus=20=E5=8F=B8?=
 =?UTF-8?q?=E6=9C=BA=E5=B1=8FUI=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/bus_p_base_fragment.xml   | 13 ++++++----
 .../main/res/layout/bus_p_route_fragment.xml  | 26 +++++++++++++------
 2 files changed, 26 insertions(+), 13 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 4cd1812136..142e13dc2d 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
@@ -31,18 +31,19 @@
         android:layout_height="@dimen/bus_p_curent_station_panel_height"
         android:layout_marginLeft="@dimen/bus_p_curent_station_panel_margin"
         android:layout_marginBottom="@dimen/bus_p_curent_station_panel_margin"
-        app:cardBackgroundColor="@color/bus_p_panel_cur_station_panel_color"
         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"/>
-
     <TextView
         android:id="@+id/bus_p_cur_station_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/dp_27"
         android:layout_marginTop="@dimen/dp_40"
-        android:elevation="4px"
+        android:elevation="@dimen/dp_10"
         android:text="@string/bus_p_cur_station_title"
         android:textStyle="bold"
         android:textColor="@color/bus_p_panel_cur_txt_color"
@@ -58,7 +59,8 @@
         android:textColor="@color/bus_p_panel_cur_station_txt_color"
         android:textSize="@dimen/bus_p_curent_station_txt_size1"
         android:textStyle="bold"
-        android:elevation="4px"
+        android:text="-- --"
+        android:elevation="@dimen/dp_10"
         app:layout_constraintLeft_toLeftOf="@+id/bus_p_cur_station_title"
         app:layout_constraintTop_toBottomOf="@+id/bus_p_cur_station_title" />
 
@@ -68,10 +70,11 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_20"
         android:text="@string/bus_p_cur_station_arrived_tip"
-        android:elevation="4px"
+        android:elevation="@dimen/dp_10"
         android:textColor="@color/bus_p_panel_cur_station_tips_color"
         android:textSize="@dimen/bus_p_curent_station_tip_size1"
         app:layout_constraintLeft_toLeftOf="@+id/bus_p_cur_station_name"
         app:layout_constraintTop_toBottomOf="@+id/bus_p_cur_station_name" />
 
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml
index 198397f671..e6b489e0b5 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml
@@ -5,20 +5,30 @@
     android:layout_height="match_parent"
     android:background="@android:color/transparent">
 
-    <ImageView
-        android:id="@+id/edge_view"
-        android:layout_width="@dimen/dp_10"
-        android:layout_height="match_parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:background="@color/bus_p_route_view_left_edge_shadow"/>
+<!--    <ImageView-->
+<!--        android:id="@+id/edge_view"-->
+<!--        android:layout_width="@dimen/dp_10"-->
+<!--        android:layout_height="match_parent"-->
+<!--        app:layout_constraintLeft_toLeftOf="parent"-->
+<!--        app:layout_constraintTop_toTopOf="parent"-->
+<!--        android:background="@color/bus_p_route_view_left_edge_shadow"/>-->
+<!--    <androidx.cardview.widget.CardView-->
+<!--        android:layout_width="@dimen/dp_10"-->
+<!--        android:layout_height="match_parent"-->
+<!--        app:layout_constraintLeft_toLeftOf="parent"-->
+<!--        app:layout_constraintTop_toTopOf="parent"-->
+<!--        app:cardCornerRadius="0px"-->
+<!--        app:cardBackgroundColor="@color/bus_p_route_view_left_edge_shadow"-->
+<!--        app:cardElevation="@dimen/dp_10">-->
+<!--    </androidx.cardview.widget.CardView>-->
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="0px"
         android:layout_height="match_parent"
         android:background="@drawable/bus_p_route_bg"
         app:layout_constraintLeft_toRightOf="@+id/edge_view"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        android:elevation="@dimen/dp_10">
 
         <TextView
             android:id="@+id/bus_p_speed_tv"