From a87d9f519e6e2a30bca215b3282be09ec493f01e Mon Sep 17 00:00:00 2001
From: xinfengkun <xinfengkun@zhidaoauto.com>
Date: Wed, 27 Nov 2024 15:37:10 +0800
Subject: [PATCH] =?UTF-8?q?[680][app]=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=8D=E8=BF=9B=E8=A1=8C=E8=BF=9E=E6=8E=A5=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?toast=E5=92=8C=E6=B6=88=E6=81=AF=E5=BC=B9=E5=87=BA=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/och/biz/login/ui/LoginFragment.kt   | 3 +++
 .../adapter/MoGoAdasMsgConnectStatusListenerImpl.kt        | 2 +-
 .../call/autopilot/CallerIpcConnectStateToastManager.kt    | 7 +++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt
index 658fe25c4e..13dac4b9da 100644
--- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt
+++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt
@@ -17,6 +17,7 @@ import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.mvp.MvpFragment
 import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.function.call.autopilot.CallerIpcConnectStateToastManager
 import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView
 import com.mogo.eagle.core.function.hmi.ui.widget.ColdStartView
 import com.mogo.eagle.core.utilcode.kotlin.onClick
@@ -250,6 +251,7 @@ class LoginFragment : MvpFragment<LoginFragment?, LoginPresenter?>(), ILoginView
     override fun onResume() {
         biz_cl_driver_main?.viewTreeObserver?.addOnGlobalLayoutListener(onlayoutListener)
         super.onResume()
+        CallerIpcConnectStateToastManager.loginFragment(true)
         CallerLogger.d(TAG, "onResume")
         context?.let {
             val videoUrl:String
@@ -339,6 +341,7 @@ class LoginFragment : MvpFragment<LoginFragment?, LoginPresenter?>(), ILoginView
     override fun onPause() {
         biz_cl_driver_main?.viewTreeObserver?.removeOnGlobalLayoutListener(onlayoutListener)
         super.onPause()
+        CallerIpcConnectStateToastManager.loginFragment(false)
         CallerLogger.d(TAG, "onPause")
         viewColdStart.setColdStartResultListener(null)
     }
diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt
index 48bb9d778c..68bc83db76 100644
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt
@@ -124,6 +124,7 @@ class MoGoAdasMsgConnectStatusListenerImpl :
             AdasConstants.IpcConnectionStatus.CONNECTED -> {
                 connectStatusDescribe = "已连接"
                 CallerLogger.d("$M_D_C$TAG", connectStatusDescribe)
+                connectToast("域控已连接")
                 CallerIpcConnectStateToastManager.ipcConnected()
                 // 初始化自动驾驶状态信息
                 CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectIP =
@@ -142,7 +143,6 @@ class MoGoAdasMsgConnectStatusListenerImpl :
                 CallerAutoPilotControlManager.setRainMode(FunctionBuildConfig.isRainMode)
                 // 6.6.2 版本默认开启，与海江确认过，默认发盲区模式
                 CallerAutoPilotControlManager.sendFusionMode(2)
-                connectToast("域控已连接")
             }
 
             AdasConstants.IpcConnectionStatus.CONNECTING -> {
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerIpcConnectStateToastManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerIpcConnectStateToastManager.kt
index 8c9bd08804..b31974e6c0 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerIpcConnectStateToastManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerIpcConnectStateToastManager.kt
@@ -24,6 +24,13 @@ object CallerIpcConnectStateToastManager : CallerBase<IMoGoIpcConnectStateToastL
         }
     }
 
+    /**
+     * 登录页面展示时，不进行toast和消息弹出
+     */
+    fun loginFragment(isShow: Boolean) {
+        invoke(!isShow)
+    }
+
     fun ipcConnected() {
         powerOffMsgId = -1L
         invoke(true)