From 50fa2136735f8666db5ff2268bb1b425ec97c88f Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 21 Mar 2023 13:10:13 +0800
Subject: [PATCH] =?UTF-8?q?[M2/shuttle]=20=E7=99=BB=E9=99=86=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E8=BD=AE=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/bus/passenger/model/BusPassengerModel.java    | 7 +++++--
 .../com/mogo/och/bus/passenger/model/PM2DrivingModel.kt    | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

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 86b8d49ca2..aeacef126c 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
@@ -141,6 +141,7 @@ public class BusPassengerModel {
                     public void onSuccess(BusPassengerOperationStatusResponse data) {
                         if (data == null || data.data == null) return;
                         if (mDriverStatusCallback != null) {
+                            CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverOperationStatus = %s", data.data.plateNumber );
                             mDriverStatusCallback.changeOperationStatus(data.data.driverStatus == 1);
                             mDriverStatusCallback.updatePlateNumber(data.data.plateNumber);
                         }
@@ -194,6 +195,10 @@ public class BusPassengerModel {
 
                     @Override
                     public void onFail(int code, String msg) {
+                        CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = %s", msg );
+                        if (code == 1003){
+                            queryDriverOperationDelay();
+                        }
                         if (BusPassengerServiceManager.INSTANCE.getDriverAppSn().isEmpty()){
                             //此处拦截是为了防止过程中乘客屏和司机端断连，拿不到司机端sn, 造成请求失败去刷新了界面
                             return;
@@ -201,10 +206,8 @@ public class BusPassengerModel {
                         if (code == 1003){
                             routesResult = null;
                             startOrStopCalculateRouteInfo(false);
-                            queryDriverOperationDelay();
                             return;
                         }
-                        CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = %s", msg );
                     }
                 });
     }
diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
index 9435100f7f..60f012ba68 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
@@ -324,6 +324,10 @@ class PM2DrivingModel private constructor() {
                     }
 
                     override fun onFail(code: Int, msg: String?) {
+                        d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate = %s", msg)
+                        if (code == 1003){
+                            queryDriverOperationDelay()
+                        }
                         if (PM2ServiceManager.driverAppSn.isEmpty()){
                             return
                         }
@@ -331,10 +335,8 @@ class PM2DrivingModel private constructor() {
                             routesResult = null
                             isGoingToNextStation = false
                             startOrStopCalculateRouteInfo(false)
-                            queryDriverOperationDelay()
                             return
                         }
-                        d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate = %s", msg)
                     }
 
                 })