diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java
index 86ee7e3d0d..b03088d321 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java
@@ -600,6 +600,13 @@ public class SweeperOperatePanelView extends LinearLayout {
         ToastUtils.showLong("超时未响应，操作失败");
     }
 
+    /**
+     * 根据底盘数据恢复操作面板中相关按钮状态 成功toast
+     */
+    private void showRecoverPanelButtonStateSuccessToast() {
+        ToastUtils.showLong("恢复操作面板状态成功");
+    }
+
     /**
      * 关闭清扫作业时，确认操作的弹框
      *
@@ -806,8 +813,9 @@ public class SweeperOperatePanelView extends LinearLayout {
             } else if (clean_intensity_strong) {
                 setCleanIntensityStrong();
             }
+            hideLoadingMask();
+            showRecoverPanelButtonStateSuccessToast();
         });
-        hideLoadingMask();
     }
 
     /**
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_sweeper_operate_panel.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/bg_sweeper_operate_panel.xml
new file mode 100644
index 0000000000..c9f7378baa
--- /dev/null
+++ b/OCH/mogo-och-sweeper/src/main/res/drawable/bg_sweeper_operate_panel.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#00000000"/>
+    <corners android:radius="@dimen/sweeper_operate_panel_btn_bg_corner"/>
+</shape>
\ No newline at end of file
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml
index be7b2b839f..3329a05a39 100644
--- a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml
+++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml
@@ -67,8 +67,8 @@
         android:id="@+id/module_mogo_och_sweeper_operate_panel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_30"
-        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginTop="@dimen/dp_24"
+        android:layout_marginStart="@dimen/dp_8"
         app:layout_constraintLeft_toRightOf="@id/fl_speed"
         app:layout_constraintTop_toTopOf="@id/fl_speed"
         tools:background="#f00"
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_operate_panel_view.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_operate_panel_view.xml
index 99d21b9d10..71c7fc1754 100644
--- a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_operate_panel_view.xml
+++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_operate_panel_view.xml
@@ -3,13 +3,21 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/dp_32"
+    android:background="@drawable/bg_sweeper_operate_panel"
+    android:padding="@dimen/dp_8">
 
     <TextView
         android:id="@+id/hint_clean_work"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="#ffffff"
+        android:gravity="top|center_horizontal"
+        android:paddingStart="@dimen/dp_8"
+        android:paddingTop="@dimen/dp_12"
+        android:paddingEnd="@dimen/dp_8"
+        android:paddingBottom="@dimen/dp_12"
         android:text="车辆准备"
         android:textColor="#000000"
         android:textSize="@dimen/sweeper_operate_panel_btn_text_size"
@@ -20,14 +28,15 @@
         android:id="@+id/btn_clean_work_open_close"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_32"
+        android:layout_marginStart="@dimen/dp_28"
         android:background="@drawable/sweeper_operate_panel_btn1_bg_selector"
-        android:paddingStart="@dimen/dp_20"
-        android:paddingTop="@dimen/dp_6"
-        android:paddingEnd="@dimen/dp_20"
-        android:paddingBottom="@dimen/dp_6"
-        android:text="open"
         android:checked="false"
+        android:gravity="center"
+        android:paddingStart="@dimen/dp_28"
+        android:paddingTop="@dimen/dp_12"
+        android:paddingEnd="@dimen/dp_28"
+        android:paddingBottom="@dimen/dp_12"
+        android:text="open"
         android:textColor="#000000"
         android:textSize="@dimen/sweeper_operate_panel_btn_text_size"
         app:layout_constraintLeft_toRightOf="@id/hint_clean_work"
@@ -44,8 +53,13 @@
         android:id="@+id/hint_clean_mode"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_32"
+        android:layout_marginTop="@dimen/dp_28"
         android:background="#ffffff"
+        android:gravity="top|center_horizontal"
+        android:paddingStart="@dimen/dp_8"
+        android:paddingTop="@dimen/dp_12"
+        android:paddingEnd="@dimen/dp_8"
+        android:paddingBottom="@dimen/dp_12"
         android:text="作业模式"
         android:textColor="#000000"
         android:textSize="@dimen/sweeper_operate_panel_btn_text_size"
@@ -56,16 +70,17 @@
         android:id="@+id/btn_clean_mode_pure_sweep"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_32"
+        android:layout_marginLeft="@dimen/dp_28"
         android:background="@drawable/sweeper_operate_panel_btn2_bg_selector"
-        android:paddingStart="@dimen/dp_20"
-        android:paddingTop="@dimen/dp_6"
-        android:paddingEnd="@dimen/dp_20"
-        android:paddingBottom="@dimen/dp_6"
+        android:enabled="false"
+        android:gravity="center"
+        android:paddingStart="@dimen/dp_32"
+        android:paddingTop="@dimen/dp_12"
+        android:paddingEnd="@dimen/dp_32"
+        android:paddingBottom="@dimen/dp_12"
         android:text="纯扫"
         android:textColor="#000000"
         android:textSize="@dimen/sweeper_operate_panel_btn_text_size"
-        android:enabled="false"
         app:layout_constraintLeft_toRightOf="@id/hint_clean_mode"
         app:layout_constraintTop_toTopOf="@id/hint_clean_mode" />
 
@@ -73,16 +88,17 @@
         android:id="@+id/btn_clean_mode_pure_wash"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_32"
+        android:layout_marginStart="@dimen/dp_28"
         android:background="@drawable/sweeper_operate_panel_btn2_bg_selector"
-        android:paddingStart="@dimen/dp_20"
-        android:paddingTop="@dimen/dp_6"
-        android:paddingEnd="@dimen/dp_20"
-        android:paddingBottom="@dimen/dp_6"
+        android:enabled="false"
+        android:gravity="center"
+        android:paddingStart="@dimen/dp_32"
+        android:paddingTop="@dimen/dp_12"
+        android:paddingEnd="@dimen/dp_32"
+        android:paddingBottom="@dimen/dp_12"
         android:text="纯洗"
         android:textColor="#000000"
         android:textSize="@dimen/sweeper_operate_panel_btn_text_size"
-        android:enabled="false"
         app:layout_constraintLeft_toRightOf="@id/btn_clean_mode_pure_sweep"
         app:layout_constraintTop_toTopOf="@id/hint_clean_mode" />
 
@@ -90,16 +106,17 @@
         android:id="@+id/btn_clean_mode_sweep_wash"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_32"
+        android:layout_marginTop="@dimen/dp_28"
         android:background="@drawable/sweeper_operate_panel_btn2_bg_selector"
-        android:paddingStart="@dimen/dp_20"
-        android:paddingTop="@dimen/dp_6"
-        android:paddingEnd="@dimen/dp_20"
-        android:paddingBottom="@dimen/dp_6"
+        android:enabled="false"
+        android:gravity="center"
+        android:paddingStart="@dimen/dp_32"
+        android:paddingTop="@dimen/dp_12"
+        android:paddingEnd="@dimen/dp_32"
+        android:paddingBottom="@dimen/dp_12"
         android:text="洗扫"
         android:textColor="#000000"
         android:textSize="@dimen/sweeper_operate_panel_btn_text_size"
-        android:enabled="false"
         app:layout_constraintLeft_toLeftOf="@id/btn_clean_mode_pure_sweep"
         app:layout_constraintTop_toBottomOf="@id/btn_clean_mode_pure_sweep" />
 
@@ -107,16 +124,17 @@
         android:id="@+id/btn_clean_mode_pure_absorption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_32"
+        android:layout_marginStart="@dimen/dp_28"
         android:background="@drawable/sweeper_operate_panel_btn2_bg_selector"
-        android:paddingStart="@dimen/dp_20"
-        android:paddingTop="@dimen/dp_6"
-        android:paddingEnd="@dimen/dp_20"
-        android:paddingBottom="@dimen/dp_6"
+        android:enabled="false"
+        android:gravity="center"
+        android:paddingStart="@dimen/dp_32"
+        android:paddingTop="@dimen/dp_12"
+        android:paddingEnd="@dimen/dp_32"
+        android:paddingBottom="@dimen/dp_12"
         android:text="纯吸"
         android:textColor="#000000"
         android:textSize="@dimen/sweeper_operate_panel_btn_text_size"
-        android:enabled="false"
         app:layout_constraintLeft_toRightOf="@id/btn_clean_mode_sweep_wash"
         app:layout_constraintTop_toTopOf="@id/btn_clean_mode_sweep_wash" />
 
@@ -131,8 +149,13 @@
         android:id="@+id/hint_clean_direction"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_32"
+        android:layout_marginTop="@dimen/dp_28"
         android:background="#ffffff"
+        android:gravity="top|center_horizontal"
+        android:paddingStart="@dimen/dp_8"
+        android:paddingTop="@dimen/dp_12"
+        android:paddingEnd="@dimen/dp_8"
+        android:paddingBottom="@dimen/dp_12"
         android:text="清扫方向"
         android:textColor="#000000"
         android:textSize="@dimen/sweeper_operate_panel_btn_text_size"
@@ -143,16 +166,17 @@
         android:id="@+id/btn_clean_direction_left_side"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_32"
+        android:layout_marginStart="@dimen/dp_28"
         android:background="@drawable/sweeper_operate_panel_btn2_bg_selector"
-        android:paddingStart="@dimen/dp_20"
-        android:paddingTop="@dimen/dp_6"
-        android:paddingEnd="@dimen/dp_20"
-        android:paddingBottom="@dimen/dp_6"
+        android:enabled="false"
+        android:gravity="center"
+        android:paddingStart="@dimen/dp_32"
+        android:paddingTop="@dimen/dp_12"
+        android:paddingEnd="@dimen/dp_32"
+        android:paddingBottom="@dimen/dp_12"
         android:text="左侧"
         android:textColor="#000000"
         android:textSize="@dimen/sweeper_operate_panel_btn_text_size"
-        android:enabled="false"
         app:layout_constraintLeft_toRightOf="@id/hint_clean_direction"
         app:layout_constraintTop_toTopOf="@id/hint_clean_direction" />
 
@@ -160,16 +184,17 @@
         android:id="@+id/btn_clean_direction_right_side"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_32"
+        android:layout_marginStart="@dimen/dp_28"
         android:background="@drawable/sweeper_operate_panel_btn2_bg_selector"
-        android:paddingStart="@dimen/dp_20"
-        android:paddingTop="@dimen/dp_6"
-        android:paddingEnd="@dimen/dp_20"
-        android:paddingBottom="@dimen/dp_6"
+        android:enabled="false"
+        android:gravity="center"
+        android:paddingStart="@dimen/dp_32"
+        android:paddingTop="@dimen/dp_12"
+        android:paddingEnd="@dimen/dp_32"
+        android:paddingBottom="@dimen/dp_12"
         android:text="右侧"
         android:textColor="#000000"
         android:textSize="@dimen/sweeper_operate_panel_btn_text_size"
-        android:enabled="false"
         app:layout_constraintLeft_toRightOf="@id/btn_clean_direction_left_side"
         app:layout_constraintTop_toTopOf="@id/hint_clean_direction" />
 
@@ -177,16 +202,17 @@
         android:id="@+id/btn_clean_direction_both_side"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_32"
+        android:layout_marginTop="@dimen/dp_28"
         android:background="@drawable/sweeper_operate_panel_btn2_bg_selector"
-        android:paddingStart="@dimen/dp_20"
-        android:paddingTop="@dimen/dp_6"
-        android:paddingEnd="@dimen/dp_20"
-        android:paddingBottom="@dimen/dp_6"
+        android:enabled="false"
+        android:gravity="center"
+        android:paddingStart="@dimen/dp_32"
+        android:paddingTop="@dimen/dp_12"
+        android:paddingEnd="@dimen/dp_32"
+        android:paddingBottom="@dimen/dp_12"
         android:text="两侧"
         android:textColor="#000000"
         android:textSize="@dimen/sweeper_operate_panel_btn_text_size"
-        android:enabled="false"
         app:layout_constraintLeft_toLeftOf="@id/btn_clean_direction_left_side"
         app:layout_constraintTop_toBottomOf="@id/btn_clean_direction_left_side" />
 
@@ -201,8 +227,13 @@
         android:id="@+id/hint_clean_intensity"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_32"
+        android:layout_marginTop="@dimen/dp_28"
         android:background="#ffffff"
+        android:gravity="top|center_horizontal"
+        android:paddingStart="@dimen/dp_8"
+        android:paddingTop="@dimen/dp_12"
+        android:paddingEnd="@dimen/dp_8"
+        android:paddingBottom="@dimen/dp_12"
         android:text="作业强度"
         android:textColor="#000000"
         android:textSize="@dimen/sweeper_operate_panel_btn_text_size"
@@ -213,16 +244,17 @@
         android:id="@+id/btn_clean_intensity_standard"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_32"
+        android:layout_marginStart="@dimen/dp_28"
         android:background="@drawable/sweeper_operate_panel_btn2_bg_selector"
-        android:paddingStart="@dimen/dp_20"
-        android:paddingTop="@dimen/dp_6"
-        android:paddingEnd="@dimen/dp_20"
-        android:paddingBottom="@dimen/dp_6"
+        android:enabled="false"
+        android:gravity="center"
+        android:paddingStart="@dimen/dp_32"
+        android:paddingTop="@dimen/dp_12"
+        android:paddingEnd="@dimen/dp_32"
+        android:paddingBottom="@dimen/dp_12"
         android:text="标准"
         android:textColor="#000000"
         android:textSize="@dimen/sweeper_operate_panel_btn_text_size"
-        android:enabled="false"
         app:layout_constraintLeft_toRightOf="@id/hint_clean_intensity"
         app:layout_constraintTop_toTopOf="@id/hint_clean_intensity" />
 
@@ -230,16 +262,17 @@
         android:id="@+id/btn_clean_intensity_strong"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_32"
+        android:layout_marginStart="@dimen/dp_28"
         android:background="@drawable/sweeper_operate_panel_btn2_bg_selector"
-        android:paddingStart="@dimen/dp_20"
-        android:paddingTop="@dimen/dp_6"
-        android:paddingEnd="@dimen/dp_20"
-        android:paddingBottom="@dimen/dp_6"
+        android:enabled="false"
+        android:gravity="center"
+        android:paddingStart="@dimen/dp_32"
+        android:paddingTop="@dimen/dp_12"
+        android:paddingEnd="@dimen/dp_32"
+        android:paddingBottom="@dimen/dp_12"
         android:text="强力"
         android:textColor="#000000"
         android:textSize="@dimen/sweeper_operate_panel_btn_text_size"
-        android:enabled="false"
         app:layout_constraintLeft_toRightOf="@id/btn_clean_intensity_standard"
         app:layout_constraintTop_toTopOf="@id/hint_clean_intensity" />
 
@@ -247,14 +280,14 @@
         android:id="@+id/loading_hint_container"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="#80000000"
+        android:background="#cc000000"
         android:gravity="center"
         android:orientation="vertical"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:visibility="gone">
+        app:layout_constraintTop_toTopOf="parent">
 
         <TextView
             android:id="@+id/loading_hint_top"
@@ -268,6 +301,7 @@
             android:id="@+id/loading_hint_bottom"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_28"
             android:text="预计等待30秒"
             android:textColor="#ffffff"
             android:textSize="@dimen/sweeper_operate_panel_btn_text_size" />
diff --git a/OCH/mogo-och-sweeper/src/main/res/values/colors.xml b/OCH/mogo-och-sweeper/src/main/res/values/colors.xml
index 9ac3b75954..855ffb1a50 100644
--- a/OCH/mogo-och-sweeper/src/main/res/values/colors.xml
+++ b/OCH/mogo-och-sweeper/src/main/res/values/colors.xml
@@ -50,7 +50,7 @@
     <color name="sweeper_operate_panel_btn1_bg_stroke">#BF30334C</color>
     <color name="sweeper_operate_panel_btn2_bg_default">#ffffff</color>
     <color name="sweeper_operate_panel_btn2_bg_pressed">#1FA7FF</color>
-    <color name="sweeper_operate_panel_btn2_bg_disabled">#50000000</color>
+    <color name="sweeper_operate_panel_btn2_bg_disabled">#80ffffff</color>
     <color name="sweeper_operate_panel_btn2_bg_stroke">#BF30334C</color>
 
 </resources>
\ No newline at end of file