From 33966e4e764cbef2cf923a0ce751b2e0bfc5623f Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 7 Mar 2023 22:44:41 +0800
Subject: [PATCH] =?UTF-8?q?[m1]=20[1.1.2]=20[sn=20=E6=8A=BD=E5=8F=96]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/net/BusPassengerServiceManager.kt    | 14 +++++++++++---
 .../och/bus/passenger/net/PassengerServiceApi.kt   | 14 +++++++-------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt
index 59fee9237e..35eb2389d6 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt
@@ -23,8 +23,16 @@ object BusPassengerServiceManager {
         MoGoRetrofitFactory.getInstance(OchCommonConst.getBaseUrl())
             .create(PassengerServiceApi::class.java)
 
+    /**
+     * 获取Bus司机端的sn
+     * @return
+     */
+    val draiverSn: String
+        get() = CallerTelematicManager.getServerToken()
+
+
     private fun beforeNet():Boolean{
-        if (CallerTelematicManager.getServerToken().isBlank()) {
+        if (draiverSn.isBlank()) {
             ToastUtils.showShort("已断开司机屏连接、请联系安全员")
             return true
         }
@@ -87,7 +95,7 @@ object BusPassengerServiceManager {
         if(beforeNet()){
             return
         }
-        val endOrderRequest = EndOrderRequest(CallerTelematicManager.getServerToken(),orderNo)
+        val endOrderRequest = EndOrderRequest(draiverSn,orderNo)
         mBusPassengerServiceApi.endOrder(request = endOrderRequest).transformTry()
             .subscribe(OchCommonSubscribeImpl(context, callback, "serviceEnd"))
     }
@@ -96,7 +104,7 @@ object BusPassengerServiceManager {
         if(beforeNet()){
             return
         }
-        val request = ArriveDestRequest(CallerTelematicManager.getServerToken(),lindId)
+        val request = ArriveDestRequest(draiverSn,lindId)
         mBusPassengerServiceApi.arriveDest(request = request).transformTry()
             .subscribe(OchCommonSubscribeImpl(context, callback, "arriveDest"))
     }
diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt
index 2ea40e742f..a466dd6349 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt
@@ -20,7 +20,7 @@ internal interface PassengerServiceApi {
     fun queryDriverOperationStatus(
         @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
         @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token,
-        @Query("sn") sn: String = CallerTelematicManager.getServerToken()
+        @Query("sn") sn: String = BusPassengerServiceManager.draiverSn
     ): Observable<M1DriverLoginStatusResponse>
 
     /**
@@ -30,7 +30,7 @@ internal interface PassengerServiceApi {
     fun queryOrderInfo(
         @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
         @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token,
-        @Query("sn") sn: String = CallerTelematicManager.getServerToken()
+        @Query("sn") sn: String = BusPassengerServiceManager.draiverSn
     ): Observable<OrderInfoResponse>
 
     /**
@@ -40,7 +40,7 @@ internal interface PassengerServiceApi {
     fun queryLineList(
         @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
         @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token,
-        @Query("sn") sn: String = CallerTelematicManager.getServerToken()
+        @Query("sn") sn: String = BusPassengerServiceManager.draiverSn
     ): Observable<LineInfoListResponse>
 
     /**
@@ -50,7 +50,7 @@ internal interface PassengerServiceApi {
     fun queryLineSiteList(
         @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
         @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token,
-        @Query("sn") sn: String = CallerTelematicManager.getServerToken(),
+        @Query("sn") sn: String = BusPassengerServiceManager.draiverSn,
         @Query("lineId") lineId: String?
     ): Observable<SiteInfoResponse>
 
@@ -62,7 +62,7 @@ internal interface PassengerServiceApi {
     fun queryBusinessStatus(
         @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
         @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token,
-        @Query("sn") sn: String = CallerTelematicManager.getServerToken()
+        @Query("sn") sn: String = BusPassengerServiceManager.draiverSn
     ): Observable<BusinessStatusResponse>
 
     /**
@@ -93,7 +93,7 @@ internal interface PassengerServiceApi {
     fun queryLocusByLineId(
         @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
         @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token,
-        @Query("sn") sn: String = CallerTelematicManager.getServerToken(),
+        @Query("sn") sn: String = BusPassengerServiceManager.draiverSn,
         @Query("lineId") lineId: String?
     ): Observable<LocusResponse>
 
@@ -105,6 +105,6 @@ internal interface PassengerServiceApi {
     fun queryBusinessTime(
         @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
         @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token,
-        @Query("sn") sn: String = CallerTelematicManager.getServerToken()
+        @Query("sn") sn: String = BusPassengerServiceManager.draiverSn
     ): Observable<BusinessTimeResponse>
 }
\ No newline at end of file