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

Merge branch 'hj' into dev2_aiSdk

Browse Source
This commit is contained in:
liujing
2021-04-23 16:39:41 +08:00
parent 32cdf27dbf 5701cf1927
commit bfe76e0b25
6 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/gradle.xml generated
View File

@@ -90,7 +90,6 @@
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
<option name="useQualifiedModuleNames" value="true" />
</GradleProjectSettings>
</option>
</component>

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

@@ -81,9 +81,8 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog
}
mV2XScenario.setWarningEntity(cloundWarningInfo);
mV2XScenario.init(null);
//预警蒙层
MarkerServiceHandler.getApis().getV2XListenerManager().warningChangedForListenerWithDirection(cloundWarningInfo.getType(), MogoReceiver.ACTION_V2X_FRONT_WARNING);
MarkerServiceHandler.getApis().getV2XListenerManager().warningChangedForListenerWithDirection(cloundWarningInfo.getDirection(), MogoReceiver.ACTION_V2X_FRONT_WARNING);
isSelfLineClear = false;
isFirstLocation = false;
V2XServiceManager.getMarkerManager().removeMarkers(WARNING_ARROWS);

2
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java
View File

@@ -312,7 +312,7 @@ public class V2XTestConsoleWindow extends ConstraintLayout {
mBtnAdasDataWarn.setOnClickListener(v -> {
Intent intent = new Intent(V2XConst.BROADCAST_ADAS_SCENE_HANDLER_ACTION);
intent.putExtra(V2XConst.BROADCAST_ADAS_EXTRA_KEY, "23");
intent.putExtra(V2XConst.BROADCAST_ADAS_EXTRA_KEY, "right");
getContext().sendBroadcast(intent);
});

2
modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json
View File

@@ -17,7 +17,7 @@
],
"from": 1,
"angle": 0,
"direction": 3,
"direction": 10015,
"speed": 11.108121,
"targetColor": "#FF4040",
"stopLineDistance": 60,

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

@@ -17,7 +17,7 @@
],
"from": 1,
"angle": 0,
"direction": 3,
"direction": 10014,
"speed": 11.108121,
"targetColor": "#FF4040",
"stopLineDistance": 60,

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

@@ -17,7 +17,7 @@
],
"from": 1,
"angle": 0,
"direction": 1,
"direction": 10013,
"speed": 11.108121,
"targetColor": "#FF4040",
"stopLineDistance": 60,