From 2cf4ed02807ad2a18be565d45307181b208f9f26 Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 30 Apr 2021 18:00:51 +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=E6=B7=BB=E5=8A=A0=20=20=E9=AB=98=E5=BE=B7?= =?UTF-8?q?=E5=9D=90=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/common/drawer/V2XWarnDataDrawer.java | 8 ++++---- .../impl/MoGoPersonWarnPolylineManager.java | 2 +- .../manager/impl/MoGoV2XCloundDataManager.java | 14 +++++++------- .../manager/impl/MoGoWarnPolylineManager.java | 2 +- .../raw/scenario_warning_event_data_left.json | 8 ++++---- .../scenario_warning_event_data_pedestrians.json | 16 ++++++++-------- .../raw/scenario_warning_event_data_right.json | 8 ++++---- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java index fe152e2570..137edcf3ef 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java @@ -137,7 +137,7 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL .object(markerShowEntity) .latitude(markerShowEntity.getMarkerLocation().getLat()) .longitude(markerShowEntity.getMarkerLocation().getLon()) - .setGps(true); + .setGps(false); IMarkerView iMarkerView = MapMarkerAdapter.getMarkerView(mContext, markerShowEntity, options); options.icon3DRes(getModelRes(modeResType)); //TODO options.anchorColor("#FB3C3CFF"); //红色#FF3036 蓝色：#256BFF @@ -153,7 +153,7 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL .latitude(location.getLat()) .longitude(location.getLon()) .set3DMode(true) - .setGps(true) + .setGps(false) .controlAngle(true) .icon3DRes(getModelRes(type)) .anchorColor("#FB3C3CFF") @@ -172,7 +172,7 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL .latitude(newLocation.getLat()) .longitude(newLocation.getLon()) .anchor(1.0f, 1.0f) - .setGps(true) + .setGps(false) .zIndex(MarkerDrawer.MARKER_Z_INDEX_HIGH); optionsRipple .icon(ViewUtils.fromView(new EmptyMarkerView(mContext))); @@ -214,7 +214,7 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL .object(markerShowEntity) .latitude(markerShowEntity.getMarkerLocation().getLat()) .longitude(markerShowEntity.getMarkerLocation().getLon()) - .setGps(true); + .setGps(false); IMarkerView iMarkerView = MapMarkerAdapter.getMarkerView(mContext, markerShowEntity, options); options.icon3DRes(getModelRes(9)); options.anchorColor("#FB3C3CFF"); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoPersonWarnPolylineManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoPersonWarnPolylineManager.java index f9e9f64052..9e48b58dd7 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoPersonWarnPolylineManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoPersonWarnPolylineManager.java @@ -37,7 +37,7 @@ public class MoGoPersonWarnPolylineManager implements IMoGoPersonWarnPolylineMan } // 连接线参数 - MogoPolylineOptions options = new MogoPolylineOptions().setGps(true); + MogoPolylineOptions options = new MogoPolylineOptions().setGps(false); // 渐变色 List colors = new ArrayList<>(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java index c87e38dba2..2d430d7db5 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java @@ -44,7 +44,7 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog private static String WARNING_ARROWS = "WARNING_ARROWS"; private V2XWarningEntity mCloundWarningInfo; private static String TAG = "MoGoV2XCloundDataManager"; - private boolean isSelfLineClear; + private boolean isSelfLineClear = true;//绘制线是否已被清除 private List fillPoints = new ArrayList();//停止线经纬度合集 private boolean isFirstLocation = false; private MogoLatLng carLocation = new MogoLatLng( @@ -70,7 +70,7 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog @Override public void analysisV2XCloundDataEvent(V2XWarningEntity cloundWarningInfo) { -// if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) { + if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) { mCloundWarningInfo = cloundWarningInfo; showTime = mCloundWarningInfo.getShowTime(); pointsBetween(); @@ -132,7 +132,7 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog }, showTime); } } -// } + } /** * 自车为起点绘制(根据设计,前方行人/弱势交通参与者预警 getDirection() == ALERT_THE_FRONT_CRASH_WARNING_TOP自车与停止线之间为蓝色预警;其他侧方预警自车与预碰撞点之间显示红色预警) @@ -306,19 +306,19 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog /** * 自车定位 移动完成需要 3s消失,这里何时清理，应该是没有数据的时候 + * 地图侧回调回的定位Location为高德坐标 */ @Override public void onCarLocationChanged2(Location latLng) { -// Log.d(V2XConst.LOG_NAME_WARN, "onCarLocationChanged2 lat = " + latLng.getLatitude() + "--lon =" + latLng.getLongitude() + "---isSelfLineClear = " + isSelfLineClear); -// if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) { + if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() && isSelfLineClear == false) { //当行人经纬度交点 开始画线，否则清理 if (mCloundWarningInfo != null) { mCloundWarningInfo.setCarLocation(new MogoLatLng(latLng.getLatitude(), latLng.getLongitude())); } drawSelfCarLine(latLng.getLongitude(), latLng.getLatitude(), latLng.getBearing()); -// } + } carLocation = new MogoLatLng(latLng.getLatitude(), latLng.getLongitude()); - Log.d("车行驶的轨迹---",String.valueOf(latLng.getLongitude())+","+String.valueOf(latLng.getLatitude())); + Log.d("车行驶的轨迹---", String.valueOf(latLng.getLongitude()) + "," + String.valueOf(latLng.getLatitude())); } @Override diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoWarnPolylineManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoWarnPolylineManager.java index 1898c65091..816f1251d9 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoWarnPolylineManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoWarnPolylineManager.java @@ -42,7 +42,7 @@ public class MoGoWarnPolylineManager implements IMoGoWarnPolylineManager { // 连接线参数 MogoPolylineOptions options = new MogoPolylineOptions() - .setGps(true); + .setGps(false); List colors = new ArrayList<>(); if (info.getDirection() == ALERT_THE_FRONT_CRASH_WARNING_TOP) { 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 891e86c408..05709435cd 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.8825429, - "lon": 112.5634378, + "lat": 26.879062, + "lon": 112.568863, "distance": 2, - "collisionLat": 26.88271105, - "collisionLon": 112.5636347, + "collisionLat": 26.8791769, + "collisionLon": 112.56896496, "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 377bf54d61..e47038e955 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,19 +1,19 @@ { "type": 0, - "lat": 26.8826624, - "lon": 112.5635601, + "lat": 26.87912015, + "lon": 112.56885373, "distance": 2, - "collisionLat": 26.8826262, - "collisionLon": 112.5635926, + "collisionLat": 26.8791769, + "collisionLon": 112.56896496, "stopLines": [ { - "lat": 26.8826624, - "lon": 112.5635601 + "lat": 26.8791769, + "lon": 112.56896496 }, { - "lat": 26.8826262, - "lon": 112.5635926 + "lat": 26.879153, + "lon": 112.568997 } ], "from": 1, diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json index b4f8a70913..9b504b7dd9 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json @@ -1,10 +1,10 @@ { "type": 2, - "lat": 26.8825826, - "lon": 112.5633788, + "lat": 26.879339, + "lon": 112.568933, "distance": 2, - "collisionLat": 26.8826135, - "collisionLon": 112.5635520, + "collisionLat": 26.8791769, + "collisionLon": 112.56896496, "stopLines": [ { "lat": 26.88241239,