From ad0ca9c89e6cd3c5fdc49c8790277a7a59e38d2d Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Mon, 14 Feb 2022 16:28:22 +0800 Subject: [PATCH] =?UTF-8?q?[Fix]=E8=A7=A3=E5=86=B3Merge=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E4=BA=A7=E7=94=9F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 1 + .../com/zhidao/support/adas/high/AdasChannel.java | 12 ++++++++++++ .../com/zhidao/support/adas/high/AdasManager.java | 14 ++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/config.gradle b/config.gradle index 0908e296e0..b1598fc840 100644 --- a/config.gradle +++ b/config.gradle @@ -221,6 +221,7 @@ ext { mogoaicloudtanlu : "com.mogo.cloud:tanlu:${MOGO_TANLU_VERSION}", mogoaicloudtrafficlive : "com.mogo.cloud:trafficlive:${MOGO_TRAFFICLIVE_VERSION}", mogoaicloudlocation : "com.mogo.cloud:location:${MOGO_LOCATION_VERSION}", + mogoaicloudtelematic : "com.mogo.cloud:telematic:${MOGO_TELEMATIC_VERSION}", //========================= 新架构的 Maven 版本管理 ========================= mogo_core_function_autopilot : "com.mogo.eagle.core.function.impl:autopilot:${MOGO_CORE_FUNCTION_AUTOPILOT_VERSION}", 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 af767352a0..9313264a6e 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 @@ -16,6 +16,7 @@ import com.zhidao.support.adas.high.bean.AutopilotSpeedParam; import com.zhidao.support.adas.high.bean.BaseInfo; import com.zhidao.support.adas.high.bean.BasicInfo; import com.zhidao.support.adas.high.bean.ConfigInfo; +import com.zhidao.support.adas.high.bean.DemoModeInfo; import com.zhidao.support.adas.high.bean.FaceLoginResponse; import com.zhidao.support.adas.high.bean.MapLocationInfo; import com.zhidao.support.adas.high.bean.SSHResult; @@ -68,6 +69,7 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec private FpgaSocket mSocket; private SocketReader socketReader; + private JSONObject jsonObject; /** * udp server @@ -322,6 +324,16 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec return isClient; } + @Override + public void enableDemoMode() { + sendBaseInfo(DemoModeInfo.enable()); + } + + @Override + public void disableDemoMode() { + sendBaseInfo(DemoModeInfo.disable()); + } + /** * 配置信息 * 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 0e5df57d84..4653d5106a 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 @@ -333,4 +333,18 @@ public class AdasManager implements IAdasNetCommApi { public boolean isClient() { return mChannel == null || mChannel.isClient(); } + + @Override + public void enableDemoMode() { + if (mChannel != null) { + mChannel.enableDemoMode(); + } + } + + @Override + public void disableDemoMode() { + if (mChannel != null) { + mChannel.disableDemoMode(); + } + } }