From df807d5da964f65a0127080d68da698a38b20362 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Wed, 28 Feb 2024 11:39:55 +0800
Subject: [PATCH] =?UTF-8?q?[6.3.0]=E5=B7=A5=E6=8E=A7=E6=9C=BA=E9=87=8D?=
 =?UTF-8?q?=E5=90=AF=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../autopilot/MoGoAutopilotControlProvider.kt |  8 ----
 .../function/hmi/ui/widget/CheckSystemView.kt |  3 +-
 .../main/res/layout/dialog_docker_reboot.xml  | 48 +++++++++++--------
 .../src/main/res/values/strings.xml           |  5 +-
 .../IMoGoAutopilotControlProvider.kt          | 10 ----
 .../CallerAutoPilotControlManager.kt          |  8 ----
 6 files changed, 33 insertions(+), 49 deletions(-)

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 @@
 <com.mogo.eagle.core.widget.RoundConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="840dp"
-    android:layout_height="470dp"
+    android:layout_width="@dimen/dp_840"
+    android:layout_height="@dimen/dp_470"
     android:background="@color/dialog_bg_color"
-    app:roundLayoutRadius="32dp"
+    app:roundLayoutRadius="@dimen/dp_32"
     >
 
     <TextView
@@ -16,9 +16,9 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         android:text="@string/check_system_reboot_title"
-        android:textSize="56dp"
+        android:textSize="@dimen/dp_56"
         android:textColor="#FFFFFFFF"
-        android:layout_marginTop="50dp"
+        android:layout_marginTop="@dimen/dp_40"
         />
 
     <TextView
@@ -28,43 +28,52 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_reboot_title"
-        android:text="@string/check_system_reboot_tips"
+        android:text="@string/check_system_reboot_content"
         android:textColor="#FFFFFFFF"
-        android:textSize="43dp"
-        android:layout_marginTop="50dp"
+        android:textSize="@dimen/dp_43"
+        android:layout_marginTop="@dimen/dp_40"
+        />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_reboot_tips"
+        android:text="@string/check_system_reboot_tips"
+        android:textColor="@color/color_FF0006"
+        android:textSize="@dimen/sp_38"
+        android:layout_marginTop="@dimen/dp_20"
         />
 
     <View
         android:id="@+id/view_horizontal_line"
         android:layout_width="match_parent"
-        android:layout_height="2dp"
+        android:layout_height="@dimen/dp_2"
         android:background="#66B8BFE8"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_reboot_tips"
-        android:layout_marginTop="80dp"
+        app:layout_constraintBottom_toTopOf="@id/view_vertical_line"
         />
 
     <View
         android:id="@+id/view_vertical_line"
-        android:layout_width="3dp"
-        android:layout_height="0dp"
+        android:layout_width="@dimen/dp_2"
+        android:layout_height="@dimen/dp_120"
         android:background="#66B8BFE8"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/view_horizontal_line"
         app:layout_constraintBottom_toBottomOf="parent"
         />
 
     <TextView
         android:id="@+id/tv_reboot_confirm"
-        android:layout_width="400dp"
-        android:layout_height="100dp"
+        android:layout_width="@dimen/dp_400"
+        android:layout_height="@dimen/dp_120"
         android:text="@string/confirm"
         android:textColor="#FFFFFFFF"
         android:textSize="46dp"
         android:gravity="center"
-        app:layout_constraintTop_toBottomOf="@id/view_horizontal_line"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toLeftOf="@id/view_vertical_line"
@@ -72,13 +81,12 @@
 
     <TextView
         android:id="@+id/tv_reboot_cancel"
-        android:layout_width="400dp"
-        android:layout_height="100dp"
+        android:layout_width="@dimen/dp_400"
+        android:layout_height="@dimen/dp_120"
         android:text="@string/cancel"
         android:textColor="#FFFFFFFF"
         android:textSize="46dp"
         android:gravity="center"
-        app:layout_constraintTop_toBottomOf="@id/view_horizontal_line"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/view_vertical_line"
         app:layout_constraintRight_toRightOf="parent"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
index 0a3991cedf..226ea8081a 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
@@ -29,9 +29,10 @@
     <string name="bus_operation_title">账户信息</string>
     <string name="check_system_operation">系统运行</string>
     <string name="check_system_shut_down">关机</string>
-    <string name="check_system_reboot">重启</string>
+    <string name="check_system_reboot">重启系统</string>
     <string name="check_system_reboot_title">重启提示</string>
-    <string name="check_system_reboot_tips">是否重启自动驾驶系统?</string>
+    <string name="check_system_reboot_content">是否重启自动驾驶系统?</string>
+    <string name="check_system_reboot_tips">请确保已退出自动驾驶状态且周边环境安全</string>
 
 
     <!--系统版本-->
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  开启