From 34defdde360d49f2f0940b0164546a17be8f21f7 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Wed, 5 Jul 2023 19:00:24 +0800
Subject: [PATCH] =?UTF-8?q?[3.3.0]=20=E6=B6=88=E6=81=AF=E7=9B=92=E5=AD=90U?=
 =?UTF-8?q?I=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/bus/passenger/model/BusPassengerModel.kt     | 2 +-
 .../src/jinlvvan/res/layout/bus_p_base_fragment.xml           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt
index 8a3c91eb77..915972e82c 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt
@@ -184,7 +184,7 @@ object BusPassengerModel{
                         mRoutePoints.clear()
                         return
                     }
-                    if (routesResult != null && data.result == routesResult) {
+                    if (routesResult != null && data.result.equals(routesResult)) {
                         d(M_BUS_P + TAG, "order = queryDriverSiteByCoordinate = not update")
                         return
                     }
diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml
index 339efd6fc5..13974b5df3 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml
@@ -67,9 +67,9 @@
     <com.mogo.eagle.core.function.hmi.ui.msgbox.BusPassengerMsgBoxBubbleView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintRight_toLeftOf="@+id/bus_p_route_panel"
+        app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginRight="@dimen/dp_40"
+        android:layout_marginLeft="@dimen/dp_40"
         android:layout_marginTop="@dimen/dp_100"
         />