From ec88cb6b86bf8b785f0dac318f659d48ab58b230 Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Sat, 7 May 2022 12:01:14 +0800
Subject: [PATCH] =?UTF-8?q?[V2X]=E9=AC=BC=E6=8E=A2=E5=A4=B4=E9=81=93?=
 =?UTF-8?q?=E8=B7=AF=E9=A2=84=E8=AD=A6=E8=A7=A6=E5=8F=91=E8=B7=9D=E7=A6=BB?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=BA<=3D25=E7=B1=B3,=E4=B8=8D=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E8=A7=86=E8=A7=92=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/function/v2x/events/V2XEventManager.kt |  2 +-
 .../v2x/events/alarm/V2XAlarmServer.java        |  2 +-
 .../scene/road/V2XRoadEventScenario.java        | 17 +++++++++++++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt
index ee3f40bc4c..db691bed52 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt
@@ -433,7 +433,7 @@ object V2XEventManager : IMoGoMapLocationListener, IMoGoTokenCallback, IV2XCallb
      * V2XEvent事件回调
      */
     override fun onAck(event: V2XEvent) {
-        CallerLogger.d("$M_V2X$TAG", "OK->: ${event.javaClass.name}")
+        CallerLogger.d("$M_V2X$TAG", "OK->: $event")
         when (event) {
             is V2XEvent.ForwardsWarning -> {
                 handleAdvanceWarningEvent(event)
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/alarm/V2XAlarmServer.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/alarm/V2XAlarmServer.java
index 87a4fea503..bd90c559af 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/alarm/V2XAlarmServer.java
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/alarm/V2XAlarmServer.java
@@ -55,7 +55,7 @@ public class V2XAlarmServer {
                         double distance = v2XRoadEventEntity.getDistance();
                         if (distance <= 500) {
                             if (EventTypeEnum.GHOST_PROBE.getPoiType().equals(v2XRoadEventEntity.getPoiType())) {
-                                if (distance > 15) {
+                                if (distance > 25) {
                                     continue;
                                 }
                             }
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java
index 52ef34afcf..1c5966cb80 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java
@@ -122,7 +122,9 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
 
     @Override
     public void onShow() {
-        CallerVisualAngleManager.INSTANCE.changeVisualAngle(CallerVisualAngleManager.Scene.RoadEvent.INSTANCE);
+        if (isNeedChangeAngle()) {
+            CallerVisualAngleManager.INSTANCE.changeVisualAngle(CallerVisualAngleManager.Scene.RoadEvent.INSTANCE);
+        }
         CallerHmiManager.INSTANCE.showWarning(WarningDirectionEnum.ALERT_WARNING_TOP, TimeUnit.HOURS.toMillis(1));
         V2XMessageEntity<V2XRoadEventEntity> entity = getV2XMessageEntity();
         if (entity != null) {
@@ -140,10 +142,21 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
         }
     }
 
+    private boolean isNeedChangeAngle() {
+        V2XMessageEntity<V2XRoadEventEntity> entity = getV2XMessageEntity();
+        V2XRoadEventEntity content = entity != null ? entity.getContent() : null;
+        if (content == null) {
+            return true;
+        }
+        return !EventTypeEnum.GHOST_PROBE.getPoiType().equals(content.getPoiType());
+    }
+
     @Override
     public void onDismiss() {
         CallerHmiManager.INSTANCE.dismissWarning(WarningDirectionEnum.ALERT_WARNING_TOP);
-        CallerVisualAngleManager.INSTANCE.changeVisualAngle(new CallerVisualAngleManager.Scene.Default(3, TimeUnit.SECONDS));
+        if (isNeedChangeAngle()) {
+            CallerVisualAngleManager.INSTANCE.changeVisualAngle(new CallerVisualAngleManager.Scene.Default(3, TimeUnit.SECONDS));
+        }
         clearPOI();
         release();
     }