yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[684][adas]轨迹下载新增订单号参数

Browse Source
This commit is contained in:
xinfengkun
2024-12-11 17:27:05 +08:00
parent da85bc2215
commit 855c06b91c
7 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/mogo-adas-data/src/main/proto/message_pad.proto
View File

@@ -435,6 +435,7 @@ message TrajectoryDownloadReq
uint32 downloadType = 3; //下载类型: 0:正常下载 1:预下载
RouteInfo routeInfo = 4; //20240523 进行自动算路，务必下单时候携带自动驾驶路径信息，否则可不填！（Line信息重复）
CmdInfo cmd_info = 5; //自驾命令信息
}
// message definition for MessageType: MsgTypeBasicInfoReq

6
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
View File

@@ -1656,6 +1656,7 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
* @param line 线路相关参数详情见PB message_pad.proto -> Line
* @param downloadType 下载类型: 0:正常下载 1:预下载
* @param routeInfo 20240523 进行自动算路，务必下单时候携带自动驾驶路径信息，否则可不填！
* @param orderId 订单号
* @return 消息是否添加到WS消息发送队列，返回值为非0的正整数时表示下发消息的消息ID
* * >=0：表示添加到WS发送消息队列
* * =0：表示乘客屏模式添加到WS发送消息队列
@@ -1668,7 +1669,7 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
paramIndexes = {0}
)
@Override
public long sendTrajectoryDownloadReq(MessagePad.Line line, int downloadType, MessagePad.RouteInfo routeInfo) {
public long sendTrajectoryDownloadReq(MessagePad.Line line, int downloadType, MessagePad.RouteInfo routeInfo, String orderId) {
MessagePad.TrajectoryDownloadReq.Builder builder = MessagePad.TrajectoryDownloadReq.newBuilder();
builder.setSource(1);//指令来源: 0: default, 1:pad, 2:aicloud
if (line != null) {
@@ -1680,6 +1681,9 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
if (routeInfo != null) {
builder.setRouteInfo(routeInfo);
}
if (orderId != null) {
builder.setCmdInfo(MessagePad.CmdInfo.newBuilder().setOrderId(orderId));
}
MessagePad.TrajectoryDownloadReq req = builder.build();
return sendPBMessage(MessageType.TYPE_SEND_TRAJECTORY_DOWNLOAD_REQ, req.toByteArray());
}

10
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java
View File

@@ -763,13 +763,14 @@ public class AdasManager implements IAdasNetCommApi {
*
* @param line 线路相关参数详情见PB message_pad.proto -> Line
* @param routeInfo 20240523 进行自动算路，务必下单时候携带自动驾驶路径信息，否则可不填！
* @param orderId 订单号
* @return 消息是否添加到WS消息发送队列，返回值为非0的正整数时表示下发消息的消息ID
* * >=0：表示添加到WS发送消息队列
* * =0：表示乘客屏模式添加到WS发送消息队列
* * -1L：添加到WS发送消息队列失败
*/
public long sendTrajectoryDownloadReq(MessagePad.Line line, MessagePad.RouteInfo routeInfo) {
return mChannel == null ? -1L : mChannel.sendTrajectoryDownloadReq(line, -1, routeInfo);
public long sendTrajectoryDownloadReq(MessagePad.Line line, MessagePad.RouteInfo routeInfo, String orderId) {
return mChannel == null ? -1L : mChannel.sendTrajectoryDownloadReq(line, -1, routeInfo, orderId);
}
/**
@@ -779,14 +780,15 @@ public class AdasManager implements IAdasNetCommApi {
* @param line 线路相关参数详情见PB message_pad.proto -> Line
* @param downloadType 下载类型: 0:正常下载 1:预下载
* @param routeInfo 20240523 进行自动算路，务必下单时候携带自动驾驶路径信息，否则可不填！
* @param orderId 订单号
* @return 消息是否添加到WS消息发送队列，返回值为非0的正整数时表示下发消息的消息ID
* * >=0：表示添加到WS发送消息队列
* * =0：表示乘客屏模式添加到WS发送消息队列
* * -1L：添加到WS发送消息队列失败
*/
@Override
public long sendTrajectoryDownloadReq(MessagePad.Line line, int downloadType, MessagePad.RouteInfo routeInfo) {
return mChannel == null ? -1L : mChannel.sendTrajectoryDownloadReq(line, downloadType, routeInfo);
public long sendTrajectoryDownloadReq(MessagePad.Line line, int downloadType, MessagePad.RouteInfo routeInfo, String orderId) {
return mChannel == null ? -1L : mChannel.sendTrajectoryDownloadReq(line, downloadType, routeInfo, orderId);
}
/**

3
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java
View File

@@ -472,12 +472,13 @@ public interface IAdasNetCommApi {
* @param line 线路相关参数详情见PB message_pad.proto -> Line
* @param downloadType 下载类型: 0:正常下载 1:预下载
* @param routeInfo 20240523 进行自动算路，务必下单时候携带自动驾驶路径信息，否则可不填！
* @param orderId 订单号
* @return 消息是否添加到WS消息发送队列，返回值为非0的正整数时表示下发消息的消息ID
* * >=0：表示添加到WS发送消息队列
* * =0：表示乘客屏模式添加到WS发送消息队列
* * -1L：添加到WS发送消息队列失败
*/
long sendTrajectoryDownloadReq(MessagePad.Line line, int downloadType, MessagePad.RouteInfo routeInfo);
long sendTrajectoryDownloadReq(MessagePad.Line line, int downloadType, MessagePad.RouteInfo routeInfo, String orderId);
/**
* 发送 状态查询请求