Merge branch 'refs/heads/dev_robobus-d_241226_6.8.6' into dev_robotaxi-d_241210_6.9.0
# Conflicts: # OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt # gradle.properties
This commit is contained in:
@@ -134,7 +134,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
|
||||
);
|
||||
CallerHmiManager.INSTANCE.warningV2X(poiType, alarmText,
|
||||
ttsText, this,WarningDirectionEnum.ALERT_WARNING_TOP,
|
||||
TimeUnit.SECONDS.toMillis(5), AIAssist.LEVEL2, false);
|
||||
TimeUnit.SECONDS.toMillis(5), AIAssist.NEW_LEVEL_2, false);
|
||||
//消息埋点
|
||||
V2XEventAnalyticsManager.INSTANCE.triggerV2XEvent(poiType,alarmText,ttsText, DataSourceType.AICLOUD, CommunicationType.V2N);
|
||||
}
|
||||
|
||||
@@ -88,7 +88,7 @@ public class V2XFrontWarningScenario extends AbsV2XScenario implements IMoGoChas
|
||||
CallerHmiManager.INSTANCE.warningV2X(v2xType + "",
|
||||
getAlertContentForFrontWarning(mMarkerEntity), mMarkerEntity.getTts(),
|
||||
this,getDirection(),
|
||||
TimeUnit.SECONDS.toMillis(5), AIAssist.LEVEL2, false);
|
||||
TimeUnit.SECONDS.toMillis(5), AIAssist.NEW_LEVEL_2, false);
|
||||
//消息埋点
|
||||
V2XEventAnalyticsManager.INSTANCE.triggerV2XEvent(v2xType,getAlertContentForFrontWarning(mMarkerEntity).toString(),
|
||||
mMarkerEntity.getTts(), DataSourceType.AICLOUD, CommunicationType.V2N);
|
||||
|
||||
Reference in New Issue
Block a user