From 2e1d8122cbc731b7707833195ced840abe8bd895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 20 Aug 2021 17:07:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=BC=B9=E7=AA=97=E4=BA=92?=
 =?UTF-8?q?=E6=96=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/module/hmi/notification/WarningFloat.kt | 16 +++++++++-------
 .../mogo/module/hmi/ui/MoGoWarningFragment.kt    | 15 +++++++++++----
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/WarningFloat.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/WarningFloat.kt
index 1a5cd648ea..09a116cbe7 100644
--- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/WarningFloat.kt
+++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/WarningFloat.kt
@@ -38,7 +38,7 @@ class WarningFloat {
      */
     class Builder(private val activity: Context) {
         // 创建浮窗数据类，方便管理配置
-        private val config = WarningNotificationConfig()
+        val config = WarningNotificationConfig()
 
         /**
          * 设置浮窗的吸附模式
@@ -138,12 +138,14 @@ class WarningFloat {
         /**
          * 创建浮窗，包括Activity浮窗和系统浮窗，如若系统浮窗无权限，先进行权限申请
          */
-        fun show() = when {
-            // 未设置浮窗布局文件/布局视图，不予创建
-            config.layoutId == null && config.layoutView == null ->
-                Logger.e(TAG, "需要传入 layoutId 或 layoutView ")
-            // 申请浮窗权限
-            else -> WarningFloatWindowManager.create(activity, config)
+        fun show() = apply {
+            when {
+                // 未设置浮窗布局文件/布局视图，不予创建
+                config.layoutId == null && config.layoutView == null ->
+                    Logger.e(TAG, "需要传入 layoutId 或 layoutView ")
+                // 申请浮窗权限
+                else -> WarningFloatWindowManager.create(activity, config)
+            }
         }
 
     }
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 d8ba663d61..8d9965099c 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
@@ -24,6 +24,8 @@ import kotlinx.android.synthetic.main.fragment_warning.*
 class MoGoWarningFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>(),
     MoGoWarningContract.View {
 
+    var mWarningFloat: WarningFloat.Builder? = null
+
     override fun initViews() {}
 
     override fun getLayoutId(): Int {
@@ -60,12 +62,11 @@ class MoGoWarningFragment : MvpFragment<MoGoWarningContract.View?, WaringPresent
                 )
             )
 
-            if (!TextUtils.isEmpty(ttsContent)) {
-                AIAssist.getInstance(activity)
-                    .speakTTSVoice(ttsContent)
+            if (mWarningFloat != null) {
+                WarningFloat.dismiss(mWarningFloat!!.config.floatTag, true)
             }
 
-            WarningFloat.with(it)
+            mWarningFloat = WarningFloat.with(it)
                 .setTag(tag)
                 .setLayout(notificationView)
                 .setSidePattern(SidePattern.TOP)
@@ -92,6 +93,12 @@ class MoGoWarningFragment : MvpFragment<MoGoWarningContract.View?, WaringPresent
                 })
                 .show()
 
+            // 创建弹窗成功才进行TTS播报
+            if (mWarningFloat != null && !TextUtils.isEmpty(ttsContent)) {
+                AIAssist.getInstance(activity)
+                    .speakTTSVoice(ttsContent)
+            }
+
         }
     }