From 78af09a838f8cb1a3cd3c55644a8cc4f8117122b Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 27 Jun 2023 16:55:01 +0800 Subject: [PATCH] =?UTF-8?q?[Feat]=20[=E8=B7=AF=E8=B7=9D=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E9=A9=BE=E7=8A=B6=E6=80=81=E6=97=A5?= =?UTF-8?q?=E5=BF=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trajectorymamager/TrajectoryAndDistanceManager.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/trajectorymamager/TrajectoryAndDistanceManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/trajectorymamager/TrajectoryAndDistanceManager.kt index 564d867f99..2825ff7206 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/trajectorymamager/TrajectoryAndDistanceManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/trajectorymamager/TrajectoryAndDistanceManager.kt @@ -4,6 +4,7 @@ import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.data.deva.chain.ChainConstant import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d @@ -203,6 +204,8 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{ fun calculateRouteSumLength( location: MogoLocation, ) { + val autoPilotState = CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state + val locationInfo = "自动驾驶状态:$autoPilotState line信息:${lineId}定位信息:${location.latitude},${location.longitude},${location.heading}" if (mRoutePoints.isNullOrEmpty()) return // 计算起始站点在轨迹中的信息 这个是一个常量 if (startStationInfo.stationPoint != null @@ -219,7 +222,6 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{ this.startStationInfo.distance = startStationInfo.third preCarLocationIndexInTrajectory = startStationInfo.first val calculateData = "距离起始站点最近的点:${startStationInfo.first} 点在站的后面:${startStationInfo.second} 距离点的距离:${startStationInfo.third}" - val locationInfo = "line信息:${lineId}定位信息:${location.latitude},${location.longitude},${location.heading}" writeLog(calculateData,locationInfo) } @@ -237,7 +239,6 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{ this.endStationInfo.index = endStationInfo.first this.endStationInfo.distance = endStationInfo.third val calculateData = "距离结束站点最近的点:${endStationInfo.first} 点在站的后面:${endStationInfo.second} 距离点的距离:${endStationInfo.third}" - val locationInfo = "line信息:${lineId}定位信息:${location.latitude},${location.longitude},${location.heading}" writeLog(calculateData, locationInfo) } @@ -253,7 +254,6 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{ ) } val calculateData = "距离结束站点最近的点:${carLocationInfo.first} 点在站的后面:${carLocationInfo.second} 距离点的距离:${carLocationInfo.third}" - val locationInfo = "line信息:${lineId}定位信息:${location.latitude},${location.longitude},${location.heading}" writeLog(calculateData, locationInfo) if(carLocationInfo.second==null||carLocationInfo.third>1_000){ preCarLocationIndexInTrajectory = 0