From 25ef9fb765d5eab8df2d06a43cf435b5b4211fcc Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 30 Nov 2021 11:00:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E7=AB=AF=E4=B8=8B=E5=8F=91=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=E6=94=B9=E4=B8=BAgps,=E7=BB=98=E5=88=B6=E4=BE=A7?= =?UTF-8?q?=E4=BC=A0=E5=8F=82=E4=B8=BAgps=E5=AE=9A=E4=BD=8D,=E4=B8=8D?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=9C=B0=E5=9B=BE=E4=BE=A7=E8=BD=AC=E4=B8=80?= =?UTF-8?q?=E6=AC=A1,setGps(true)=20=E5=A6=82=E6=9E=9C=E4=BC=A0=E5=8F=82?= =?UTF-8?q?=E4=B8=BA=E9=AB=98=E5=BE=B7=E5=AE=9A=E4=BD=8D,setGps(false),?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=BE=A7=E8=BD=AC=E9=AB=98=E5=BE=B7=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=E4=B8=BAGPS=E5=86=8D=E7=BB=98=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../map/impl/custom/CustomMapApiBuilder.java | 2 +- .../common/drawer/V2XWarnDataDrawer.java | 4 ++-- .../impl/MoGoPersonWarnPolylineManager.java | 2 +- .../manager/impl/MoGoWarnPolylineManager.java | 4 ++-- ...enario_warning_event_data_pedestrians.json | 22 +++++-------------- 5 files changed, 12 insertions(+), 22 deletions(-) diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java index eb23706c19..3fd73a29f7 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java @@ -74,7 +74,7 @@ public class CustomMapApiBuilder implements IMogoMapApiBuilder { Log.d(TAG, "setDebugMode==true"); MapParams mapParams = MapParams.Companion.init(); - mapParams.setDebugMode(false) + mapParams.setDebugMode(true) //.setDataFileSource(1) //todo 1-使用本地地图数据，0-使用在线地图数据 .setCoordinateType(MapParams.COORDINATETYPE_GCJ02) .setPerspectiveMode(MapParams.MAP_PERSPECTIVE_2D) 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 ee17d909ff..6968b30acb 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 @@ -108,7 +108,7 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL .object(markerShowEntity) .latitude(markerShowEntity.getMarkerLocation().getLat()) .longitude(markerShowEntity.getMarkerLocation().getLon()) - .setGps(false); + .setGps(true); IMarkerView iMarkerView = MapMarkerAdapter.getMarkerView(mContext, markerShowEntity, options); options.icon3DRes(getModelRes(modeResType)); //TODO options.anchorColor("#FB3C3CFF"); @@ -124,7 +124,7 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL .latitude(location.getLat()) .longitude(location.getLon()) .set3DMode(true) - .setGps(false) + .setGps(true) .controlAngle(true) .icon3DRes(getModelRes(type)) .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 9bd3af9936..dfcd9256dc 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 @@ -36,7 +36,7 @@ public class MoGoPersonWarnPolylineManager implements IMoGoPersonWarnPolylineMan } // 连接线参数 - MogoPolylineOptions options = new MogoPolylineOptions().setGps(false); + MogoPolylineOptions options = new MogoPolylineOptions().setGps(true); // 渐变色 List colors = new ArrayList<>(); 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 9107b2144f..c39ab0aa07 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 @@ -37,7 +37,7 @@ public class MoGoWarnPolylineManager implements IMoGoWarnPolylineManager { // 连接线参数 MogoPolylineOptions options = new MogoPolylineOptions() - .setGps(false); + .setGps(true); List colors = new ArrayList<>(); if (info.isHasStopLines() == true) { @@ -50,7 +50,7 @@ public class MoGoWarnPolylineManager implements IMoGoWarnPolylineManager { colors.add(0x0DE32F46); } - Log.d(V2XConst.LOG_NAME_WARN, "MoGoWarnPolylineManager roadWidth = " + info.getWidth()); + Log.d("V2XWarningMarker", "MoGoWarnPolylineManager roadWidth = " + info.getWidth()); // 线条粗细，渐变，渐变色值 options.width(info.getWidth() == 0.0 ? 60 : info.getWidth()).useGradient(true).colorValues(colors); List locations = info.getLocations(); 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 6226dfd0de..198ddc19d6 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,29 +1,19 @@ { "type": 1, - "lat": 26.87912015, - "lon": 112.56885373, - "distance": 2.678, - "collisionLat": 26.8791769, - "collisionLon": 112.56896496, + "lat": 26.851993861219782, + "lon": 112.57065318116094, + "distance": 5.89, + "collisionLat": 26.85198163866211, + "collisionLon": 112.57059540184451, "stopLines": [ - { - "lat": 26.8791769, - "lon": 112.56896496 - - }, - { - "lat": 26.879153, - "lon": 112.568997 - } ], "from": 1, "angle": 240, "direction": 1, "speed": 11.108121, - "targetColor": "#FF4040", "stopLineDistance": 60, "warningContent": "小心行人", - "heading": 0, + "heading": 76, "showTime": 3, "roadwidth": 4.0 } \ No newline at end of file