From 0bf23dbe1c97df6f55839befd43ece6afd774fbd Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Wed, 24 May 2023 15:02:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[adas]=E4=BF=AE=E5=A4=8DADAS=E8=AE=A2?= =?UTF-8?q?=E9=98=85=E5=92=8C=E5=8F=96=E6=B6=88=E8=AE=A2=E9=98=85=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../support/adas/high/msg/M1StitchedVideoMessage.java | 4 ++-- .../adas/high/subscribe/SubscribeInterface.java | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/M1StitchedVideoMessage.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/M1StitchedVideoMessage.java index 32908a8593..e6a66f39ea 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/M1StitchedVideoMessage.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/M1StitchedVideoMessage.java @@ -21,13 +21,13 @@ public class M1StitchedVideoMessage extends MyAbstractMessageHandler { int len = raw.getPackageLengthValue() - raw.getOffsetValue(); byte[] data = new byte[len]; System.arraycopy(raw.originalData.toByteArray(), raw.getOffsetValue(), data, 0, len); - AdasChannel.calculateTimeConsumingOnDispatchRaw("M1StitchedVideoMessage", raw.receiveTime); + AdasChannel.calculateTimeConsumingOnDispatchRaw("M1拼接视频", raw.receiveTime); long nowTime = 0; if (CupidLogUtils.isEnableLog()) nowTime = SystemClock.elapsedRealtime(); if (adasListener != null) { adasListener.onM1StitchedVideo(raw.getHeader(), data); } - AdasChannel.calculateTimeConsumingBusiness("M1StitchedVideoMessage", nowTime); + AdasChannel.calculateTimeConsumingBusiness("M1拼接视频", nowTime); } } diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/subscribe/SubscribeInterface.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/subscribe/SubscribeInterface.java index 37d22f46a4..4c23c3065d 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/subscribe/SubscribeInterface.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/subscribe/SubscribeInterface.java @@ -138,9 +138,13 @@ public class SubscribeInterface { MessageType[] types = MessageType.values(); if (types.length > 0) { for (MessageType messageType : types) { - //连接成功后只有M1拼接视频接收接口默认不进行订阅，其他接收接口默认自动订阅 - if (messageType != MessageType.TYPE_RECEIVE_M1_STITCHED_VIDEO && messageType.name().toLowerCase().contains("type_receive")) { - subscribedInterface.put(messageType, messageType.typeCode.getNumber()); + if (messageType.name().toLowerCase().contains("type_receive")) { + //连接成功后只有M1拼接视频接收接口默认不进行订阅，其他接收接口默认自动订阅 + if (messageType == MessageType.TYPE_RECEIVE_M1_STITCHED_VIDEO) { + unsubscribedInterface.put(messageType, messageType.typeCode.getNumber()); + } else { + subscribedInterface.put(messageType, messageType.typeCode.getNumber()); + } } } } From e86d6a32ee16234ab65935b2b51b5462272c3245 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Wed, 24 May 2023 15:45:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[sweeper310][adas]=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=B8=85=E6=89=AB=E8=BD=A6pb=20100001=E3=80=81100002=E3=80=811?= =?UTF-8?q?00004=E6=B7=BB=E5=8A=A0=20=E6=98=AF=E5=90=A6=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=BC=B9=E7=AA=97=E5=AD=97=E6=AE=B5=EF=BC=88?= =?UTF-8?q?isPop=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo-adas-data/src/main/proto/sweeper/sweeper_task.proto | 1 + .../src/main/proto/sweeper/sweeper_task_confirm.proto | 1 + .../src/main/proto/sweeper/sweeper_task_stop.proto | 1 + 3 files changed, 3 insertions(+) diff --git a/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task.proto b/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task.proto index b37eb88cfb..03dcc8330c 100644 --- a/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task.proto +++ b/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task.proto @@ -54,6 +54,7 @@ message TaskInfo { uint64 taskEndTime = 5; //任务预计结束时间 时间戳 uint64 currentTime = 6; //当前时间戳 repeated SubTaskInfo subList = 7; // 子任务列表信息 + bool isPop = 8; // 是否弹窗 } //1.2、响应信息 diff --git a/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task_confirm.proto b/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task_confirm.proto index ccc0b61f3c..5a2e34e50f 100644 --- a/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task_confirm.proto +++ b/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task_confirm.proto @@ -12,6 +12,7 @@ message TaskConfirm { string sn = 1;// sn string taskId = 2;// 大任务编号 string subTaskId = 3;// 子任务编号 + bool isPop = 4; // 是否弹窗 } //2.2、响应信息 diff --git a/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task_stop.proto b/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task_stop.proto index bc684774dd..72af952f09 100644 --- a/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task_stop.proto +++ b/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task_stop.proto @@ -22,6 +22,7 @@ message StopTaskReq { string sn = 1;// sn string taskId = 2;// 大任务ID StopTaskType type = 3; //任务结束类型 + bool isPop = 4; // 是否弹窗 } //4.2、响应信息