From 4c6e1e8b5135a67d5e58851539aad6ba842e0045 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Thu, 16 Mar 2023 12:17:36 +0800
Subject: [PATCH] =?UTF-8?q?[M2]=20=E4=B9=98=E5=AE=A2=E5=B1=8F=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E8=8E=B7=E5=8F=96=E5=8F=B8=E6=9C=BA=E7=AB=AFsn?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/bus/passenger/model/PM2DrivingModel.kt     | 3 +++
 .../com/mogo/och/bus/passenger/model/PM2ServiceManager.kt   | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

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 797b410c62..49643dc157 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,9 @@ class PM2DrivingModel private constructor() {
                     }
 
                     override fun onFail(code: Int, msg: String?) {
+                        if (PM2ServiceManager.driverAppSn.isEmpty()){
+                            return
+                        }
                         if (code == 1003) {
                             routesResult = null
                             isGoingToNextStation = false
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 e9f4f357e7..fb3e9d97bc 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
@@ -25,7 +25,7 @@ object PM2ServiceManager {
      * 获取Bus司机端的sn
      * @return
      */
-    private val driverAppSn: String
+    public val driverAppSn: String
         get() = getServerToken()
 //        get() = "X2020220425Q466X1F"
 
@@ -45,7 +45,7 @@ object PM2ServiceManager {
                 driverAppSn
             )
         ).transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate"))
+            .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate=sn =$driverAppSn"))
 
     }
 
@@ -65,7 +65,7 @@ object PM2ServiceManager {
             driverAppSn
         )
             .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverOperationStatus"))
+            .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverOperationStatus=sn =$driverAppSn"))
 
     }
 }
\ No newline at end of file