From ea6fd32ea8e6042928bf58bf9aaa20efed7985c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 2 Nov 2020 21:05:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java index b6f4962f44..157793b9e3 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java @@ -13,7 +13,6 @@ import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.utils.DrivingDirectionUtils; import com.mogo.module.v2x.utils.EventTypeUtils; -import com.mogo.module.v2x.utils.TestOnLineCarUtils; import com.mogo.module.v2x.utils.V2XUtils; import com.mogo.service.share.IMogoTanluProvider; import com.mogo.service.share.TanluUploadParams; @@ -57,6 +56,7 @@ public class V2XEarlyWarningServer { // 判断车辆行驶角度是否与事件相反，相反的话表示已经行驶过去了 if (90 <= eventAngle && !alertMessageId.contains(v2XRoadEventEntity.getNoveltyInfo().getInfoId())) { + // 封路、施工、拥堵、拥堵 才会有UGC提示 if (EventTypeUtils.isNeedRoadEventUgc(v2XRoadEventEntity.getPoiType())) { Logger.w(MODULE_NAME + "_" + TAG, "V2X预警UGC--事件与车头角度夹角过大：" + @@ -69,10 +69,6 @@ public class V2XEarlyWarningServer { alertMessageId.add(v2XRoadEventEntity.getNoveltyInfo().getInfoId()); - // 弹出UGC - V2XMessageEntity v2XMessageEntity = - TestOnLineCarUtils.getV2XScenarioRoadEventUGCData(); - // 加载数据源 V2XMessageEntity v2xMessageEntity = new V2XMessageEntity<>(); // 控制类型 @@ -81,8 +77,9 @@ public class V2XEarlyWarningServer { v2xMessageEntity.setContent(v2XRoadEventEntity); // 控制展示状态 v2xMessageEntity.setShowState(true); + // 弹出UGC Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION); - intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity); + intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2xMessageEntity); LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent);