From e576fd33455a71fe98c0d3df3a13c36bdbb8d8ec Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Wed, 31 May 2023 19:45:03 +0800 Subject: [PATCH] =?UTF-8?q?[minibus320][adas]=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B9=98=E5=AE=A2=E5=B1=8F=E6=9C=AA=E8=BF=9E=E6=8E=A5=E8=BF=87?= =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E5=B1=8F=E6=97=B6=EF=BC=8C=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E8=B0=83=E8=AF=95=E7=AA=97=E8=BF=9E=E6=8E=A5=E6=8C=87=E5=AE=9A?= =?UTF-8?q?IP=E5=B7=A5=E6=8E=A7=E6=9C=BA=E6=97=A0=E6=B3=95=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datacenter/autopilot/MoGoAutopilotControlProvider.kt | 1 + .../src/main/java/com/zhidao/support/adas/high/AdasChannel.java | 2 +- .../src/main/java/com/zhidao/support/adas/high/AdasManager.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) 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 c350f49704..94519e61fc 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 @@ -282,6 +282,7 @@ class MoGoAutopilotControlProvider : SharedPrefsMgr.getInstance(it).putString(MoGoConfig.AUTOPILOT_IP, autoPilotIp) } // 设置IP地址 + AdasManager.getInstance().adasOptions.isClient = false AdasManager.getInstance().adasOptions.ipcConnectionMode = AdasOptions.IPC_CONNECTION_MODE.ASSIGN AdasManager.getInstance().adasOptions.ipcAssignIP = autoPilotIp diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java index 0d1f014ea8..35e3dd9954 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java @@ -474,7 +474,7 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec @Override public AdasOptions getAdasOptions() { - return adasOptions; + return adasOptions == null ? new AdasOptions.Builder().build() : adasOptions; } /** diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java index 6b13e4396f..a592653f4b 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java @@ -97,6 +97,7 @@ public class AdasManager implements IAdasNetCommApi { */ public synchronized void create(AdasOptions options, OnAdasConnectStatusListener onAdasConnectStatusListener) { if (mChannel != null) { + mChannel.disconnect(); carConfig = null; mChannel = null; }