From e259d305c8149071f6fa68403ad3476cf3e0f54a Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 28 Apr 2021 16:24:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=B7=AF=E4=BA=91=E6=A8=A1=E6=8B=9F?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/intent/MockIntentHandler.java | 1 + .../com/mogo/module/v2x/V2XWaringManager.java | 25 +------------------ .../module/v2x/utils/TestOnLineCarUtils.java | 5 +--- .../raw/scenario_warning_event_data_left.json | 8 +++--- ...enario_warning_event_data_pedestrians.json | 16 ++++++------ ...=> scenario_warning_event_data_right.json} | 8 +++--- 6 files changed, 19 insertions(+), 44 deletions(-) rename modules/mogo-module-v2x/src/main/res/raw/{scenario_warning_event_data.json => scenario_warning_event_data_right.json} (78%) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java index 14dedeeae0..b366848ece 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java @@ -848,6 +848,7 @@ public class MockIntentHandler implements IntentHandler { Log.i("mock-timer-loc-map", "cost " + (System.currentTimeMillis() - start) + "ms"); SnapshotLocationController.getInstance().syncAdasLocationInfo(jo); Log.i("mock-timer-loc", "cost " + (System.currentTimeMillis() - start) + "ms"); + Log.i("mock-timer-loc-info",jo.toString()); return true; } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XWaringManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XWaringManager.java index 2c2e0b360e..65771d6bba 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XWaringManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XWaringManager.java @@ -4,37 +4,14 @@ import android.content.Context; import android.content.Intent; import android.util.Log; -import com.mogo.map.MogoLatLng; -import com.mogo.map.marker.IMogoMarker; -import com.mogo.map.marker.MogoMarkerOptions; -import com.mogo.map.overlay.IMogoPolyline; -import com.mogo.module.common.MogoApisHandler; -import com.mogo.module.common.drawer.AdasRecognizedResultDrawer; -import com.mogo.module.common.drawer.MarkerDrawer; -import com.mogo.module.common.drawer.marker.AheadCollisionView; -import com.mogo.module.common.drawer.marker.AheadCollisionWindow3DAdapter; -import com.mogo.module.common.drawer.marker.EmptyMarkerView; -import com.mogo.module.common.drawer.marker.SimpleWindow3DAdapter; -import com.mogo.module.common.entity.MarkerShowEntity; -import com.mogo.module.common.entity.V2XMessageEntity; import com.mogo.module.common.entity.V2XWarningEntity; -import com.mogo.module.common.utils.Trigonometric; -import com.mogo.module.common.view.MarkerBaseFloor; -import com.mogo.module.v2x.entity.model.DrawLineInfo; import com.mogo.module.v2x.listener.V2XWarnMessageListener; import com.mogo.module.v2x.utils.V2XUtils; -import com.mogo.realtime.entity.ADASRecognizedResult; -import com.mogo.utils.UiThreadHandler; -import com.mogo.utils.ViewUtils; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; import java.io.ByteArrayOutputStream; import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; - -import static com.mogo.module.v2x.V2XServiceManager.getContext; /** * desc : V2X报警事件管理，这里进行报警事件的分发处理，包括了adas数据 @@ -83,7 +60,7 @@ public class V2XWaringManager { private void testData(String adasResult) { try { - int id = R.raw.scenario_warning_event_data; + int id = R.raw.scenario_warning_event_data_right; switch (adasResult) { case "left": id = R.raw.scenario_warning_event_data_left; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java index 2fa28eaa94..70a8ad59e8 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java @@ -1,15 +1,12 @@ package com.mogo.module.v2x.utils; import com.mogo.module.common.entity.MarkerExploreWay; -import com.mogo.module.common.entity.MarkerLocation; import com.mogo.module.common.entity.MarkerResponse; -import com.mogo.module.common.entity.MarkerShowEntity; import com.mogo.module.common.entity.V2XMessageEntity; import com.mogo.module.common.entity.V2XPushMessageEntity; import com.mogo.module.common.entity.V2XRoadEventEntity; import com.mogo.module.common.entity.V2XWarningEntity; import com.mogo.module.v2x.R; -import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.entity.net.V2XOptimalRouteDataRes; import com.mogo.module.v2x.entity.net.V2XSpecialCarRes; import com.mogo.utils.network.utils.GsonUtil; @@ -165,7 +162,7 @@ public class TestOnLineCarUtils { try { InputStream inputStream = V2XUtils.getApp() .getResources() - .openRawResource(R.raw.scenario_warning_event_data); + .openRawResource(R.raw.scenario_warning_event_data_right); ByteArrayOutputStream baos = new ByteArrayOutputStream(); int len = -1; byte[] buffer = new byte[1024]; diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json index 7c5d730ae0..753f8b9cb8 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json @@ -1,10 +1,10 @@ { "type": 1, - "lat": 26.88008312, - "lon": 112.57147295, + "lat": 26.88334099999226, + "lon": 112.57372754620843, "distance": 2, - "collisionLat": 26.88008312, - "collisionLon": 112.57147295, + "collisionLat": 26.882959494535577, + "collisionLon": 112.57329981692497, "stopLines": [ { "lat": 26.88008312, diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json index b085bcef25..1806702d72 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json @@ -1,18 +1,18 @@ { "type": 0, - "lat": 26.880223, - "lon": 112.571949, + "lat": 26.918372509, + "lon": 112.5631081, "distance": 2, - "collisionLat": 26.880238, - "collisionLon": 112.571949, + "collisionLat": 26.894992867527854, + "collisionLon": 112.5631081, "stopLines": [ { - "lat": 26.880223, - "lon": 112.571949 + "lat": 26.91837250865101, + "lon": 112.5631081 }, { - "lat": 26.880200, - "lon": 112.571949 + "lat": 26.91837250865101, + "lon": 112.5631081 } ], "from": 1, diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json similarity index 78% rename from modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json rename to modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json index b0c0b5a1c3..831c1b5277 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json @@ -1,10 +1,10 @@ { "type": 2, - "lat": 26.88008312, - "lon": 112.57147295, + "lat": 26.882403237, + "lon": 112.5631081, "distance": 2, - "collisionLat": 26.88008312, - "collisionLon": 112.57147295, + "collisionLat": 26.88240383, + "collisionLon": 112.5631081, "stopLines": [ { "lat": 26.88008312,