From 99ac955f7bdbe9ba076d138911745a01e638af76 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Mon, 4 Mar 2024 18:32:19 +0800 Subject: [PATCH] =?UTF-8?q?[630][app]=20=E6=A0=B9=E6=8D=AE=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E6=96=87=E6=A1=A3=E6=B7=BB=E5=8A=A0=E5=9F=9F=E6=8E=A7?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=97=B6=E4=BA=A7=E7=94=9F=E7=9A=84=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E8=BF=9B=E8=A1=8Ctoast=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autopilot/MoGoAutopilotControlProvider.kt | 2 +- .../MoGoAdasMsgConnectStatusListenerImpl.kt | 28 +++++++++++-------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt index c534090aaa..ba087b5ba7 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt @@ -295,7 +295,7 @@ class MoGoAutopilotControlProvider : */ override fun resetIpAddress(autoPilotIp: String) { // 关闭通信 - AdasManager.getInstance().disconnect() +// AdasManager.getInstance().disconnect() // 延时执行连接指定IP地址 ThreadUtils.executeBySingleWithDelay(object : ThreadUtils.SimpleTask() { @RequiresPermission(permission.INTERNET) 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 7a6f0c1113..e897c2e87a 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 @@ -42,7 +42,6 @@ class MoGoAdasMsgConnectStatusListenerImpl : private const val TAG = "ConnectStatus" } - private var connectStatus = false init { CallerCloudListenerManager.addListener(TAG, this) @@ -50,14 +49,11 @@ class MoGoAdasMsgConnectStatusListenerImpl : CallerParallelDrivingActionsListenerManager.setConnected(AdasManager.getInstance().ipcConnectionStatus == AdasConstants.IpcConnectionStatus.CONNECTED) } - private fun resetArgs(reason: String? = null) { - if (connectStatus) { - reason?.let { - ToastUtils.showLong(it) - } - connectStatus = false - } + private fun connectToast(reason: String) { + ToastUtils.showShort(reason) + } + private fun resetArgs() { CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectIP = AdasManager.getInstance().ipcConnectedIp CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectPort = @@ -93,7 +89,6 @@ class MoGoAdasMsgConnectStatusListenerImpl : AdasConstants.IpcConnectionStatus.CONNECTED -> { CallerLogger.d("$M_D_C$TAG", "已连接") - connectStatus = true // 初始化自动驾驶状态信息 CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectIP = AdasManager.getInstance().ipcConnectedIp @@ -113,18 +108,22 @@ class MoGoAdasMsgConnectStatusListenerImpl : } //每次工控机连接成功后，需同步当前设置的雨天模式状态 CallerAutoPilotControlManager.setRainMode(FunctionBuildConfig.isRainMode) + connectToast("域控已连接") } AdasConstants.IpcConnectionStatus.CONNECTING -> { CallerLogger.d("$M_D_C$TAG", "连接中") + connectToast("域控连接中") } AdasConstants.IpcConnectionStatus.RECONNECTING_TIMER -> { CallerLogger.d("$M_D_C$TAG", "重连中（定时器）") + connectToast("域控重连中") } AdasConstants.IpcConnectionStatus.RECONNECTING_NETWORK -> { CallerLogger.d("$M_D_C$TAG", "重连中（网络监听）") + connectToast("域控重连中") } AdasConstants.IpcConnectionStatus.CONNECT_EXCEPTION -> { @@ -132,7 +131,7 @@ class MoGoAdasMsgConnectStatusListenerImpl : "$M_D_C$TAG", "连接异常（表示鹰眼与域控连接失败、无法连接、非正常断开等），原因：$reason" ) - resetArgs("域控连接异常，等待重连。原因：${reason}") + resetArgs() } AdasConstants.IpcConnectionStatus.ILLEGAL_ADDRESS -> { @@ -141,6 +140,7 @@ class MoGoAdasMsgConnectStatusListenerImpl : "非法地址（连接模式为指定地址时：表示当前鹰眼调用连接时传入的域控地址错误或不符合规则【不修改默认配置不会出现此问题】；连接模式为PING模式时：表示传入的PING地址列表存在问题）" ) resetArgs() + connectToast("非法域控地址") } AdasConstants.IpcConnectionStatus.SEARCH_ADDRESS -> { @@ -148,6 +148,7 @@ class MoGoAdasMsgConnectStatusListenerImpl : "$M_D_C$TAG", "正在搜索域控地址（表示当前鹰眼正在查找是否有可用的域控地址）" ) + connectToast("正在搜索域控地址") } AdasConstants.IpcConnectionStatus.NOT_FOUND_ADDRESS -> { @@ -156,6 +157,7 @@ class MoGoAdasMsgConnectStatusListenerImpl : "找不到可用地址（当前鹰眼配置的域控地址列表中的全部地址均无法PING通【不修改默认配置的情况下需要排查PAD是否连接车载路由器、工控机是否连接车载路由器、工控机是否开机等】）" ) resetArgs() + connectToast("找不到可用的域控地址") } AdasConstants.IpcConnectionStatus.CERTIFICATION_FAILED -> { @@ -171,7 +173,8 @@ class MoGoAdasMsgConnectStatusListenerImpl : "$M_D_C$TAG", "心跳超时（表示连接域控成功后在一段时间内未收到域控任何数据，默认4秒【可以配置】），超时时间：${reason}秒" ) - resetArgs("与域控心跳超时，等待重连") + resetArgs() + connectToast("域控心跳超时") } AdasConstants.IpcConnectionStatus.PROTOCOL_MISMATCH -> { @@ -187,7 +190,8 @@ class MoGoAdasMsgConnectStatusListenerImpl : "$M_D_C$TAG", "域控主动断开连接（表示域控主动发起断开WebSocket连接，目前主要原因有：1.证书认证失败；2.老版本MAP不支持多连接的情况下会踢掉客户端；），域控断开发送的消息：${reason}" ) - resetArgs("域控主动断开连接，等待重连。可能原因：证书认证失败或不支持多连接") + resetArgs() + connectToast("域控主动断开连接") } } CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().ipcConnStatus = status