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

[6.6.0][引导线] 优化前车引导线黑边问题

Browse Source
This commit is contained in:
renwj
2024-09-04 17:25:55 +08:00
parent d7929c4df0
commit c87f8e2dca
4 changed files with 5 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt
View File

@@ -140,52 +140,6 @@ internal object V2NIdentifyDrawer: IEventDismissListener {
car.longitude, car.longitude,
car.latitude car.latitude
) )
// if (polygon.isNotEmpty()) {
// val decision = V2NUtils.computeOccupyLanesInfo(Triple(car.longitude, car.latitude, car.heading.toFloat()), Triple(itx.longitude, itx.latitude, itx.heading.toFloat()), polygon.map { kotlin.Pair(it.first, it.second) })
// if (decision != null) {
// val isDriver = AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)
// val total = decision.total
// val occupy = decision.occupy
// val laneId = decision.laneId
// val sb = StringBuilder()
// V2XBizTrace.onAck(decision, "计算出道路事件占道决策数据1")
// if (laneId != null) {
// val isOccupy = occupy.find { it.id == laneId } != null
// if (isOccupy) {
// if (isDriver) {
// val bestLane = V2NUtils.computeBestLane(laneId, occupy, total)
// V2XBizTrace.onAck(bestLane, "计算出最优车道")
// sb.append("发现前方${distance.toInt()}米${ if (poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGONG.poiType) "车道施工" else "车道事故" }@@, 蘑菇建议您尽快${bestLane.second}")
// } else {
// sb.append("发现前方${distance.toInt()}米${ if (poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGONG.poiType) "车道施工" else "车道事故" }@@, 蘑菇时刻为您守护")
// }
// } else {
// if (isDriver) {
// sb.append("发现前方${distance.toInt()}米${ if (poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGONG.poiType) "车道施工" else "车道事故" }@@, 蘑菇提醒您小心${ if (computeDirection(laneId, occupy) > 0) "右侧" else "左侧" }行人及来车")
// } else {
// sb.append("发现前方${distance.toInt()}米${ if (poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGONG.poiType) "车道施工" else "车道事故" }@@, 蘑菇时刻为您守护")
// }
// }
// } else {
// sb.append("发现前方${distance.toInt()}米${ if (poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGONG.poiType) "车道施工" else "车道事故" }@@, 蘑菇时刻为您守护")
// }
// if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
// runCatching {
// CallerHmiManager.notifyXiaoZhiStatusChanged(V2N(EventTypeEnumNew.getEnumType(poiType)), START)
// }
// scope.launch {
// delay(5000)
// runCatching {
// CallerHmiManager.notifyXiaoZhiStatusChanged(V2N(EventTypeEnumNew.getEnumType(poiType)), STOP)
// }
// }
// }
// val ss = sb.toString()
// val content = ss.substring(0, ss.indexOf("@@"))
// val tts = ss.replace("@@", "")
// CallerRoadV2NEventWindowListenerManager.showLiveVideo(id, itx.detectStartTime.takeIf { it > 0 } ?: System.currentTimeMillis(), EventTypeEnumNew.getUpdateIconRes(poiType), content, isDriver, tts, itx.cameraIp, itx.longitude, itx.latitude)
// }
// }
val isDriver = AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) val isDriver = AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)
if (!isDriver) { if (!isDriver) {
runCatching { runCatching {

2
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt
View File

@@ -46,7 +46,7 @@ class AiRoadMarker {
val aiMakers = ConcurrentHashMap<String, AiRoadMarker>() val aiMakers = ConcurrentHashMap<String, AiRoadMarker>()
private const val TAG = "AiRoadMarker" private const val TAG = "AiRoadMarker"
private val COLOR_START = Color.parseColor("#002ABAD9") private val COLOR_START = Color.parseColor("#0030A3FF")
private val COLOR_END = Color.parseColor("#66FF7A30") private val COLOR_END = Color.parseColor("#66FF7A30")
private val builders by lazy { ConcurrentHashMap<String, Point.Options.Builder>() } private val builders by lazy { ConcurrentHashMap<String, Point.Options.Builder>() }

4
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt
View File

@@ -38,12 +38,12 @@ class V2XAiRoadEventMarker {
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
val colors = ArrayList<Int>() val colors = ArrayList<Int>()
colors.add(Color.argb(204, 237, 172, 21)) colors.add(Color.argb(204, 237, 172, 21))
colors.add(Color.argb(0, 255, 255, 255)) colors.add(Color.argb(0, 48, 163, 255))
builder.colors(colors) builder.colors(colors)
} else { } else {
val colors = ArrayList<Int>() val colors = ArrayList<Int>()
colors.add(Color.parseColor("#99FF8F2A")) colors.add(Color.parseColor("#99FF8F2A"))
colors.add(Color.argb(0, 255, 255, 255)) colors.add(Color.argb(0, 48, 163, 255))
builder.colors(colors) builder.colors(colors)
} }
val dispersedPoints = getDispersedPoints(polygon.map { Pair<Double, Double>(it.first, it.second) }, 3) val dispersedPoints = getDispersedPoints(polygon.map { Pair<Double, Double>(it.first, it.second) }, 3)

4
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java
View File

@@ -73,7 +73,7 @@ public class RouteOverlayDrawer {
List<Integer> alphas = MapTools.INSTANCE.getColorAlpha(temps); List<Integer> alphas = MapTools.INSTANCE.getColorAlpha(temps);
if (alphas != null && !alphas.isEmpty()) { if (alphas != null && !alphas.isEmpty()) {
for (int i : alphas) { for (int i : alphas) {
greenWaveColors.add(Color.argb(i, 109,254,208)); greenWaveColors.add(Color.argb(i, 48, 163, 255));
} }
} }
} }
@@ -151,7 +151,7 @@ public class RouteOverlayDrawer {
if (alphas != null && !alphas.isEmpty()) { if (alphas != null && !alphas.isEmpty()) {
colors = new CopyOnWriteArrayList<>(); colors = new CopyOnWriteArrayList<>();
for (int i : alphas) { for (int i : alphas) {
colors.add(Color.argb(i, 48,203,251)); colors.add(Color.argb(i, 48,163,255));
} }
} }
} }