From 0578df84ed3d7877bd7f5f3ce136ac2d0805940c Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Thu, 7 Jul 2022 17:21:30 +0800 Subject: [PATCH 1/3] badcase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 实现数据采集配置应答方法 --- .../function/autopilot/adapter/MoGoAdasListenerImpl.kt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt index e3c984f419..0d3c26f1b6 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -371,6 +371,16 @@ class MoGoAdasListenerImpl : OnAdasListener { //状态查询应答 } + /** + * 数据采集配置应答 + */ + override fun onRecordDataConfigResp( + header: MessagePad.Header?, + config: MessagePad.RecordDataConfig? + ) { + + } + override fun onError(status: ProtocolStatus, bytes: ByteArray) { 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 2/3] =?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 开启 From e8b3c75ba0e68e7cdd98e85387223ec160261f42 Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Thu, 7 Jul 2022 18:09:39 +0800 Subject: [PATCH 3/3] BadCase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加badcase获取数据采集录制模式配置列表获取接口 --- .../eagle/core/function/autopilot/MoGoAutopilotProvider.kt | 7 +++++++ .../core/function/api/autopilot/IMoGoAutopilotProvider.kt | 5 +++++ .../core/function/call/autopilot/CallerAutoPilotManager.kt | 7 +++++++ 3 files changed, 19 insertions(+) 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 a0c609d172..91b76640ad 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 @@ -405,6 +405,13 @@ class MoGoAutopilotProvider : } } + /** + * 获取数据采集录制模式配置列表 + */ + override fun getBadCaseConfig() { + AdasManager.getInstance().sendRecordDataConfigReq() + } + /** * 发送工控机所有节点重启命令 */ 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 d5be6e2fde..020ca59254 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 @@ -134,6 +134,11 @@ interface IMoGoAutopilotProvider : IMoGoFunctionServerProvider { */ fun setRainMode(isEnable: Boolean) + /** + * 获取数据采集录制模式配置列表 + */ + fun getBadCaseConfig() + /** * 发送工控机所有节点重启命令 */ 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 3f730d231c..07c33331aa 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 @@ -174,6 +174,13 @@ object CallerAutoPilotManager { providerApi?.setRainMode(isEnable) } + /** + * 获取数据采集录制模式配置列表 + */ + fun getBadCaseConfig(){ + providerApi?.getBadCaseConfig() + } + /** * 发送工控机所有节点重启命令 */