From 7840beb74bca0467f3fb9068bb189ae437089ae7 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Wed, 22 Mar 2023 21:13:36 +0800
Subject: [PATCH] =?UTF-8?q?[M2/shuttle]=20=E4=B9=98=E5=AE=A2=E5=B1=8F?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98sn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/model/BusPassengerModel.java    | 29 +++++++++----------
 .../network/BusPassengerServiceManager.kt     | 13 +++++++--
 .../bus/passenger/model/PM2ServiceManager.kt  | 10 +++++--
 3 files changed, 33 insertions(+), 19 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 aeacef126c..1dc6d54e50 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
@@ -170,32 +170,31 @@ public class BusPassengerModel {
                 , new OchCommonServiceCallback<BusPassengerRoutesResponse>() {
                     @Override
                     public void onSuccess(BusPassengerRoutesResponse data) {
-                        if ( data == null
-                                || data.getResult() == null
-                                || data.getResult().getSites() == null) {
-                            routesResult = null;
-                            mNextStationIndex = 0;
-                            startOrStopCalculateRouteInfo(false);
-                            if (mRouteLineInfoCallback != null){
-                                mRouteLineInfoCallback.showNoTaskView();
+                        if ( data == null || data.getResult() == null) {
+                            CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = null");
+                            if (routesResult != null) {
+                                routesResult = null;
+                                mNextStationIndex = 0;
+                                startOrStopCalculateRouteInfo(false);
+                                if (mRouteLineInfoCallback != null){
+                                    mRouteLineInfoCallback.showNoTaskView();
+                                }
                             }
+
                             return;
                         }
-                        if (routesResult != null && routesResult.equals(data.getResult())){
+                        if (routesResult != null && data.getResult().equals(routesResult)){
+                            CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = not update");
                             return;
                         }
                         routesResult = data.getResult();
                         updatePassengerRouteInfo(data.getResult());
                     }
 
-                    @Override
-                    public void onError() {
-
-                    }
-
                     @Override
                     public void onFail(int code, String msg) {
-                        CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = %s", msg );
+                        CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = %s", msg
+                           + ", sn = " +BusPassengerServiceManager.INSTANCE.getDriverAppSn());
                         if (code == 1003){
                             queryDriverOperationDelay();
                         }
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 9a44ec6518..39a85aa57f 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
@@ -5,6 +5,7 @@ import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.getSer
 import com.mogo.och.bus.passenger.bean.BusPassengerRoutesResponse
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
 import com.mogo.och.bus.passenger.bean.BusPassengerQueryLineRequest
 import com.mogo.och.bus.passenger.bean.BusPassengerOperationStatusResponse
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
@@ -19,6 +20,8 @@ import com.mogo.och.common.module.biz.network.interceptor.transformTry
  */
 object BusPassengerServiceManager {
 
+    private var driverSnCache = ""
+
     private var mShuttleBusPassengerServiceApi =
         MoGoRetrofitFactory.getInstance(getBaseUrl()).create(ShettlePassengerServiceApi::class.java)
     private var mBusPassengerServiceApi =
@@ -28,8 +31,14 @@ object BusPassengerServiceManager {
      * 获取Bus司机端的sn
      * @return
      */
-    public val driverAppSn: String
-        get() = getServerToken()
+    val driverAppSn: String
+        get(){
+            val serverToken = getServerToken()
+            if (serverToken != driverSnCache && serverToken.isNotEmpty()) {
+                driverSnCache = serverToken
+            }
+            return driverSnCache
+        }
 
     /**
      * 查询绑定行驶的小巴车路线
diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt
index fb3e9d97bc..f23b75ea3f 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt
@@ -21,13 +21,19 @@ object PM2ServiceManager {
     private var mBusPassengerServiceApi =
         MoGoRetrofitFactory.getInstance(OchCommonConst.getShuttleUrl()).create(PM2ServiceApi::class.java)
 
+    private var driverSnCache = ""
     /**
      * 获取Bus司机端的sn
      * @return
      */
     public val driverAppSn: String
-        get() = getServerToken()
-//        get() = "X2020220425Q466X1F"
+        get(){
+            val serverToken = getServerToken()
+            if (serverToken != driverSnCache && serverToken.isNotEmpty()) {
+                driverSnCache = serverToken
+            }
+            return driverSnCache
+        }
 
     /**
      * 查询绑定行驶的小巴车路线