From 40f640a2c72b8bc7d4efd48074d2e0037491766d Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 15 Apr 2021 20:17:16 +0800 Subject: [PATCH] =?UTF-8?q?vr=E7=89=88=E6=9C=AC;=E4=BE=A7=E6=96=B9?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E7=94=BB=E7=BA=BF=E7=BB=8F=E7=BA=AC=E5=BA=A6?= =?UTF-8?q?=E8=A1=A5=E7=82=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/gradle.xml | 1 - libraries/map-custom/build.gradle | 2 +- .../drawable-xhdpi/module_main_warning_bkg_bottom.xml | 2 +- .../drawable-xhdpi/module_main_warning_bkg_left.xml | 2 +- .../drawable-xhdpi/module_main_warning_bkg_right.xml | 2 +- .../drawable-xhdpi/module_main_warning_bkg_top.xml | 2 +- .../v2x/manager/impl/MoGoV2XCloundDataManager.java | 11 +++++++---- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 4ff10f68a5..83405b8de1 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -91,7 +91,6 @@ diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 28941cfea3..aebc219be0 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.6' + implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.7' // implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4' } diff --git a/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_bottom.xml b/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_bottom.xml index 72aa9cfff4..081c757d2f 100644 --- a/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_bottom.xml +++ b/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_bottom.xml @@ -3,6 +3,6 @@ \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_left.xml b/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_left.xml index bc04920106..eb144a1779 100644 --- a/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_left.xml +++ b/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_left.xml @@ -3,6 +3,6 @@ \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_right.xml b/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_right.xml index 7300bc5cf7..8584828ccb 100644 --- a/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_right.xml +++ b/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_right.xml @@ -3,6 +3,6 @@ \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_top.xml b/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_top.xml index a6317a7428..dc0631a675 100644 --- a/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_top.xml +++ b/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_top.xml @@ -3,6 +3,6 @@ \ No newline at end of file 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 de5b02ee6b..7119339383 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 @@ -256,7 +256,7 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog } /** - * 绘制安全区域,自车与碰撞点之间的蓝色线 + * 自车为起点绘制(根据设计,前方行人/弱势交通参与者预警 getDirection() == 1 自车与停止线之间为蓝色预警;其他侧方预警自车与预碰撞点之间显示红色预警) */ private void drawSlefCarLine(double lon, double lat, float bearing) { if (!isSelfLineClear) { @@ -266,13 +266,16 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog MogoLatLng endLatlng = null; MogoLatLng addMiddleLoc = null; if (!isFirstLocation) { + //自车位置 startLatlng = new MogoLatLng(lat, lon); carLocation = getMogoLat(new MogoLatLng(lat, lon)); - endLatlng = new MogoLatLng(mCloundWarningInfo.getDirection() == 1 ? carLocation.lat : mCloundWarningInfo.getCollisionLat(), - mCloundWarningInfo.getDirection() == 1 ? carLocation.lon : mCloundWarningInfo.getCollisionLon()); + endLatlng = new MogoLatLng(mCloundWarningInfo.getDirection() == 1 ? middleLocationInStopLine.lat : mCloundWarningInfo.getCollisionLat(), + mCloundWarningInfo.getDirection() == 1 ? middleLocationInStopLine.lon : mCloundWarningInfo.getCollisionLon()); float distance = CoordinateUtils.calculateLineDistance(startLatlng.lon, startLatlng.lat, endLatlng.lon, endLatlng.lat); addMiddleLoc = Trigonometric.getNewLocation(startLatlng, distance / 2, mCloundWarningInfo.getAngle()); - Log.d(V2XConst.LOG_NAME_WARN, "drawSlefCarLine lon = " + carLocation.lon + "---lat = " + carLocation.lat); + + Log.d(TAG, "已自车为起点绘制 自车;" + startLatlng.lat + "," + startLatlng.lon + + "中间扩展点" + addMiddleLoc.lon + "," + addMiddleLoc.lat + "终点:" + endLatlng.lon + "," + endLatlng.lat); isFirstLocation = true; } if (mogoPolyline != null) {