From 698692acbd7f9c2ba02f2ec5b6ffbffb47af0cc8 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 12 Apr 2022 11:10:25 +0800
Subject: [PATCH] =?UTF-8?q?[driver=20passenger=20]=20bus=20=E4=B9=98?=
 =?UTF-8?q?=E5=AE=A2=E5=B1=8F=E5=B0=8F=E5=9C=B0=E5=9B=BE=E5=9C=88=E8=B7=AF?=
 =?UTF-8?q?=E7=BA=BF=E6=89=80=E6=9C=89=E7=AB=99=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/bus/passenger/ui/BusPassengerMapDirectionView.java     | 3 +++
 .../src/main/res/layout/bus_p_route_fragment.xml               | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java
index 6036c45588..3b8c16bbba 100644
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java
@@ -195,6 +195,9 @@ public class BusPassengerMapDirectionView
             LatLngBounds.Builder boundsBuilder = new LatLngBounds.Builder();
             boundsBuilder.include(currentLatLng);
             boundsBuilder.include(endLatLng);
+            for (int i=0;i < mWayPointsLatLng.size();i++){
+                boundsBuilder.include(mWayPointsLatLng.get(i));
+            }
             //第二个参数为四周留空宽度
             mAMap.animateCamera(CameraUpdateFactory.newLatLngBounds(boundsBuilder.build(), 100));
 
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 c10f22862f..a6c029af81 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
@@ -10,7 +10,7 @@
         android:layout_width="576px"
         android:layout_height="match_parent"
         app:shadowColor="@color/bus_p_route_view_left_edge_shadow"
-        app:xOffset="-16px"
+        app:xOffset="0px"
         app:yOffset="0px"
         app:bgColor="@android:color/transparent"
         app:layout_constraintRight_toRightOf="parent"