From 5df38df0c9ed2bfbeb8eea3771dd56f32019d794 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 17 Mar 2023 22:35:34 +0800
Subject: [PATCH] =?UTF-8?q?[shuttle]=20=E4=B9=98=E5=AE=A2=E5=B1=8F?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=92=8C=E5=8F=B8=E6=9C=BA=E7=AB=AF=E6=96=AD?=
 =?UTF-8?q?=E8=BF=9E=EF=BC=8C=E6=8B=BF=E4=B8=8D=E5=88=B0=E5=8F=B8=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AFsn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/bus/passenger/model/BusPassengerModel.java   | 4 ++++
 .../och/bus/passenger/network/BusPassengerServiceManager.kt   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
index 7c3188a307..86b8d49ca2 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
@@ -194,6 +194,10 @@ public class BusPassengerModel {
 
                     @Override
                     public void onFail(int code, String msg) {
+                        if (BusPassengerServiceManager.INSTANCE.getDriverAppSn().isEmpty()){
+                            //此处拦截是为了防止过程中乘客屏和司机端断连，拿不到司机端sn, 造成请求失败去刷新了界面
+                            return;
+                        }
                         if (code == 1003){
                             routesResult = null;
                             startOrStopCalculateRouteInfo(false);
diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt
index caf58e1ed9..9a44ec6518 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt
@@ -28,7 +28,7 @@ object BusPassengerServiceManager {
      * 获取Bus司机端的sn
      * @return
      */
-    private val driverAppSn: String
+    public val driverAppSn: String
         get() = getServerToken()
 
     /**