From 109a194701286edb834f33166c19644acc36f835 Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Thu, 4 Aug 2022 10:06:24 +0800
Subject: [PATCH] =?UTF-8?q?[V2X]=E4=BC=98=E5=8C=96V2X=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/function/hmi/ui/MoGoHmiFragment.kt     | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
index 8c0936b3aa..6922a189c9 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
@@ -74,7 +74,6 @@ import com.mogo.eagle.core.utilcode.kotlin.*
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.*
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
 import com.mogo.eagle.core.utilcode.reminder.*
 import com.mogo.eagle.core.utilcode.reminder.api.*
@@ -144,9 +143,9 @@ import java.util.*
 
     private var adUpgradeDialog: AdUpgradeDialog?=null
 
-    private var speakJob: Job? = null
+    private var lastSpeakJob: Job? = null
 
-    private var showV2XJob: Job? = null
+    private var lastShowV2XJob: Job? = null
 
     private var showingV2XTip: IReminder? = null
     private var roadVideoDialog: RoadVideoDialog? = null
@@ -633,8 +632,6 @@ import java.util.*
                 }
             }) {
                 override fun show() {
-                    showV2XJob?.safeCancel()
-                    speakJob?.safeCancel()
                     val parent = it.window.decorView
                     parent.doOnAttach {
                         Log.d("$M_HMI$TAG", "--- show v2x dialog 2 ---: info -> v2x-type: $v2xType : expireTime: $expireTime")
@@ -644,15 +641,21 @@ import java.util.*
                 override fun isOverride(): Boolean {
                     return true
                 }
+
+                override fun key(): String {
+                    return v2xType
+                }
             }, object : IStateChangeListener {
 
                 override fun onShow(reminder: IReminder) {
                     listener?.onShow()
+                    lastShowV2XJob?.safeCancel()
+                    lastSpeakJob?.safeCancel()
                     showingV2XTip = reminder
                     lifecycleScope.launch {
                         delay(expireTime)
                     }.also { itx ->
-                        showV2XJob = itx
+                        lastShowV2XJob = itx
                     }.invokeOnCompletion { _ ->
                         reminder.hide()
                     }
@@ -660,7 +663,7 @@ import java.util.*
                         lifecycleScope.launch {
                             speak(it, ttsContent)
                         }.also { itx ->
-                            speakJob = itx
+                            lastSpeakJob = itx
                         }
                     }
                 }