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 77b154540b..ecc49ef67a 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 @@ -480,14 +480,6 @@ class MoGoAutopilotControlProvider : return AdasManager.getInstance().sendAutopilotSpeedReq(speed / 3.6) } - override fun setIPCShutDown() { -// AdasManager.getInstance().shutdownIPC() - } - - override fun setIPCReboot() { -// AdasManager.getInstance().rebootAPDocker() - } - override fun recordCause(key: String?, name: String?, id: String?, reason: String?) { key?.let { AdasManager.getInstance() diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckSystemView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckSystemView.kt index 7df9053a03..f7ffa13497 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckSystemView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckSystemView.kt @@ -65,7 +65,8 @@ class CheckSystemView @JvmOverloads constructor( else { //确认重启 CallerLogger.d("$M_HMI$TAG", "reboot confirm") - CallerAutoPilotControlManager.setIPCReboot() + CallerAutoPilotControlManager.sendIpcReboot() + ToastUtils.showLong("重启命令已发送") } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_docker_reboot.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_docker_reboot.xml index b75cee777e..83a031c665 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_docker_reboot.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_docker_reboot.xml @@ -2,10 +2,10 @@ + + 账户信息 系统运行 关机 - 重启 + 重启系统 重启提示 - 是否重启自动驾驶系统? + 是否重启自动驾驶系统? + 请确保已退出自动驾驶状态且周边环境安全 diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotControlProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotControlProvider.kt index 1c8bdd257f..cf19ca8c0a 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotControlProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotControlProvider.kt @@ -147,16 +147,6 @@ interface IMoGoAutopilotControlProvider : IMoGoFunctionServerProvider { */ fun recordCause(key: String?, name: String?, id: String?, reason: String?) - /** - * 关机 - */ - fun setIPCShutDown() - - /** - * 重启 - */ - fun setIPCReboot() - /** * 演示模式(美化模式)该设置作用域只限定于鹰眼 * 司机屏同步给乘客屏 diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt index 506a25e0f7..0fc660f064 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt @@ -228,14 +228,6 @@ object CallerAutoPilotControlManager { } } - fun setIPCShutDown() { - providerApi?.setIPCShutDown() - } - - fun setIPCReboot() { - providerApi?.setIPCReboot() - } - /** * 演示模式(美化模式)该设置作用域只限定于鹰眼 * isEnable = true 开启