From 32ee72c0ed78483e5ec97fa78c5dd38b79a60bde Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 27 Jun 2023 17:34:10 +0800
Subject: [PATCH] =?UTF-8?q?[3.3.0]=20bus=E4=B9=98=E5=AE=A2=E5=B1=8F?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E6=B5=81=E8=BD=AC=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/bus/passenger/model/BusPassengerModel.kt  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt
index b08d83a15e..9f1ce65506 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt
@@ -27,6 +27,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02Lis
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager.addListener
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager
+import com.mogo.eagle.core.network.utils.GsonUtil
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils.isPassenger
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
@@ -171,7 +172,7 @@ object BusPassengerModel{
             mContext!!, object : OchCommonServiceCallback<BusPassengerRoutesResponse> {
                 override fun onSuccess(data: BusPassengerRoutesResponse) {
                     if (data.result == null) {
-                        d(M_BUS_P + TAG, "queryDriverSiteByCoordinate = null")
+                        d(M_BUS_P + TAG, "order = queryDriverSiteByCoordinate = null")
                         if (routesResult != null) {
                             routesResult = null
                             mNextStationIndex = 0
@@ -184,7 +185,7 @@ object BusPassengerModel{
                         return
                     }
                     if (routesResult != null && data.result == routesResult) {
-                        d(M_BUS_P + TAG, "queryDriverSiteByCoordinate = not update")
+                        d(M_BUS_P + TAG, "order = queryDriverSiteByCoordinate = not update")
                         return
                     }
                     routesResult = data.result
@@ -214,6 +215,7 @@ object BusPassengerModel{
 
     private fun updatePassengerRouteInfo(result: BusPassengerRoutesResult) {
         if (mRouteLineInfoCallback != null) {
+            Logger.d(M_BUS_P + TAG, "order =  BusPassengerRoutesResult= " +GsonUtil.jsonFromObject(result))
             mRouteLineInfoCallback!!.updateLineInfo(result.name, result.runningDur)
             mRouteLineInfoCallback!!.hideNoTaskView()
             if (result.sites != null) {
@@ -223,6 +225,7 @@ object BusPassengerModel{
                 for (i in stations.indices) {
                     val station = stations[i]
                     if (station.drivingStatus == BusPassengerConst.STATION_STATUS_STOPPED && station.isLeaving && i + 1 < stations.size) { //离站
+                        Logger.d(M_BUS_P + TAG, "order =  station= leave")
                         mRouteLineInfoCallback!!.updateStationsInfo(stations, i + 1, false)
                         if (mNextStationIndex != i + 1) {
                             mTwoStationsRouts.clear()
@@ -238,6 +241,9 @@ object BusPassengerModel{
                             cleanStation()
                         }
                         suspendCalculate()
+
+                        Logger.d(M_BUS_P + TAG, "order =  station= arrive")
+
                         mRouteLineInfoCallback!!.updateStationsInfo(stations, i, true)
                         clearAutopilotControlParameters()
                         return