From ef1b7f3b93d356bbc8d33ebfa0431956f1ee6682 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 9 Sep 2021 19:39:58 +0800 Subject: [PATCH] opt --- .../com/mogo/module/hmi/ui/MoGoWarningFragment.kt | 1 + .../mogo/module/obu/mogo/MogoPrivateObuManager.kt | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt index b137336784..d5ecb383d0 100644 --- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt +++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt @@ -95,6 +95,7 @@ class MoGoWarningFragment : MvpFragment ttsContent = $ttsContent") AIAssist.getInstance(activity) diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt index c10b53e6f0..5d3d914749 100644 --- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt +++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt @@ -3,6 +3,7 @@ package com.mogo.module.obu.mogo import android.content.Context import android.util.Log import com.alibaba.android.arouter.launcher.ARouter +import com.mogo.commons.voice.AIAssist import com.mogo.module.common.datacenter.SnapshotLocationDataCenter import com.mogo.module.common.drawer.TrafficMarkerDrawer import com.mogo.module.common.enums.WarningTypeEnum @@ -538,6 +539,8 @@ class MogoPrivateObuManager private constructor() { } + private var isStrikeTts = false + /** * 构造对应展示数据和场景 根据obu的场景,add change delete确定是否展示 * @@ -639,7 +642,7 @@ class MogoPrivateObuManager private constructor() { } when (status) { - // 添加 + // 添加, add的时候,可能级别是2, ObuConstants.STATUS.ADD -> { //显示警告红边 mMogoServiceApis!!.v2XListenerManager.warningChangedForListenerWithDirection( @@ -657,6 +660,9 @@ class MogoPrivateObuManager private constructor() { if (level == 3) ttsContent else "", appId.toString() ) + if (level == 3) { + isStrikeTts = true + } //更新周边车辆进行预警颜色变换,车辆实时移动和变色 TrafficDataConvertUtils.cvxV2vThreatIndInfo2TrafficData(info)?.let { TrafficMarkerDrawer.updateITrafficInfo(it) @@ -664,6 +670,7 @@ class MogoPrivateObuManager private constructor() { } // 删除 ObuConstants.STATUS.DELETE -> { + isStrikeTts = false // 移除顶部弹窗 mIMoGoWaringProvider?.disableWarningV2X(appId.toString()) // 移除地图元素 @@ -671,6 +678,10 @@ class MogoPrivateObuManager private constructor() { } // 更新 else -> { + if (!isStrikeTts) { + AIAssist.getInstance(mContext).speakTTSVoice(ttsContent) + isStrikeTts = true + } //更新周边车辆进行预警颜色变换,车辆实时移动和变色 TrafficDataConvertUtils.cvxV2vThreatIndInfo2TrafficData(info)?.let { TrafficMarkerDrawer.updateITrafficInfo(it)