From e4732a08799b2f5a225efa3987b638ab113a94c5 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 2 Dec 2024 11:00:18 +0800 Subject: [PATCH] =?UTF-8?q?[6.8.0]=20[fix]=20[taxi=20=E6=8C=87=E5=AF=BC?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=20=E6=81=A2=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/unmanned/taxi/utils/TaxiTrajectoryManager.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaxiTrajectoryManager.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaxiTrajectoryManager.kt index 5b9a3baa23..3b889a749f 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaxiTrajectoryManager.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaxiTrajectoryManager.kt @@ -242,7 +242,7 @@ object TaxiTrajectoryManager { } private fun sendTrajectoryReq() { - if (mAutoPilotLine != null) { + if (mAutoPilotLine != null&&mAutoPilotLine?.autoPilotLine!=null) { printInfoMsg("[下发轨迹] sendTrajectoryDownloadReq, lindId=" + mAutoPilotLine?.autoPilotLine?.lineId + ", lineName=" + mAutoPilotLine?.autoPilotLine?.lineName) writeChainLog( "轨迹监控", @@ -250,14 +250,14 @@ object TaxiTrajectoryManager { true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY ) - CallerAutoPilotControlManager.sendTrajectoryDownloadReq(mAutoPilotLine!!, COMMON_LOADING) + CallerAutoPilotControlManager.sendTrajectoryDownloadReq(mAutoPilotLine!!.autoPilotLine!!, COMMON_LOADING) } else { e(SceneConstant.M_TAXI + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!") } - if (mPreAutoPilotLine != null) { + if (mPreAutoPilotLine != null&&mPreAutoPilotLine?.autoPilotLine!=null) { printInfoMsg("[下发预加载轨迹] sendTrajectoryDownloadReq, lindId=" + mPreAutoPilotLine?.autoPilotLine?.lineId + ", lineName=" + mPreAutoPilotLine?.autoPilotLine?.lineName) - CallerAutoPilotControlManager.sendTrajectoryDownloadReq(mPreAutoPilotLine!!, PRE_LOADING) + CallerAutoPilotControlManager.sendTrajectoryDownloadReq(mPreAutoPilotLine!!.autoPilotLine!!, PRE_LOADING) } else { e(SceneConstant.M_TAXI + TAG, "sendTrajectoryReq(): mPreAutoPilotLine is null!!!") }