diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyOriginDataDrawer.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyOriginDataDrawer.kt index ee7b05a06f..97ddd37b9a 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyOriginDataDrawer.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyOriginDataDrawer.kt @@ -69,7 +69,7 @@ class IdentifyOriginDataDrawer : Identify { //清除缓存 for (data in resultList) { if (trafficDataUuidList.size > 0 && trafficDataUuidList.contains("" + data.uuid)) { - if (TrackerSourceColorHelper.filterData(data)) { + if (TrackerSourceFilterHelper.filterData(data)) { continue } trafficDataUuidList.remove("" + data.uuid) @@ -104,14 +104,14 @@ class IdentifyOriginDataDrawer : Identify { mFilterTrafficData.clear() for (data in trafficData) { // 过滤掉未知感知数据 - if (TrackerSourceColorHelper.filterData(data)) { + if (TrackerSourceFilterHelper.filterData(data)) { continue } var temp: TrackedObject = data val uuid = "" + data.uuid val cacheData = mMarkersCaches[uuid] if (cacheData != null) { - val color = TrackerSourceColorHelper.getDefaultColor(data) + val color = TrackerSourceFilterHelper.getDefaultColor(data) temp = data.toBuilder().setColor(color).build() } mFilterTrafficData[uuid] = temp diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackManager.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackManager.java index 363bae8ae8..30420de422 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackManager.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackManager.java @@ -1,11 +1,7 @@ package com.mogo.eagle.core.function.business.identify; import android.annotation.SuppressLint; -import android.os.Build; import android.util.ArraySet; -import android.util.Log; - -import androidx.annotation.RequiresApi; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; @@ -18,7 +14,6 @@ import com.mogo.map.MogoMarkerManager; import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import mogo.telematics.pad.MessagePad; @@ -79,13 +74,13 @@ public class TrackManager { long cost = System.currentTimeMillis(); //进入过滤机制的感知物体,首先从缓存队列中进行查找 uuid for (MessagePad.TrackedObject data : trafficData) { - if (TrackerSourceColorHelper.INSTANCE.filterData(data)) { + if (TrackerSourceFilterHelper.INSTANCE.filterData(data)) { continue; } String uuid = "" + data.getUuid(); TrackObj trackObj = mMarkersCaches.get(uuid); - String color = TrackerSourceColorHelper.INSTANCE.getDefaultColor(data); + String color = TrackerSourceFilterHelper.INSTANCE.getDefaultColor(data); data = data.toBuilder().setColor(color).build(); if (trackObj != null) { @@ -135,7 +130,7 @@ public class TrackManager { for (MessagePad.TrackedObject data : resultList) { String uuid = "" + data.getUuid(); if (trafficDataUuid.size() > 0 && trafficDataUuid.contains(uuid)) { - if (TrackerSourceColorHelper.INSTANCE.filterData(data)) { + if (TrackerSourceFilterHelper.INSTANCE.filterData(data)) { continue; } trafficDataUuid.remove(uuid); 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/TrackerSourceFilterHelper.kt similarity index 99% rename from core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt rename to core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceFilterHelper.kt index b2400ffa9a..8dbc7b4d82 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/TrackerSourceFilterHelper.kt @@ -6,7 +6,7 @@ import com.mogo.eagle.core.data.enums.TrafficTypeEnum import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import mogo.telematics.pad.MessagePad.* -object TrackerSourceColorHelper { +object TrackerSourceFilterHelper { @SuppressLint("NewApi") fun filterData(data: TrackedObject): Boolean { diff --git a/gradle.properties b/gradle.properties index 405b9085a4..22f2ef588d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -63,7 +63,7 @@ BIZCONFIG_VERSION=1.3.2 SERVICE_BIZ_VERSION=1.2.4 ################ 外部依赖引用 ################ # loglib -LOGLIB_VERSION=1.5.22 +LOGLIB_VERSION=1.5.24 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION MOGO_NETWORK_VERSION=1.4.6.4