From dec66f0eeef3813a6a861583f7f85e0bbe7c0968 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Mon, 18 Dec 2023 15:18:22 +0800
Subject: [PATCH] =?UTF-8?q?[6.2.6]=E5=B9=B3=E8=A1=8C=E9=A9=BE=E9=A9=B6?=
 =?UTF-8?q?=E7=9A=84=E5=BC=82=E5=B8=B8=E6=8F=90=E9=86=92=E5=9D=87=E5=9C=A8?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=E7=BE=8E=E5=8C=96=E6=A8=A1=E5=BC=8F=E5=90=8E?=
 =?UTF-8?q?=E4=B8=8D=E5=BC=B9=E5=87=BA=E3=80=81=E4=B8=8D=E8=AF=AD=E9=9F=B3?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../function/hmi/ui/vehicle/TakeOverView.kt   | 72 ++++++++++---------
 1 file changed, 39 insertions(+), 33 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt
index b364ff36fb..d893406150 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt
@@ -240,54 +240,60 @@ class TakeOverView @JvmOverloads constructor(
     }
 
     /**
-     * M1平行驾驶异常提示
+     * M1、C1平行驾驶异常提示
      */
     private fun showM1ParallelDrivingWarning(poiType: String,content: String,tts: String){
-        //消息盒子提示
-        saveMsgBox(
-            MsgBoxBean(
-                MsgBoxType.V2X, V2XMsg(poiType, content, tts)
+        //异常提醒均在开启美化模式后不弹出、不语音提示
+        if(!FunctionBuildConfig.isDemoMode){
+            //消息盒子提示
+            saveMsgBox(
+                MsgBoxBean(
+                    MsgBoxType.V2X, V2XMsg(poiType, content, tts)
+                )
             )
-        )
-        //提示音播报
-        if(canSound){
-            val countDownTimer = object : CountDownTimer(3000, 1000){
-                override fun onTick(p0: Long) {
-                    try {
-                        SoundPoolUtils.getSoundPool().playSoundWithRedId(context,R.raw.weak_net_tips)
-                    }catch (e: Exception){
-                        e.printStackTrace()
+            //提示音播报
+            if(canSound){
+                val countDownTimer = object : CountDownTimer(3000, 1000){
+                    override fun onTick(p0: Long) {
+                        try {
+                            SoundPoolUtils.getSoundPool().playSoundWithRedId(context,R.raw.weak_net_tips)
+                        }catch (e: Exception){
+                            e.printStackTrace()
+                        }
                     }
-                }
 
-                override fun onFinish() {
-                    canSound = true
-                }
+                    override fun onFinish() {
+                        canSound = true
+                    }
 
+                }
+                countDownTimer.start()
+                canSound = false
             }
-            countDownTimer.start()
-            canSound = false
         }
     }
 
     private fun showParallelDrivingWarning(poiType: String,content: String,tts: String){
-        CallerHmiManager.warningV2X(poiType, content, tts,
-            object : IMoGoWarningStatusListener {
-                override fun onShow() {
-                    takeOver = true
-                    ThreadUtils.runOnUiThread{
-                        visibility = View.VISIBLE
+        if(!FunctionBuildConfig.isDemoMode){
+            //异常提醒均在开启美化模式后不弹出、不语音提示
+            CallerHmiManager.warningV2X(poiType, content, tts,
+                object : IMoGoWarningStatusListener {
+                    override fun onShow() {
+                        takeOver = true
+                        ThreadUtils.runOnUiThread{
+                            visibility = View.VISIBLE
+                        }
                     }
-                }
 
-                override fun onDismiss() {
-                    takeOver = false
-                    ThreadUtils.runOnUiThread{
-                        visibility = View.GONE
+                    override fun onDismiss() {
+                        takeOver = false
+                        ThreadUtils.runOnUiThread{
+                            visibility = View.GONE
+                        }
                     }
                 }
-            }
-            ,isFromObu = false)
+                ,isFromObu = false)
+        }
     }
 
 }
\ No newline at end of file