From 875243be9af4eff7fd748063e243e4d66d73c618 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 24 Dec 2024 18:26:14 +0800 Subject: [PATCH] =?UTF-8?q?[6.8.4]=20[fix]=20[=E5=8D=95=E7=A8=8B=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=20=E4=B8=8D=E4=B8=8B=E5=8F=91=E8=BD=A8=E8=BF=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt index 39eaf1b19f..a37fec0228 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt @@ -12,7 +12,9 @@ import com.mogo.och.bridge.autopilot.trajectory.ITrajectoryListListener import com.mogo.och.bridge.autopilot.trajectory.TrajectoryManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.weaknet.constant.BusConst +import com.mogo.och.weaknet.model.LineModel import com.mogo.och.weaknet.model.LineModel.currentTask +import com.mogo.och.weaknet.model.LineModel.startStationIndex import com.mogo.och.weaknet.model.OrderModel.isGoingToNextStation import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers @@ -54,10 +56,11 @@ object BusTrajectoryManager : ITrajectoryListListener { } else { OchChainLogManager.writeChainLogTrajectory( "轨迹监控", - "开始或者结束下发轨迹 轨迹id:${mAutopilotControlParameters!!.autoPilotLine!!.lineId}" + "开始或者结束下发轨迹 轨迹id:${mAutopilotControlParameters!!.autoPilotLine!!.lineId}____${startStationIndex}" ) } - if (isLogin() && currentTask != null && !isGoingToNextStation) { + + if (isLogin() && currentTask != null && !isGoingToNextStation&&!(LineModel.isLastStation()?:true)) { d(TAG, "syncTrajectoryInfo() start.") startTrajReqLoop() } else {