From 4ebb696de6556584dc963a749957baca7cc2beae Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Fri, 11 Feb 2022 14:39:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=BC=94=E7=A4=BA=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E5=BC=80=E5=85=B3=EF=BC=8C=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhidao/support/adas/high/AdasChannel.java | 11 +++++++ .../zhidao/support/adas/high/AdasManager.java | 14 +++++++++ .../support/adas/high/IAdasNetCommApi.java | 10 +++++++ .../support/adas/high/bean/DemoModeInfo.java | 30 +++++++++++++++++++ .../adas/high/bean/IPCUpgradeInfo.java | 12 -------- 5 files changed, 65 insertions(+), 12 deletions(-) create mode 100644 libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/bean/DemoModeInfo.java 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 985848fbd2..0c4ebd47e9 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; @@ -306,6 +307,16 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec sendIPCCmd("docker restart autocar_default_1"); } + @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 94049fe969..e3bba404bb 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 @@ -321,4 +321,18 @@ public class AdasManager implements IAdasNetCommApi { mChannel.rebootAPDocker(); } } + + @Override + public void enableDemoMode() { + if (mChannel != null) { + mChannel.enableDemoMode(); + } + } + + @Override + public void disableDemoMode() { + if (mChannel != null) { + mChannel.disableDemoMode(); + } + } } diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java index 3004ea1536..e0a53dc9d3 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java @@ -119,4 +119,14 @@ public interface IAdasNetCommApi { * 向工控机发送重启自动驾驶Docker命令 */ void rebootAPDocker(); + + /** + * 打开演示模式 + */ + void enableDemoMode(); + + /** + * 关闭演示模式 + */ + void disableDemoMode(); } diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/bean/DemoModeInfo.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/bean/DemoModeInfo.java new file mode 100644 index 0000000000..04deffb0ee --- /dev/null +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/bean/DemoModeInfo.java @@ -0,0 +1,30 @@ +package com.zhidao.support.adas.high.bean; + +/** + * 演示模式 + */ +public class DemoModeInfo extends BaseInfo { + public DemoModeInfo(String action) { + super(action); + } + + /** + * 开启演示模式 + * + * @return + */ + public static DemoModeInfo enable() { + return new DemoModeInfo("enable_demo_pilot"); + } + + /** + * 关闭演示模式 + * + * @return + */ + public static DemoModeInfo disable() { + return new DemoModeInfo("disable_demo_pilot"); + } + + +} diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/bean/IPCUpgradeInfo.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/bean/IPCUpgradeInfo.java index 274b760698..8772a2f105 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/bean/IPCUpgradeInfo.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/bean/IPCUpgradeInfo.java @@ -32,18 +32,6 @@ public class IPCUpgradeInfo extends BaseInfo { return info; } - /** - * 升级流程完成确认 - * - * @return - */ - public static IPCUpgradeInfo upgradeFinishAffirm() { - IPCUpgradeInfo info = new IPCUpgradeInfo(); - info.values = new IPCUpgradeInfo.Values(); - info.values.state = 3; - return info; - } - public static class Values { /** * 0 不同意升级