Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk

# Conflicts:
#	modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json
#	modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json
#	modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json
This commit is contained in:
董宏宇
2021-04-25 16:56:27 +08:00
15 changed files with 201 additions and 11 deletions

View File

@@ -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秒后移除提示弹框