「修复」

合并冲突
This commit is contained in:
董宏宇
2020-08-04 15:03:07 +08:00
parent a0fac7cb75
commit 17052d869c

View File

@@ -53,21 +53,8 @@ public class V2XSeekHelpScenario extends AbsV2XScenario<List<V2XMarkerEntity>> i
@Override
public void init(@Nullable V2XMessageEntity<List<V2XMarkerEntity>> v2XMessageEntity) {
mV2XMessageEntity = v2XMessageEntity;
if (V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) {
if (mV2XMessageEntity != null) {
mMarkerEntity = mV2XMessageEntity.getContent();
}
if (!isShown) {
setV2XWindow(new V2XSeekHelpWindow());
setV2XMarker(new V2XSeekHelpMarker());
} else {
countDownFaultHelpWindowCancel();
closeWindow();
clearPOI();
}
show();
}
setV2XMessageEntity(v2XMessageEntity);
AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("发现其他车主的求助信息");
// 广播给ADAS和Launcher卡片
V2XRoadEventEntity eventEntity = new V2XRoadEventEntity();