From 12cffa44f7b893d2df075c2dfb38376d5a96c04e Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 28 Nov 2022 11:11:59 +0800 Subject: [PATCH] [2.13.0]wait to finish --- .../business/identify/TrackerSourceColorHelper.kt | 12 ++++++++---- .../core/function/notice/NoticeSocketManager.java | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt index e4ae0f16f5..052817fffa 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt @@ -72,10 +72,14 @@ object TrackerSourceColorHelper { */ @SuppressLint("NewApi") fun isIPC(data: TrackedObject): Boolean { - val source = data.trackedSourceList.stream().allMatch { - it.source != 2 + return if (data.trackedSourceList.size == 1) { // 如果仅有一个类型 + val source = data.trackedSourceList.stream().allMatch { + it.source == 1 + } + source + } else { + false } - return source } /** @@ -88,7 +92,7 @@ object TrackerSourceColorHelper { } if (source) { val first = data.trackedSourceList.stream() - .filter { trackedSource: TrackedSource -> trackedSource.source == 2}.findFirst() + .filter { trackedSource: TrackedSource -> trackedSource.source == 2 }.findFirst() if (first.isPresent) { val subObu = first.get().subSourceList.stream().anyMatch { it.source == 1 diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeSocketManager.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeSocketManager.java index bc750ef0f0..8607c4527d 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeSocketManager.java +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeSocketManager.java @@ -81,6 +81,7 @@ class NoticeSocketManager { @Override public void onMsgReceived(NoticeTrafficStylePushData obj) { CallerLogger.INSTANCE.d(M_NOTICE + TAG, "301001-- 交警类型公告数据:" + GsonUtil.jsonFromObject(obj)); + // todo CallerHmiManager.INSTANCE.showTrafficBanner(obj); } };