From 4f7cf8608ef2865d846b5b2d83ce10636fb9c8eb Mon Sep 17 00:00:00 2001
From: xuxinchao <13522809046@163.com>
Date: Wed, 6 Apr 2022 17:10:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E7=AA=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

域控制器下增加连接端口号显示
---
 .../core/function/autopilot/adapter/MoGoAdasListenerImpl.kt  | 3 +++
 .../adapter/MoGoAdasMsgConnectStatusListenerImpl.kt          | 4 ++++
 .../mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt    | 5 +++++
 3 files changed, 12 insertions(+)

diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt
index 3e49dc602d..8dadc76b34 100644
--- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt
+++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt
@@ -187,6 +187,9 @@ class MoGoAdasListenerImpl : OnAdasListener {
                 if (autopilotStatusInfo.connectIP == null) {
                     autopilotStatusInfo.connectIP = AdasManager.getInstance().ipcConnectedIp
                 }
+                if(autopilotStatusInfo.connectPort == null){
+                    autopilotStatusInfo.connectPort = AdasManager.getInstance().ipcConnectedPort
+                }
                 if (autopilotStatusInfo.dockVersion == null) {
                     AdasManager.getInstance().carConfig?.let {
                         autopilotStatusInfo.dockVersion = it.dockVersion
diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt
index d69ddb2bfe..de71747d21 100644
--- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt
+++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt
@@ -41,6 +41,8 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasConnectStatusListener,
             // 初始化自动驾驶状态信息
             CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectIP =
                 AdasManager.getInstance().ipcConnectedIp
+            CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectPort =
+                AdasManager.getInstance().ipcConnectedPort
             CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectStatus = true
             CallerAutoPilotStatusListenerManager.invokeAutoPilotStatus()
 
@@ -59,6 +61,8 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasConnectStatusListener,
             }
             CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectIP =
                 AdasManager.getInstance().ipcConnectedIp
+            CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectPort =
+                AdasManager.getInstance().ipcConnectedPort
             CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectStatus = false
             //与工控机断开连接，需要重置自动驾驶状态(包括上传至云平台缓存信息)，等待连接成功后同步状态信息
             mCurrentAutopilotStatus = 0
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt
index e0a7e2d4a9..4057fa3bd1 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt
@@ -14,6 +14,11 @@ class AutopilotStatusInfo : Serializable {
      * 当前链接的IP地址, 默认地址 192.168.1.102
      */
     var connectIP: String? = null
+
+    /**
+     * 当前连接的IP端口号，默认4110
+     */
+    var connectPort: Int = 4110
     var connectStatus = false
     var version: String? = null