From a7ca4752b113cfa09e5df45e287378157d749d30 Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Wed, 12 Oct 2022 16:47:27 +0800
Subject: [PATCH] =?UTF-8?q?[Fix]docker2.3.0=E5=8F=B8=E6=9C=BA=E5=B1=8F?=
 =?UTF-8?q?=E6=AF=94=E4=B9=98=E5=AE=A2=E5=B1=8F=E5=85=88=E6=8B=BF=E5=88=B0?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8D=E8=BD=AC=E5=8F=91=E6=95=B0=E6=8D=AE=E7=BB=99=E4=B9=98?=
 =?UTF-8?q?=E5=AE=A2=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../autopilot/MoGoAutopilotProvider.kt        | 51 +++++++++++--------
 .../autopilot/telematic/TeleMsgHandler.kt     |  6 ++-
 2 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
index a7268ec13e..dec5498cd8 100644
--- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
+++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
@@ -153,27 +153,6 @@ class MoGoAutopilotProvider :
                 }
             }, MoGoAiCloudClientConfig.getInstance().sn)
         } else {
-            msgHandler.setListener(object : EventListener {
-                override fun connectDevice(isSupportMulti: Boolean) {
-                    if (!isInit) {
-                        isInit = true
-                        UiThreadHandler.post {
-                            if (isSupportMulti) {
-                                // 直连工控机
-                                directConnect()
-                            } else {
-                                val options = AdasOptions
-                                    .Builder()
-                                    .setClient(true)
-                                    .build()
-                                AdasManager.getInstance()
-                                    .create(options, MoGoAdasMsgConnectStatusListenerImpl())
-                                listenDeviceData()
-                            }
-                        }
-                    }
-                }
-            })
             NSDNettyManager.getInstance()
                 .searchAndConnectServer(context, MoGoAiCloudClientConfig.getInstance().sn,
                     AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode),
@@ -196,6 +175,36 @@ class MoGoAutopilotProvider :
                         }
                     })
         }
+        msgHandler.setListener(object : EventListener {
+            override fun connectDevice(isSupportMulti: Boolean) {
+                if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
+                    if (!isInit) {
+                        isInit = true
+                        // 转发工控机数据给乘客屏
+                        listenDeviceData()
+                    }
+                } else {
+                    if (!isInit) {
+                        isInit = true
+                        UiThreadHandler.post {
+                            if (isSupportMulti) {
+                                // 直连工控机
+                                directConnect()
+                            } else {
+                                val options = AdasOptions
+                                    .Builder()
+                                    .setClient(true)
+                                    .build()
+                                AdasManager.getInstance()
+                                    .create(options, MoGoAdasMsgConnectStatusListenerImpl())
+                                // 接收司机屏发过来的感知、定位等数据
+                                listenDeviceData()
+                            }
+                        }
+                    }
+                }
+            }
+        })
         CallerAutopilotCarConfigListenerManager.addListener(TAG, this)
         CallerLogger.i("$M_ADAS_IMPL$TAG", "initServer……")
         // 同步数据给工控机的服务
diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/TeleMsgHandler.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/TeleMsgHandler.kt
index 1e21903503..30ffb68fd9 100644
--- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/TeleMsgHandler.kt
+++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/TeleMsgHandler.kt
@@ -118,7 +118,10 @@ class TeleMsgHandler : IMsgHandler {
                                         "1" -> true
                                         else -> false
                                     }
-                                Logger.d("Route", "TeleMsgHandler -> handleMsgFromServer ==> isDemoMode:" + FunctionBuildConfig.isDemoMode + ",isIgnore:" + FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData)
+                                Logger.d(
+                                    "Route",
+                                    "TeleMsgHandler -> handleMsgFromServer ==> isDemoMode:" + FunctionBuildConfig.isDemoMode + ",isIgnore:" + FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData
+                                )
                                 timestamp = currTime
                                 invokeNettyConnResult("乘客屏收到的美化模式isIgnore为：${FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData}")
                             } else {
@@ -139,6 +142,7 @@ class TeleMsgHandler : IMsgHandler {
                 MogoProtocolMsg.REQ_MAC_ADDRESS -> {
                     val carConfig = AdasManager.getInstance().carConfig
                     if (carConfig != null) {
+                        listener?.connectDevice(!carConfig.dockVersion.contains("2.3.0"))
                         val configArray = carConfig.toByteArray()
 
                         NSDNettyManager.getInstance().sendMsgToSpecifiedClient(