From f38b93147354bfecd42ba57eddc52d67d58ec1f0 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Mon, 2 Dec 2024 11:29:48 +0800 Subject: [PATCH] =?UTF-8?q?[690][adas]=E6=96=B0=E5=A2=9E=E4=BA=BA=E5=B7=A5?= =?UTF-8?q?=E6=8E=A5=E7=AE=A1=E6=97=B6=E7=BB=99PAD=E5=8F=91=E5=90=8E?= =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4=E6=95=B0=E6=8D=AE=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E4=B8=8E=E5=93=8D=E5=BA=94=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libraries/mogo-adas-data/src/main/proto/message_pad.proto | 2 +- .../src/main/java/com/zhidao/support/adas/high/AdasChannel.java | 2 +- .../src/main/java/com/zhidao/support/adas/high/AdasManager.java | 2 +- .../main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/mogo-adas-data/src/main/proto/message_pad.proto b/libraries/mogo-adas-data/src/main/proto/message_pad.proto index 7ee8c30228..5a1c0cc6a9 100644 --- a/libraries/mogo-adas-data/src/main/proto/message_pad.proto +++ b/libraries/mogo-adas-data/src/main/proto/message_pad.proto @@ -948,6 +948,6 @@ message CollisionReport //message definition for MsgTypeCaptureImgReqOnTakeOver MsgTypeCaptureFrontImgOnTakeOver MsgTypeCaptureBackImgOnTakeOver message CaptureImgOnTakeOver { - uint32 uuid = 1; + uint64 uuid = 1; bytes data = 2; } \ No newline at end of file diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java index 0f5fc2c190..e0cab876c4 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java @@ -3062,7 +3062,7 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec * * -1L：添加到WS发送消息队列失败 */ @Override - public long sendCaptureImgReqOnTakeOver(int uuid) { + public long sendCaptureImgReqOnTakeOver(long uuid) { MessagePad.CaptureImgOnTakeOver.Builder builder = MessagePad.CaptureImgOnTakeOver.newBuilder() .setUuid(uuid); MessagePad.CaptureImgOnTakeOver req = builder.build(); diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java index fdb651860b..f1d824e04c 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java @@ -1868,7 +1868,7 @@ public class AdasManager implements IAdasNetCommApi { * * -1L：添加到WS发送消息队列失败 */ @Override - public long sendCaptureImgReqOnTakeOver(int uuid) { + public long sendCaptureImgReqOnTakeOver(long uuid) { return mChannel == null ? -1L : mChannel.sendCaptureImgReqOnTakeOver(uuid); } diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java index c7f35baeb0..07e6bc88e6 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java @@ -1356,7 +1356,7 @@ public interface IAdasNetCommApi { * * =0：表示乘客屏模式添加到WS发送消息队列 * * -1L：添加到WS发送消息队列失败 */ - long sendCaptureImgReqOnTakeOver(int uuid); + long sendCaptureImgReqOnTakeOver(long uuid); // TODO 需求暂停 待讨论 // boolean getRoutes();