From 4413b20a1c46f11ffc71b35053ca086156216c60 Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Thu, 7 Jul 2022 17:40:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BE=8E=E5=8C=96=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将美化模式分为设置工控机和设置本地两个接口,增加设置工控机美化模式Caller接口 --- .../autopilot/MoGoAutopilotProvider.kt | 22 ++++++++++++++----- .../api/autopilot/IMoGoAutopilotProvider.kt | 9 +++++++- .../call/autopilot/CallerAutoPilotManager.kt | 11 +++++++++- 3 files changed, 34 insertions(+), 8 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 c9f10bbd5b..a0c609d172 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 @@ -353,17 +353,14 @@ class MoGoAutopilotProvider : } } + + /** - * 演示模式(美化模式) + * 演示模式(美化模式)设置只限定于鹰眼 * isEnable = true 开启 * isEnable = false 关闭 */ override fun setDemoMode(isEnable: Boolean) { - if (isEnable) { - AdasManager.getInstance().sendDemoModeReq(1) - } else { - AdasManager.getInstance().sendDemoModeReq(0) - } // 同步给乘客端 if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { var byteArray = if (isEnable) byteArrayOf(1) else byteArrayOf(0) @@ -382,6 +379,19 @@ class MoGoAutopilotProvider : } } + /** + * 设置工控机演示模式(美化模式)开启、关闭 + * isEnable = true 开启 + * isEnable = false 关闭 + */ + override fun setIPCDemoMode(isEnable: Boolean) { + if (isEnable) { + AdasManager.getInstance().sendDemoModeReq(1) + } else { + AdasManager.getInstance().sendDemoModeReq(0) + } + } + /** * 雨天模式 * isEnable = true 开启 diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt index d37b549ea0..d5be6e2fde 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt @@ -114,12 +114,19 @@ interface IMoGoAutopilotProvider : IMoGoFunctionServerProvider { fun setIPCReboot() /** - * 演示模式(美化模式) + * 演示模式(美化模式)该设置作用域只限定于鹰眼 * isEnable = true 开启 * isEnable = false 关闭 */ fun setDemoMode(isEnable: Boolean) + /** + * 设置工控机演示模式(美化模式)开启、关闭 + * isEnable = true 开启 + * isEnable = false 关闭 + */ + fun setIPCDemoMode(isEnable: Boolean) + /** * 雨天模式 * isEnable = true 开启 diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt index aef03abc58..3f730d231c 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt @@ -148,7 +148,7 @@ object CallerAutoPilotManager { } /** - * 演示模式(美化模式) + * 演示模式(美化模式)该设置作用域只限定于鹰眼 * isEnable = true 开启 * isEnable = false 关闭 */ @@ -156,6 +156,15 @@ object CallerAutoPilotManager { providerApi?.setDemoMode(isEnable) } + /** + * 设置工控机演示模式(美化模式)开启、关闭 + * isEnable = true 开启 + * isEnable = false 关闭 + */ + fun setIPCDemoMode(isEnable: Boolean){ + providerApi?.setIPCDemoMode(isEnable) + } + /** * 雨天模式 * isEnable = true 开启