yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.3.0] fix bug of warning track

Browse Source
This commit is contained in:
EmArrow
2024-03-07 19:00:52 +08:00
parent 75eeed9cc4
commit fa125f6011
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/WarningHelper.kt
View File

@@ -1,6 +1,7 @@
package com.mogo.eagle.core.function.business.identify
import android.annotation.SuppressLint
import android.util.Log
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.data.traffic.TrafficData
import com.mogo.eagle.core.data.traffic.threatLevelColor
@@ -77,12 +78,12 @@ object WarningHelper {
mMarkersCaches[trackId] ?: return@Consumer
if (planningObj.type == 0) { //0是leading障碍物，障碍物车身红色提示
pncWarningOriginTrafficData[trackId] = PlanningTrack(
"#D65D5AFF-drawColor",
"#D65D5AFF",
getCurWgs84SatelliteTime()
)
} else if (planningObj.type == 1) { //1是避障和择机的障碍物，障碍物车身黄色提示
pncWarningOriginTrafficData[trackId] = PlanningTrack(
"#E4DD94FF-drawColor",
"#E4DD94FF",
getCurWgs84SatelliteTime()
)
}
@@ -119,10 +120,10 @@ object WarningHelper {
if (pncWarningBeautyTrafficData.containsKey(uuid)) {
val planningTrack = pncWarningBeautyTrafficData[uuid]
if (planningTrack != null && !timeOut(planningTrack.time)) {
color.invoke(planningTrack.color)
color.invoke("${planningTrack.color}-drawColor")
} else {
pncWarningBeautyTrafficData.remove(uuid)
color.invoke("resetColor")
val c = pncWarningBeautyTrafficData.remove(uuid)
color.invoke("${c?.color}-resetColor")
}
return
}
@@ -132,10 +133,10 @@ object WarningHelper {
if (pncWarningOriginTrafficData.containsKey(uuid)) {
val planningTrack = pncWarningOriginTrafficData[uuid]
if (planningTrack != null && !timeOut(planningTrack.time)) {
color.invoke(planningTrack.color)
color.invoke("${planningTrack.color}-drawColor")
} else {
pncWarningOriginTrafficData.remove(uuid)
color.invoke("resetColor")
val c = pncWarningOriginTrafficData.remove(uuid)
color.invoke("${c?.color}-resetColor")
}
return
}

7
libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java
View File

@@ -3,6 +3,7 @@ package com.mogo.map.utils;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
@@ -121,12 +122,12 @@ public class ObjectUtils {
markerOptions.setColorType(3);
markerOptions.setColor(trafficData.getColor().split("-")[0]);
}
if(trafficData.getColor().contains("resetColor")){
if(trafficData.getColor().contains("-resetColor")){
markerOptions.setColorType(4);
markerOptions.setColor("#00000000");
markerOptions.setColor(trafficData.getColor().split("-")[0]);
}
}else{
// markerOptions.setColorType(0);
markerOptions.setColorType(0);
markerOptions.setColor("#00000000");
}
} catch (Exception e) {