From 0bf23dbe1c97df6f55839befd43ece6afd774fbd Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Wed, 24 May 2023 15:02:46 +0800 Subject: [PATCH] =?UTF-8?q?[adas]=E4=BF=AE=E5=A4=8DADAS=E8=AE=A2=E9=98=85?= =?UTF-8?q?=E5=92=8C=E5=8F=96=E6=B6=88=E8=AE=A2=E9=98=85=E5=88=97=E8=A1=A8?= =?UTF-8?q?=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()); + } } } }