1、Routing增加黑名单点的传入。
2、sendTrajectoryDownloadReq增加注释
3、增加TODO 需要 亚坤补齐
This commit is contained in:
donghongyu-pc
2024-11-21 17:05:33 +08:00
parent ef966a1e73
commit e751ea237d
9 changed files with 45 additions and 2 deletions

View File

@@ -43,12 +43,20 @@ fun AutopilotControlParameters.toRouteInfo(): MessagePad.RouteInfo {
endLoc.latitude = it.lat
endLoc.longitude = it.lon
}
// Routing算路白名单点赋值
this.wayLatLons?.forEach {
val locBuilder = MessagePad.Location.newBuilder()
locBuilder.latitude = it.lat
locBuilder.longitude = it.lon
routeInfo.addWayPoints(locBuilder.build())
}
// Routing算路黑名单点赋值
this.blackLatLons?.forEach {
val locBuilder = MessagePad.Location.newBuilder()
locBuilder.latitude = it.lat
locBuilder.longitude = it.lon
routeInfo.addBlackPoints(locBuilder.build())
}
if (this.routeID > 0) {
routeInfo.routeID = this.routeID
}
@@ -61,7 +69,7 @@ fun AutopilotControlParameters.toRouteInfo(): MessagePad.RouteInfo {
routeInfo.startLocation = startLoc.build()
routeInfo.endLocation = endLoc.build()
//20240523 用于表示判断是否是站点下单。默认false起点下单接管下单 true: 中间站点下单
// TODO 20240523 用于表示判断是否是站点下单。默认false起点下单接管下单 true: 中间站点下单
//routeInfo.isStation = false
val line = MessagePad.Line.newBuilder()
@@ -121,6 +129,7 @@ class AutopilotControlParameters {
@JvmField
var startLatLon: AutoPilotLonLat? = null
// Bus 需要将中间站点填充进去(运营平台完成此步骤)
@JvmField
var wayLatLons: List<AutoPilotLonLat>? = null // Routing 给算路引擎使用的经停点列表,不是真正的要停车

View File

@@ -57,6 +57,9 @@ interface IMoGoAutopilotControlProvider : IMoGoFunctionServerProvider {
/**
* 发送 轨迹下载请求
*
* @param autoPilotLine 线路相关参数详情见PB message_pad.proto -> Line
* @param routeInfo 20240523 进行自动算路,务必下单时候携带自动驾驶路径信息,否则可不填!
*/
fun sendTrajectoryDownloadReq(autoPilotLine: AutopilotControlParameters.AutoPilotLine, routeInfo: MessagePad.RouteInfo?)

View File

@@ -204,7 +204,7 @@ object CallerAutoPilotControlManager {
}
/**
* 发送 轨迹下载请求
* 发送 轨迹下载请求。带有Routing的参数让MAP进行离线算路。
*/
fun sendTrajectoryDownloadReq(autopilotControlParameters: AutopilotControlParameters) {
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
@@ -216,6 +216,7 @@ object CallerAutoPilotControlManager {
/**
* 发送 轨迹下载请求
* @param autoPilotLine 启动算路参数
*/
fun sendTrajectoryDownloadReq(autoPilotLine: AutopilotControlParameters.AutoPilotLine) {
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {