diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningWindow.java index c03fae1521..307b019ba7 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningWindow.java @@ -80,8 +80,7 @@ public class V2XWarningWindow extends V2XBasWindow implements IV2XWindow { break; } distance.setText(String.valueOf(mV2XWarningEntity.getDistance()) + "米"); - warningTextView.setText(mV2XWarningEntity.getWarningContent()); - mV2XWarningEntity.setTts(0); + warningTextView.setText(mV2XWarningEntity.getWarningContent());//验证云端数据是否 AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice(mV2XWarningEntity.getTts()); } //3秒后移除提示弹框 diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json index 5ad88b34a1..a7ce0d6e0d 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json @@ -1,5 +1,5 @@ { - "type": 10013, + "type": 1, "lat": 26.88299257, "lon": 112.5642132, "distance": 2, @@ -21,7 +21,7 @@ "speed": 11.108121, "targetColor": "#FF4040", "stopLineDistance": 60, - "warningContent": "小心行人", + "warningContent": "注意自行车", "heading": 0, "showTime": 8000, "roadwidth": 4.0 diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json index 29ddc9d6d1..897cb37e59 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json @@ -1,5 +1,5 @@ { - "type": 10013, + "type": 2, "lat": 26.88299257, "lon": 112.5642132, "distance": 2, @@ -21,7 +21,7 @@ "speed": 11.108121, "targetColor": "#FF4040", "stopLineDistance": 60, - "warningContent": "小心行人", + "warningContent": "注意摩托车", "heading": 0, "showTime": 8000, "roadwidth": 4.0 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 0dcb2f00a7..9e854a8efe 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,5 +1,5 @@ { - "type": 10013, + "type": 0, "lat": 26.88299257, "lon": 112.5642132, "distance": 2, @@ -21,7 +21,7 @@ "speed": 11.108121, "targetColor": "#FF4040", "stopLineDistance": 60, - "warningContent": "小心行人", + "warningContent": "注意行人", "heading": 0, "showTime": 8000, "roadwidth": 4.0