yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ol' into dev2_aiSdk

Browse Source
This commit is contained in:
liujing
2021-04-29 17:30:21 +08:00
parent 9800c89466 f17f9d7d87
commit 7c8e577d77
6 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoPersonWarnPolylineManager.java
View File

@@ -37,7 +37,7 @@ public class MoGoPersonWarnPolylineManager implements IMoGoPersonWarnPolylineMan
}
// 连接线参数
MogoPolylineOptions options = new MogoPolylineOptions();
MogoPolylineOptions options = new MogoPolylineOptions().setGps(true);
// 渐变色
List<Integer> colors = new ArrayList<>();

4
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java
View File

@@ -89,7 +89,8 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog
V2XServiceManager.getMarkerManager().removeMarkers(WARNING_ARROWS);
if (cloundWarningInfo.getDirection() == ALERT_THE_FRONT_CRASH_WARNING_TOP) { //前方 TODO
middleLocationInStopLine = getMiddleLocationInStopLine();
MogoLatLng warningLocation = new MogoLatLng(cloundWarningInfo.getLat(),cloundWarningInfo.getLon());
//如果是正前方类型,红色绘制区域从停止线向前绘制50米
MogoLatLng warningLocation = Trigonometric.getNewLocation(middleLocationInStopLine, 50, cloundWarningInfo.getAngle());
//停止线前方画线
WorkThreadHandler.getInstance().postDelayed(() -> {
//二轮车和行人的渲染和移动
@@ -150,6 +151,7 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog
isFirstLocation = true;
}
//绘制线的终点(在停止线上或者预碰撞点上)
endLatlng = new MogoLatLng(mCloundWarningInfo.getDirection() == ALERT_THE_FRONT_CRASH_WARNING_TOP ? middleLocationInStopLine.lat : mCloundWarningInfo.getCollisionLat(),
mCloundWarningInfo.getDirection() == ALERT_THE_FRONT_CRASH_WARNING_TOP ? middleLocationInStopLine.lon : mCloundWarningInfo.getCollisionLon());
//自车位置

2
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XPolylineManager.java
View File

@@ -39,7 +39,7 @@ public class MoGoV2XPolylineManager implements IMoGoV2XPolylineManager {
&& !V2XServiceManager.getMoGoStatusManager().isVrMode()
) {
// 连接线参数
MogoPolylineOptions options = new MogoPolylineOptions();
MogoPolylineOptions options = new MogoPolylineOptions().setGps(true);
// 渐变色
List<Integer> colors = new ArrayList<>();

6
modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json
View File

@@ -1,7 +1,7 @@
{
"type": 1,
"lat": 26.8826301,
"lon": 112.5634948,
"lat": 26.8824956,
"lon": 112.5634341,
"distance": 2,
"collisionLat": 26.88271105,
"collisionLon": 112.5636347,
@@ -16,7 +16,7 @@
}
],
"from": 1,
"angle": 0,
"angle": 220,
"direction": 10014,
"speed": 11.108121,
"targetColor": "#FF4040",

19
modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json
View File

@@ -1,22 +1,23 @@
{
"type": 0,
"lat": 26.91837250865101,
"lon": 112.5631081,
"lat": 26.8826624,
"lon": 112.5635601,
"distance": 2,
"collisionLat": 26.91837250865101,
"collisionLon": 112.5631081,
"collisionLat": 26.8826262,
"collisionLon": 112.5635926,
"stopLines": [
{
"lat": 26.91837250865101,
"lon": 112.5631081
"lat": 26.8826624,
"lon": 112.5635601
},
{
"lat": 26.91840847737797,
"lon": 112.5631081
"lat": 26.8826262,
"lon": 112.5635926
}
],
"from": 1,
"angle": 264,
"angle": 240,
"direction": 10013,
"speed": 11.108121,
"targetColor": "#FF4040",

10
modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json
View File

@@ -1,10 +1,10 @@
{
"type": 2,
"lat": 26.88241239,
"lon": 112.5631241,
"lat": 26.8825972,
"lon": 112.5634219,
"distance": 2,
"collisionLat": 26.88241239,
"collisionLon": 112.5631241,
"collisionLat": 26.8826135,
"collisionLon": 112.5635520,
"stopLines": [
{
"lat": 26.88241239,
@@ -16,7 +16,7 @@
}
],
"from": 1,
"angle": 0,
"angle": 260,
"direction": 10015,
"speed": 11.108121,
"targetColor": "#FF4040",