diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverReasonWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverReasonWindow.kt
index 4eccdf7a9e..cf3fee59b3 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverReasonWindow.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverReasonWindow.kt
@@ -131,8 +131,8 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene
             it.format = PixelFormat.RGBA_8888
             it.flags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
             it.gravity = Gravity.START or Gravity.TOP
-            it.width = 844
-            it.height = 846
+            it.width = 902
+            it.height = 1530
             it.alpha = 1.0f
         }
     }
@@ -445,8 +445,8 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene
             val metrics = DisplayMetrics()
             // 默认固定位置，靠屏幕右边缘的中间
             mWindowManager!!.defaultDisplay.getMetrics(metrics)
-            mWindowParams!!.x = metrics.widthPixels-890
-            mWindowParams!!.y = metrics.heightPixels - BarUtils.getStatusBarHeight()-1140
+            mWindowParams!!.x = metrics.widthPixels-1560
+            mWindowParams!!.y = metrics.heightPixels - BarUtils.getStatusBarHeight()
             mWindowManager!!.addView(mFloatLayout, mWindowParams)
         }
         mTakeOverRecordInfo = takeOverRecordInfo
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderManager.kt
index d42510dfac..d3b6dcb52d 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderManager.kt
@@ -44,7 +44,7 @@ class WorkOrderManager{
         })
         context.enqueuePop(
             takeOverRecordView,
-            AutoSizeUtils.dp2px(context, 960f),
+            AutoSizeUtils.dp2px(context, 1046f),
             WindowManager.LayoutParams.MATCH_PARENT,
             key = "BadCaseManagerView"
         ).also {
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/bg_work_order_des_input.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/bg_work_order_des_input.png
index eee3703f5c..49264822a1 100644
Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/bg_work_order_des_input.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/bg_work_order_des_input.png differ
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_take_over_label.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_take_over_label.png
new file mode 100644
index 0000000000..9f37f9ee99
Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_take_over_label.png differ
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_bottom.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_bottom.png
new file mode 100644
index 0000000000..b411d071dc
Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_bottom.png differ
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_delete.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_delete.png
new file mode 100644
index 0000000000..aece9f98b1
Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_delete.png differ
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_reason.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_reason.png
index a54e6efd2f..1bef38bc29 100644
Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_reason.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_reason.png differ
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_reason_cancel.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_reason_cancel.xml
new file mode 100644
index 0000000000..9c523cef79
--- /dev/null
+++ b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_reason_cancel.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="#E5333333"
+        android:endColor="#E5333333"
+        />
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_reason_save.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_reason_save.xml
new file mode 100644
index 0000000000..aed5a20c8a
--- /dev/null
+++ b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_reason_save.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="#19FFCB"
+        android:endColor="#1970FF"
+        android:angle="315"
+        />
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_record.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_record.png
index 3b494dd410..327146e713 100644
Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_record.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_record.png differ
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_upload.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_upload.png
new file mode 100644
index 0000000000..e505aeb1b5
Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_upload.png differ
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_cannot_check.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_cannot_check.png
index 7484265321..b60dd3464e 100644
Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_cannot_check.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_cannot_check.png differ
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_check_false.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_check_false.png
index aa2ccad38f..a9d9e09d88 100644
Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_check_false.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_check_false.png differ
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_check_true.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_check_true.png
index 5a0b408b68..7442cdf962 100644
Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_check_true.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_check_true.png differ
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_no_data.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_no_data.png
index 246b3c4f38..ed13310910 100644
Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_no_data.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_no_data.png differ
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_take_over_record.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_take_over_record.xml
index 0793f7318a..88a32f289f 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_take_over_record.xml
+++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_take_over_record.xml
@@ -6,11 +6,12 @@
 
     <CheckBox
         android:id="@+id/cbRecordSelect"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_40"
+        android:layout_height="@dimen/dp_40"
         android:button="@drawable/record_radio_button_style"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginTop="@dimen/dp_35"
         android:paddingTop="@dimen/dp_30"
         android:paddingBottom="@dimen/dp_30"
         android:paddingEnd="@dimen/dp_10"
@@ -28,6 +29,7 @@
         android:src="@drawable/icon_record_cannot_check"
         android:contentDescription="@string/take_over_record_cannot_check"
         android:visibility="gone"
+        android:layout_marginTop="@dimen/dp_5"
         />
 
     <TextView
@@ -38,15 +40,17 @@
         app:layout_constraintBottom_toBottomOf="@id/cbRecordSelect"
         app:layout_constraintLeft_toRightOf="@id/cbRecordSelect"
         android:textSize="@dimen/sp_38"
-        android:textColor="#8E9DD4"
+        android:textColor="@color/white"
+        android:layout_marginStart="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_m_4"
         />
 
     <ImageView
         android:id="@+id/ivRecordStatusLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="@id/cbRecordSelect"
-        app:layout_constraintBottom_toBottomOf="@id/cbRecordSelect"
+        app:layout_constraintTop_toTopOf="@id/tvFaultStartTime"
+        app:layout_constraintBottom_toBottomOf="@id/tvFaultStartTime"
         app:layout_constraintRight_toRightOf="parent"
         android:src="@drawable/icon_record_edit"
         android:contentDescription="@string/take_over_record_status_label"
@@ -58,10 +62,10 @@
         android:layout_height="wrap_content"
         app:layout_constraintLeft_toRightOf="@id/tvFaultStartTime"
         app:layout_constraintRight_toLeftOf="@id/ivRecordStatusLabel"
-        app:layout_constraintTop_toTopOf="@id/cbRecordSelect"
-        app:layout_constraintBottom_toBottomOf="@id/cbRecordSelect"
+        app:layout_constraintTop_toTopOf="@id/tvFaultStartTime"
+        app:layout_constraintBottom_toBottomOf="@id/tvFaultStartTime"
         android:textSize="@dimen/sp_38"
-        android:textColor="#8E9DD4"
+        android:textColor="@color/white"
         android:maxLines="1"
         android:ellipsize="end"
         android:layout_marginStart="@dimen/dp_20"
@@ -74,7 +78,7 @@
         app:layout_constraintLeft_toLeftOf="@id/tvFaultStartTime"
         app:layout_constraintRight_toRightOf="@id/ivRecordStatusLabel"
         app:layout_constraintTop_toBottomOf="@id/tvFaultStartTime"
-        android:layout_marginTop="@dimen/dp_27"
+        android:layout_marginTop="@dimen/dp_28"
         android:textSize="@dimen/sp_30"
         android:textColor="#D4D4D4"
         android:maxLines="2"
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_take_over_reason.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_take_over_reason.xml
index 19b481445b..bb97c8a3a4 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_take_over_reason.xml
+++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_take_over_reason.xml
@@ -1,30 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/dp_844"
-    android:layout_height="@dimen/dp_846"
+    android:layout_width="@dimen/dp_931"
+    android:layout_height="@dimen/dp_1528"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/bg_take_over_reason">
 
-    <View
-        android:id="@+id/viewTitleBg"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_102"
-        android:background="@drawable/icon_work_order_title"
-        app:layout_constraintTop_toTopOf="parent"
-        />
-
     <TextView
         android:id="@+id/tvTakeOverTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/take_over_reason"
-        android:textSize="@dimen/sp_34"
+        android:textSize="@dimen/sp_45"
         android:textColor="@color/white"
         android:textStyle="bold"
-        app:layout_constraintTop_toTopOf="@id/viewTitleBg"
-        app:layout_constraintBottom_toBottomOf="@id/viewTitleBg"
-        app:layout_constraintStart_toStartOf="@id/viewTitleBg"
-        android:layout_marginStart="@dimen/dp_32"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:layout_marginStart="@dimen/dp_60"
+        android:layout_marginTop="@dimen/dp_100"
         />
 
     <TextView
@@ -33,22 +25,11 @@
         android:layout_height="wrap_content"
         android:text="@string/take_over_time"
         android:textColor="@color/white"
-        android:textSize="@dimen/sp_30"
-        app:layout_constraintTop_toTopOf="@id/viewTitleBg"
-        app:layout_constraintBottom_toBottomOf="@id/viewTitleBg"
-        app:layout_constraintEnd_toEndOf="@id/viewTitleBg"
-        android:layout_marginEnd="@dimen/dp_30"
-        />
-
-    <View
-        android:id="@+id/viewTakeOverTypeLabel"
-        android:layout_width="@dimen/dp_6"
-        android:layout_height="@dimen/dp_29"
-        android:background="#FF0176FF"
-        app:layout_constraintTop_toBottomOf="@id/viewTitleBg"
-        app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginStart="@dimen/dp_32"
-        android:layout_marginTop="@dimen/dp_48"
+        android:textSize="@dimen/sp_32"
+        app:layout_constraintTop_toTopOf="@id/tvTakeOverTitle"
+        app:layout_constraintBottom_toBottomOf="@id/tvTakeOverTitle"
+        app:layout_constraintRight_toRightOf="parent"
+        android:layout_marginEnd="@dimen/dp_62"
         />
 
     <TextView
@@ -56,23 +37,21 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/take_over_type"
-        android:textSize="@dimen/sp_32"
+        android:textSize="@dimen/sp_38"
         android:textColor="@color/white"
         android:textStyle="bold"
-        app:layout_constraintTop_toTopOf="@id/viewTakeOverTypeLabel"
-        app:layout_constraintBottom_toBottomOf="@id/viewTakeOverTypeLabel"
-        app:layout_constraintLeft_toRightOf="@id/viewTakeOverTypeLabel"
-        android:layout_marginStart="@dimen/dp_14"
+        app:layout_constraintTop_toBottomOf="@id/tvTakeOverTitle"
+        app:layout_constraintLeft_toLeftOf="@id/tvTakeOverTitle"
+        android:layout_marginTop="@dimen/dp_65"
         />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tvTakeOverType"
         android:layout_width="@dimen/dp_781"
         android:layout_height="@dimen/dp_70"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="@dimen/dp_203"
+        app:layout_constraintTop_toBottomOf="@id/tvTypeTitle"
+        app:layout_constraintLeft_toLeftOf="@id/tvTypeTitle"
+        android:layout_marginTop="@dimen/dp_12"
         android:background="@drawable/bg_fault_type"
         android:elevation="@dimen/dp_10"
         android:textSize="@dimen/sp_30"
@@ -83,29 +62,17 @@
         app:drawableEndCompat="@drawable/icon_fault_expand"
         />
 
-    <View
-        android:id="@+id/viewTakeOverReasonLabel"
-        android:layout_width="@dimen/dp_6"
-        android:layout_height="@dimen/dp_29"
-        android:background="#FF0176FF"
-        app:layout_constraintTop_toBottomOf="@id/tvTakeOverType"
-        app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginStart="@dimen/dp_32"
-        android:layout_marginTop="@dimen/dp_48"
-        />
-
     <TextView
         android:id="@+id/tvTakeOverReasonTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/take_over_reason"
-        android:textSize="@dimen/sp_32"
+        android:textSize="@dimen/sp_38"
         android:textColor="@color/white"
         android:textStyle="bold"
-        app:layout_constraintTop_toTopOf="@id/viewTakeOverReasonLabel"
-        app:layout_constraintBottom_toBottomOf="@id/viewTakeOverReasonLabel"
-        app:layout_constraintLeft_toRightOf="@id/viewTakeOverReasonLabel"
-        android:layout_marginStart="@dimen/dp_14"
+        app:layout_constraintTop_toBottomOf="@id/tvTakeOverType"
+        app:layout_constraintLeft_toLeftOf="@id/tvTakeOverType"
+        android:layout_marginTop="@dimen/dp_36"
         />
 
 
@@ -114,10 +81,9 @@
         android:layout_width="@dimen/dp_781"
         android:layout_height="@dimen/dp_70"
         android:background="@drawable/bg_fault_type"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="@dimen/dp_374"
+        app:layout_constraintTop_toBottomOf="@id/tvTakeOverReasonTitle"
+        app:layout_constraintLeft_toLeftOf="@id/tvTakeOverReasonTitle"
+        android:layout_marginTop="@dimen/dp_12"
         android:paddingStart="@dimen/dp_21"
         android:paddingEnd="@dimen/dp_21"
         app:drawableEndCompat="@drawable/icon_fault_expand"
@@ -126,30 +92,17 @@
         android:gravity="center_vertical"
         />
 
-
-    <View
-        android:id="@+id/viewTakeOverNoteLabel"
-        android:layout_width="@dimen/dp_6"
-        android:layout_height="@dimen/dp_29"
-        android:background="#FF0176FF"
-        app:layout_constraintTop_toBottomOf="@id/tvTakeOverReason"
-        app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginStart="@dimen/dp_32"
-        android:layout_marginTop="@dimen/dp_47"
-        />
-
     <TextView
         android:id="@+id/tvTakeOverNoteTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/fault_note"
-        android:textSize="@dimen/sp_32"
+        android:textSize="@dimen/sp_38"
         android:textColor="@color/white"
         android:textStyle="bold"
-        app:layout_constraintTop_toTopOf="@id/viewTakeOverNoteLabel"
-        app:layout_constraintBottom_toBottomOf="@id/viewTakeOverNoteLabel"
-        app:layout_constraintLeft_toRightOf="@id/viewTakeOverNoteLabel"
-        android:layout_marginStart="@dimen/dp_14"
+        app:layout_constraintTop_toBottomOf="@id/tvTakeOverReason"
+        app:layout_constraintLeft_toLeftOf="@id/tvTakeOverReason"
+        android:layout_marginTop="@dimen/dp_36"
         />
 
     <TextView
@@ -161,16 +114,15 @@
         app:layout_constraintLeft_toRightOf="@id/tvTakeOverNoteTitle"
         android:text="@string/fault_note_supplement"
         android:textSize="@dimen/sp_30"
-        android:textColor="#A3ABC0"
+        android:textColor="#CCCCCC"
         />
 
     <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/etNoteInput"
         android:layout_width="@dimen/dp_779"
         android:layout_height="@dimen/dp_115"
-        app:layout_constraintTop_toBottomOf="@id/viewTakeOverNoteLabel"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvTakeOverNoteTitle"
+        app:layout_constraintLeft_toLeftOf="@id/tvTakeOverNoteTitle"
         android:hint="@string/take_over_note_input"
         android:textColorHint="#A3ABC0"
         android:textCursorDrawable="@drawable/work_order_input_cursor"
@@ -200,16 +152,15 @@
         android:id="@+id/tvTakeOverSave"
         android:layout_width="@dimen/dp_380"
         android:layout_height="@dimen/dp_80"
-        app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:background="@drawable/report_button_bg"
+        app:layout_constraintLeft_toLeftOf="@id/etNoteInput"
+        android:background="@drawable/bg_take_over_reason_save"
         android:text="@string/take_over_save"
         android:textColor="#FFFFFF"
-        android:textSize="@dimen/sp_27"
+        android:textSize="@dimen/sp_36"
         android:textStyle="bold"
         android:gravity="center"
-        android:layout_marginBottom="@dimen/dp_40"
-        android:layout_marginLeft="@dimen/dp_33"
+        android:layout_marginBottom="@dimen/dp_75"
         />
 
     <TextView
@@ -217,15 +168,14 @@
         android:layout_width="@dimen/dp_380"
         android:layout_height="@dimen/dp_80"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintRight_toRightOf="@id/etNoteInput"
         android:text="@string/take_over_cancel"
         android:textColor="#FFFFFF"
-        android:textSize="@dimen/sp_27"
+        android:textSize="@dimen/sp_36"
         android:textStyle="bold"
         android:gravity="center"
-        android:background="@drawable/icon_cancel_bg"
-        android:layout_marginBottom="@dimen/dp_40"
-        android:layout_marginRight="@dimen/dp_33"
+        android:background="@drawable/bg_take_over_reason_cancel"
+        android:layout_marginBottom="@dimen/dp_75"
         />
 
     <androidx.recyclerview.widget.RecyclerView
@@ -235,7 +185,7 @@
         app:layout_constraintLeft_toLeftOf="@id/tvTakeOverType"
         app:layout_constraintRight_toRightOf="@id/tvTakeOverType"
         app:layout_constraintTop_toBottomOf="@id/tvTakeOverType"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/tvTakeOverSave"
         android:layout_marginBottom="@dimen/dp_39"
         android:background="@drawable/bg_reason_list"
         android:visibility="gone"
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_take_over_record.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_take_over_record.xml
index c5208c55b6..f39d863431 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_take_over_record.xml
+++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_take_over_record.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/dp_960"
+    android:layout_width="@dimen/dp_1046"
     android:layout_height="match_parent"
     android:layout_marginTop="@dimen/dp_72"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -8,11 +8,11 @@
 
     <View
         android:id="@+id/viewTakeOverRecordLine"
-        android:layout_width="@dimen/dp_14"
-        android:layout_height="@dimen/dp_50"
+        android:layout_width="@dimen/dp_24"
+        android:layout_height="@dimen/dp_60"
         android:layout_marginStart="@dimen/dp_80"
         android:layout_marginTop="@dimen/dp_92"
-        android:background="#2966EC"
+        android:background="@drawable/icon_take_over_label"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -24,30 +24,31 @@
         android:textColor="#FFFFFFFF"
         android:textSize="@dimen/sp_42"
         app:layout_constraintTop_toTopOf="@id/viewTakeOverRecordLine"
-        app:layout_constraintBottom_toBottomOf="@id/viewTakeOverRecordLine"
-        app:layout_constraintLeft_toLeftOf="@id/viewTakeOverRecordLine"
-        android:layout_marginStart="50dp"
+        app:layout_constraintLeft_toRightOf="@id/viewTakeOverRecordLine"
+        android:layout_marginStart="@dimen/dp_19"
+        android:layout_marginTop="@dimen/dp_m_2"
         />
 
     <ImageView
         android:id="@+id/ivTakeOverRecordClose"
-        android:layout_width="@dimen/dp_107"
-        android:layout_height="@dimen/dp_107"
-        android:layout_marginEnd="@dimen/dp_40"
-        android:src="@drawable/icon_close_nor"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/viewTakeOverRecordLine"
-        app:layout_constraintBottom_toBottomOf="@id/viewTakeOverRecordLine"
+        android:layout_width="@dimen/dp_44"
+        android:layout_height="@dimen/dp_45"
+        android:background="@drawable/icon_close_take_over"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/tvTakeOverRecordTitle"
+        app:layout_constraintBottom_toBottomOf="@id/tvTakeOverRecordTitle"
         android:contentDescription="@string/take_over_record_close"
+        android:layout_marginStart="@dimen/dp_896"
         />
 
     <TextView
         android:id="@+id/tvTakeOverRecordDate"
-        android:layout_width="match_parent"
+        android:layout_width="@dimen/dp_880"
         android:layout_height="@dimen/dp_61"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="@dimen/dp_223"
-        android:background="#203076"
+        app:layout_constraintTop_toBottomOf="@id/viewTakeOverRecordLine"
+        app:layout_constraintLeft_toLeftOf="@id/viewTakeOverRecordLine"
+        android:layout_marginTop="@dimen/dp_35"
+        android:background="#7F000000"
         android:textSize="@dimen/sp_32"
         android:textColor="@color/white"
         android:gravity="center"
@@ -63,34 +64,51 @@
         app:layout_constraintBottom_toBottomOf="parent"
         />
 
-    <TextView
-        android:id="@+id/tvUpload"
-        android:layout_width="@dimen/dp_330"
-        android:layout_height="@dimen/dp_120"
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tvRecordNoData"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:layout_marginStart="@dimen/dp_401"
+        android:layout_marginTop="@dimen/dp_606"
+        app:drawableTopCompat="@drawable/icon_record_no_data"
+        android:text="@string/take_over_record_no_data"
+        android:drawablePadding="@dimen/dp_31"
+        android:textColor="#B2FFFFFF"
+        android:textSize="@dimen/sp_40"
+        android:gravity="center_horizontal"
+        />
+
+    <View
+        android:id="@+id/viewTakeOverBottom"
+        android:layout_width="@dimen/dp_1000"
+        android:layout_height="@dimen/dp_364"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginBottom="@dimen/dp_74"
-        android:layout_marginLeft="@dimen/dp_85"
-        android:background="@drawable/upload_cloud_button_bg"
-        android:text="@string/take_over_record_upload"
-        android:textColor="#FFFFFFFF"
-        android:textSize="@dimen/sp_42"
-        android:gravity="center"
+        android:background="@drawable/bg_take_over_bottom"
+        />
+
+    <TextView
+        android:id="@+id/tvUpload"
+        android:layout_width="@dimen/dp_421"
+        android:layout_height="@dimen/dp_126"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="@dimen/dp_75"
+        android:layout_marginLeft="@dimen/dp_60"
+        android:background="@drawable/bg_take_over_upload"
         />
 
     <TextView
         android:id="@+id/tvDeleteSelect"
-        android:layout_width="@dimen/dp_330"
-        android:layout_height="@dimen/dp_120"
+        android:layout_width="@dimen/dp_441"
+        android:layout_height="@dimen/dp_146"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginBottom="@dimen/dp_74"
+        android:layout_marginBottom="@dimen/dp_55"
         android:layout_marginRight="@dimen/dp_85"
-        android:background="@drawable/delete_button_bg"
-        android:text="@string/take_over_record_delete"
-        android:textColor="#FFFFFFFF"
-        android:textSize="@dimen/sp_42"
-        android:gravity="center"
+        android:background="@drawable/bg_take_over_delete"
         />
 
     <androidx.constraintlayout.widget.Group
@@ -98,25 +116,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:constraint_referenced_ids="tvTakeOverRecordDate,
-        rvTakeOverList,tvUpload,tvDeleteSelect"
+        rvTakeOverList,tvUpload,tvDeleteSelect,viewTakeOverBottom"
         android:visibility="gone"
         />
 
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/tvRecordNoData"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        android:layout_marginTop="@dimen/dp_652"
-        app:drawableTopCompat="@drawable/icon_record_no_data"
-        android:text="@string/take_over_record_no_data"
-        android:drawablePadding="@dimen/dp_33"
-        android:textColor="#CAD6FF"
-        android:textSize="@dimen/sp_34"
-        android:gravity="center_horizontal"
-        />
-
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/values/strings.xml
index 5e8778d45d..1c36489633 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/res/values/strings.xml
+++ b/core/function-impl/mogo-core-function-devatools/src/main/res/values/strings.xml
@@ -64,7 +64,7 @@
     <string name="fault_report">上报</string>
     <string name="take_over_save">保存</string>
     <string name="take_over_cancel">取消</string>
-    <string name="take_over_record_no_data">暂无接管记录</string>
+    <string name="take_over_record_no_data">暂无内容</string>
     <string name="take_over_record_cannot_check">不能选则</string>
 
 </resources>
\ No newline at end of file
diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_close_take_over.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_close_take_over.png
new file mode 100644
index 0000000000..5113bdf0d0
Binary files /dev/null and b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_close_take_over.png differ
diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml
index 0a568e5e8a..9b1ae652c5 100644
--- a/core/mogo-core-res/src/main/res/values/dimens.xml
+++ b/core/mogo-core-res/src/main/res/values/dimens.xml
@@ -12,7 +12,9 @@
     <dimen name="dp_m_12">-12dp</dimen>
     <dimen name="dp_m_10">-10dp</dimen>
     <dimen name="dp_m_8">-8dp</dimen>
+    <dimen name="dp_m_6">-6dp</dimen>
     <dimen name="dp_m_5">-5dp</dimen>
+    <dimen name="dp_m_4">-4dp</dimen>
     <dimen name="dp_m_2">-2dp</dimen>
     <dimen name="dp_m_1">-1dp</dimen>
     <dimen name="dp_0">0dp</dimen>
@@ -394,6 +396,7 @@
     <dimen name="dp_358">358dp</dimen>
     <dimen name="dp_359">359dp</dimen>
     <dimen name="dp_360">360dp</dimen>
+    <dimen name="dp_364">364dp</dimen>
     <dimen name="dp_366">366dp</dimen>
     <dimen name="dp_367">367dp</dimen>
     <dimen name="dp_368">368dp</dimen>
@@ -1052,6 +1055,7 @@
     <dimen name="dp_1300">1300dp</dimen>
     <dimen name="dp_1373">1373dp</dimen>
     <dimen name="dp_1386">1386dp</dimen>
+    <dimen name="dp_1528">1550dp</dimen>
     <dimen name="dp_1600">1600dp</dimen>
     <dimen name="dp_1860">1860dp</dimen>
     <dimen name="dp_1920">1920dp</dimen>
@@ -1094,6 +1098,7 @@
     <dimen name="sp_39">39dp</dimen>
     <dimen name="sp_40">40dp</dimen>
     <dimen name="sp_42">42dp</dimen>
+    <dimen name="sp_45">45dp</dimen>
     <dimen name="sp_46">46dp</dimen>
     <dimen name="sp_48">48dp</dimen>
     <dimen name="sp_52">52dp</dimen>