From b2aef26e163a2cd285605701665ac5c57c2a434d Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 1 Dec 2021 11:43:36 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E6=9B=BF=E6=8D=A23d=E6=A8=A1=E5=9E=8B,?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=88=92=E7=BA=BF=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/raw/jiantou.nt3d | Bin 0 -> 8107 bytes .../mogo/module/common/drawer/BaseDrawer.java | 2 +- .../scene/warning/V2XWarningMarker.java | 17 +++++++++++++---- ...cenario_warning_event_data_pedestrians.json | 6 +++--- 4 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 core/mogo-core-res/src/main/res/raw/jiantou.nt3d diff --git a/core/mogo-core-res/src/main/res/raw/jiantou.nt3d b/core/mogo-core-res/src/main/res/raw/jiantou.nt3d new file mode 100644 index 0000000000000000000000000000000000000000..86a3be06532f63f0adb97337046151507a49996a GIT binary patch literal 8107 zcmeHMO=uHA6n?c;>tb$IYgJfQK~a<4q-{!K(pnR1N=<2Np#?>npS2A&KO`$jBVwr_ zC_VHb6{HHHH>F1pRWKgJA9_&{d$IN;BDSUUAc`30bu#U==s|PvG6TEsdvCsZ^X6q{ z@?bZWmHoq_ zuB#YKJ>VNp3~PUnw~(Qq$?i(E07zLX%}-ZLw7(jqyd2?9djL@Gw*b_5sbqGhqeR|= z2|8}{{fazK`gl9jQNCORI8Ef%=@p6b@ph)8Y`;$Z+6(ib#PPhH=_nuh0G^XH;kvI5 z06aScFxLgJcX+kV`j;|VM#%V(ma77|($;#+Bvna7H8uOZ9kjCy$~O?p#a#z3ksqZc z(%Efv`;R+A@u(#bjt6y1CYnGG;A+Su0-=80kb`<}B<5D;A3j#(NZ74()%rDm!lU;^ zeA%RaBHP*-%JzpGVWpv7a%G&vK~y&aawd8rH>}~AKjD4AEH05N- z9lk96I5{?WduZf-TKYb>IKE&a37&cPaTXIj<0?h5ZZp2iHGIoCd=G-?AZZXO5u1Tz zK%5WU2I6KAcOuya;!ecFApRgl%^>bXaSTLhfVZJ24Mb@`wt*-O@GywdK$HgJP87#L zlm>Vkiqb%o24owE(f|*GC=LF1X)v{8{hgkQ;h}a-YI?G-l6<^+{YH{})AQu38bI^W dR`2+co+0|p5Wj4dz~m$>Kgd~Wv>#w2`~vbXmazZ; literal 0 HcmV?d00001 diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java index 55fd0e3677..c9ba764b07 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java @@ -216,7 +216,7 @@ public class BaseDrawer { } else if (recognizedType == AdasRecognizedType.classIdStopLine) { return R.raw.stopline; } else if (recognizedType == AdasRecognizedType.classIdWarningArrows) { - return R.raw.stopline; + return R.raw.jiantou; } else if (recognizedType == AdasRecognizedType.classIdUnKnow) { return R.raw.special_vehicle; } else if (recognizedType == AdasRecognizedType.classIdBicycle) { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java index a8cfdbe204..167fe5531e 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java @@ -33,7 +33,7 @@ import static com.mogo.module.v2x.V2XServiceManager.getContext; /** * @author liujing - * @description 前方预警marker打点 绘制安全线和预警线 + * @description 前方预警marker打点 绘制安全线和预警线 衡阳交付-取消划线需求,只渲染识别物红色模型移动过程,代码保留 * @since: 2021/3/30 */ public class V2XWarningMarker implements IV2XMarker{ @@ -86,20 +86,26 @@ public class V2XWarningMarker implements IV2XMarker{ WorkThreadHandler.getInstance().postDelayed(() -> { if (carLocation.lat != 0 && carLocation.lon != 0) { //在自车与停止线直线绘制蓝色预警线 - drawSelfCarLine(carLocation.lon, carLocation.lat, bearing); + //衡阳交付-取消划线需求,只渲染识别物红色模型移动过程 + //drawSelfCarLine(carLocation.lon, carLocation.lat, bearing); } else { } //二轮车和行人的渲染和移动 V2XServiceManager.getMarkerManager().removeMarkers(TYPE_MARKER_CLOUD_WARN_DATA); + /* 衡阳交付-取消划线需求,只渲染识别物红色模型移动过程 //获取停止线前方50m坐标点 MogoLatLng warningLocation = Trigonometric.getNewLocation(middleLocationInStopLine, 50, angleForCarMoveDirection()); //停止线向前方50m绘制红色预警线 drawRedWarningLineFrontOfStopLine(mCloundWarningInfo, middleLocationInStopLine, warningLocation); + + */ V2XWarnDataDrawer.getInstance().renderWarnData(mCloundWarningInfo); + //添加停止线marker - handleStopLine(); + //衡阳交付-取消划线需求,只渲染识别物红色模型移动过程 + //handleStopLine(); }, 0); Log.d(TAG, "显示时间为++" + String.valueOf(showTime) + "识别物类型:" + String.valueOf(mCloundWarningInfo.getType())); @@ -108,6 +114,7 @@ public class V2XWarningMarker implements IV2XMarker{ } else { //无停止线 Log.d(TAG, "无停止线"); WorkThreadHandler.getInstance().postDelayed(() -> { + /* 衡阳交付-取消划线需求,只渲染识别物红色模型移动过程 Log.d(TAG, "无停止线" + mCloundWarningInfo.toString()); //绘制识别物与交汇点连线，并且更新连线数据 drawOtherObjectLine(mCloundWarningInfo); @@ -118,6 +125,7 @@ public class V2XWarningMarker implements IV2XMarker{ } else { Log.d(TAG, "数据为空carLocation == null"); } + */ V2XWarnDataDrawer.getInstance().renderWarnData(mCloundWarningInfo); }, 0); @@ -390,7 +398,8 @@ public class V2XWarningMarker implements IV2XMarker{ if (mCloundWarningInfo != null) { mCloundWarningInfo.setCarLocation(new MogoLatLng(latLng.getLatitude(), latLng.getLongitude())); } - drawSelfCarLine(latLng.getLongitude(), latLng.getLatitude(), latLng.getBearing()); + //衡阳交付-取消划线需求,只渲染识别物红色模型移动过程 + //drawSelfCarLine(latLng.getLongitude(), latLng.getLatitude(), latLng.getBearing()); } Log.d(TAG, "车辆行驶轨迹" + String.valueOf(latLng.getLongitude()) + "," + String.valueOf(latLng.getLatitude())); } 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 198ddc19d6..9dfcee933d 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,8 +1,8 @@ { "type": 1, - "lat": 26.851993861219782, - "lon": 112.57065318116094, - "distance": 5.89, + "lat": 26.851909, + "lon": 112.571751, + "distance": 40.119, "collisionLat": 26.85198163866211, "collisionLon": 112.57059540184451, "stopLines": [