From 04d48b2ad5abc2fc5d26933c6aa8aeb010ef5c61 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 19 May 2023 14:28:21 +0800 Subject: [PATCH] [3.2.0] add func of track loc opt has under the 310 verision --- .../function/business/identify/TrackObj.java | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java index 55ef457a88..bd2fd9eecb 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java @@ -1,13 +1,19 @@ package com.mogo.eagle.core.function.business.identify; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_ADAS; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED; import static com.mogo.eagle.core.function.business.identify.TrackManager.LIMIT_SPEED; import android.annotation.SuppressLint; import com.mogo.eagle.core.data.enums.TrafficTypeEnum; +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.utilcode.geometry.S2CellId; import com.mogo.eagle.core.utilcode.geometry.S2LatLng; import com.mogo.eagle.core.utilcode.util.CoordinateUtils; +import com.mogo.eagle.core.utilcode.util.ParseVersionUtils; +import com.zhjt.service.chain.ChainLog; import java.util.Arrays; import java.util.Comparator; @@ -45,9 +51,30 @@ public class TrackObj { private void correct() { calAverageSpeedAndType(); + String dockerVersion = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getDockVersion(); + if (dockerVersion != null && !dockerVersion.isEmpty()) { + try { + int version = ParseVersionUtils.parseVersion(true, dockerVersion); + if (version >= 310) { + return; + } + } catch (Exception e) { + logErrorOfVersion(dockerVersion); + } + } calLoc(); } + @ChainLog(linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED, + linkCode = CHAIN_LINK_ADAS, + endpoint = 4, + nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA, + paramIndexes = {0}, + clientPkFileName = "sn") + private void logErrorOfVersion(String version) { + + } + @SuppressLint("NewApi") private void calAverageSpeedAndType() { if (circleQueue.size() >= 3) { @@ -68,7 +95,7 @@ public class TrackObj { } speedAverage = cal / objQueueList.size(); } - if(typeArray.length > 0){ + if (typeArray.length > 0) { typeArray = Arrays.stream(typeArray).sorted().toArray(); typeWeight = typeArray[typeArray.length / 2] == 0 ? cacheData.getType() : typeArray[typeArray.length / 2]; } @@ -166,7 +193,7 @@ public class TrackObj { return d; } - public void clear(){ + public void clear() { circleQueue.clear(); s2CellId = null; s2LatLng = null;