From c7fb6f80673b4580996e887108612ce520d41674 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Fri, 7 Feb 2025 18:26:09 +0800
Subject: [PATCH] =?UTF-8?q?[6.10.0]=E6=8E=A5=E7=AE=A1=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=B7=A5=E5=85=B7=E4=BC=98=E5=8C=96=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workorder/TakeOverReasonWindow.kt         |   5 +
 .../workorder/TakeOverSceneWindow.kt          |  10 +
 .../drawable-xhdpi/icon_image_load_fail.png   | Bin 0 -> 8658 bytes
 .../main/res/drawable/bg_take_over_image.xml  |  15 +
 .../main/res/layout/layout_scene_pager.xml    |   1 +
 .../main/res/layout/view_take_over_reason.xml | 359 +++++++++---------
 6 files changed, 212 insertions(+), 178 deletions(-)
 create mode 100644 core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_image_load_fail.png
 create mode 100644 core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_image.xml

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 d0dea26197..519d0316bd 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
@@ -326,6 +326,11 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene
         if(takeOverSceneWindow == null){
             takeOverSceneWindow = TakeOverSceneWindow(mActivity)
         }
+        takeOverSceneWindow?.setClickListener(object: TakeOverSceneWindow.ClickListener{
+            override fun closeWindow() {
+                takeOverSceneWindow = null
+            }
+        })
         takeOverSceneWindow?.showFloatWindow(frontCameraUri,rearCameraUri,mapScreenUri,currentItem)
     }
 
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverSceneWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverSceneWindow.kt
index b4430a1172..a69064ee82 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverSceneWindow.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverSceneWindow.kt
@@ -35,6 +35,7 @@ class TakeOverSceneWindow constructor(activity: Activity) {
     private lateinit var ivSceneNext: ImageView
     private val takeOverSceneAdapter = TakeOverSceneAdapter()
     private var currentIndex = 0
+    private var clickListener: ClickListener? = null
 
     init {
         initFloatWindow()
@@ -67,6 +68,7 @@ class TakeOverSceneWindow constructor(activity: Activity) {
         vpSceneImage.adapter =takeOverSceneAdapter
         //关闭弹窗
         ivSceneClose.setOnClickListener {
+            clickListener?.closeWindow()
             hideFloatWindow()
         }
         //前一个场景
@@ -110,4 +112,12 @@ class TakeOverSceneWindow constructor(activity: Activity) {
         }
     }
 
+    interface ClickListener{
+        fun closeWindow()
+    }
+
+    fun setClickListener(clickListener: ClickListener) {
+        this.clickListener = clickListener
+    }
+
 }
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_image_load_fail.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_image_load_fail.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d30c674e4693d21eba8bcb7ad0189789931647b
GIT binary patch
literal 8658
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

literal 0
HcmV?d00001

diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_image.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_image.xml
new file mode 100644
index 0000000000..e60a7342a5
--- /dev/null
+++ b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_image.xml
@@ -0,0 +1,15 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 背景颜色 -->
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#3C3C3C"/>
+        </shape>
+    </item>
+    <!-- 图片 -->
+    <item
+        android:drawable="@drawable/icon_image_load_fail"
+        android:width="@dimen/dp_280"
+        android:height="@dimen/dp_215"
+        android:gravity="center"
+        />
+</layer-list>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_scene_pager.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_scene_pager.xml
index d0dc4eebd0..d34bfea0e2 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_scene_pager.xml
+++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_scene_pager.xml
@@ -9,6 +9,7 @@
         android:layout_height="match_parent"
         android:contentDescription="@string/take_over_scene_image"
         android:scaleType="fitXY"
+        android:background="@drawable/bg_take_over_image"
         />
 
     <TextView
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 70ad990d8d..c39a1da297 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
@@ -5,180 +5,178 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/bg_take_over_reason">
 
-    <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_45"
-        android:textColor="@color/white"
-        android:textStyle="bold"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        android:layout_marginStart="@dimen/dp_60"
-        android:layout_marginTop="@dimen/dp_100"
-        />
-
-    <TextView
-        android:id="@+id/tvTakeOverTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/take_over_time"
-        android:textColor="@color/white"
-        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
-        android:id="@+id/tvTypeTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/take_over_type"
-        android:textSize="@dimen/sp_38"
-        android:textColor="@color/white"
-        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_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"
-        android:gravity="start|center_vertical"
-        android:textColor="@color/white"
-        android:paddingStart="@dimen/dp_21"
-        android:paddingEnd="@dimen/dp_21"
-        app:drawableEndCompat="@drawable/icon_fault_expand"
-        />
-
-    <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_38"
-        android:textColor="@color/white"
-        app:layout_constraintTop_toBottomOf="@id/tvTakeOverType"
-        app:layout_constraintLeft_toLeftOf="@id/tvTakeOverType"
-        android:layout_marginTop="@dimen/dp_36"
-        />
-
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/tvTakeOverReason"
-        android:layout_width="@dimen/dp_781"
-        android:layout_height="@dimen/dp_70"
-        android:background="@drawable/bg_fault_type"
-        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"
-        android:textSize="@dimen/sp_30"
-        android:textColor="@color/white"
-        android:gravity="center_vertical"
-        />
-
-    <TextView
-        android:id="@+id/tvTakeOverNoteTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/fault_note"
-        android:textSize="@dimen/sp_38"
-        android:textColor="@color/white"
-        app:layout_constraintTop_toBottomOf="@id/tvTakeOverReason"
-        app:layout_constraintLeft_toLeftOf="@id/tvTakeOverReason"
-        android:layout_marginTop="@dimen/dp_36"
-        />
-
-    <TextView
-        android:id="@+id/tvTakeOverNoteSupplement"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="@id/tvTakeOverNoteTitle"
-        app:layout_constraintBottom_toBottomOf="@id/tvTakeOverNoteTitle"
-        app:layout_constraintLeft_toRightOf="@id/tvTakeOverNoteTitle"
-        android:text="@string/fault_note_supplement"
-        android:textSize="@dimen/sp_30"
-        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/tvTakeOverNoteTitle"
-        app:layout_constraintLeft_toLeftOf="@id/tvTakeOverNoteTitle"
-        android:hint="@string/take_over_note_input"
-        android:textColorHint="#A3ABC0"
-        android:textCursorDrawable="@drawable/work_order_input_cursor"
-        android:textSize="@dimen/sp_30"
-        android:textColor="@color/white"
-        android:gravity="top|start"
-        android:paddingStart="@dimen/dp_28"
-        android:paddingTop="@dimen/dp_21"
-        android:paddingEnd="@dimen/dp_80"
-        android:layout_marginTop="@dimen/dp_25"
-        android:background="@drawable/bg_work_order_des_input"
-        />
-
-    <ImageView
-        android:id="@+id/ivNoteAudio"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/icon_reason_audio_normal"
-        app:layout_constraintTop_toTopOf="@id/etNoteInput"
-        app:layout_constraintBottom_toBottomOf="@id/etNoteInput"
-        app:layout_constraintEnd_toEndOf="@id/etNoteInput"
-        android:padding="@dimen/dp_30"
-        android:contentDescription="@string/take_over_note_audio"
-        />
-
-    <TextView
-        android:id="@+id/tvTakeOverSceneImageTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/take_over_scene_image"
-        android:textSize="@dimen/sp_38"
-        android:textColor="@color/white"
-        app:layout_constraintTop_toBottomOf="@id/etNoteInput"
-        app:layout_constraintLeft_toLeftOf="@id/etNoteInput"
-        android:layout_marginTop="@dimen/dp_36"
-        />
-
     <ScrollView
-        android:layout_width="@dimen/dp_779"
-        android:layout_height="@dimen/dp_0"
-        app:layout_constraintTop_toBottomOf="@id/tvTakeOverSceneImageTitle"
-        app:layout_constraintLeft_toLeftOf="@id/tvTakeOverSceneImageTitle"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginTop="@dimen/dp_13"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbars="none"
         >
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
+            <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_45"
+                android:textColor="@color/white"
+                android:textStyle="bold"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                android:layout_marginStart="@dimen/dp_60"
+                android:layout_marginTop="@dimen/dp_100"
+                />
+
+            <TextView
+                android:id="@+id/tvTakeOverTime"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/take_over_time"
+                android:textColor="@color/white"
+                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
+                android:id="@+id/tvTypeTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/take_over_type"
+                android:textSize="@dimen/sp_38"
+                android:textColor="@color/white"
+                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_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"
+                android:gravity="start|center_vertical"
+                android:textColor="@color/white"
+                android:paddingStart="@dimen/dp_21"
+                android:paddingEnd="@dimen/dp_21"
+                app:drawableEndCompat="@drawable/icon_fault_expand"
+                />
+
+            <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_38"
+                android:textColor="@color/white"
+                app:layout_constraintTop_toBottomOf="@id/tvTakeOverType"
+                app:layout_constraintLeft_toLeftOf="@id/tvTakeOverType"
+                android:layout_marginTop="@dimen/dp_36"
+                />
+
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvTakeOverReason"
+                android:layout_width="@dimen/dp_781"
+                android:layout_height="@dimen/dp_70"
+                android:background="@drawable/bg_fault_type"
+                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"
+                android:textSize="@dimen/sp_30"
+                android:textColor="@color/white"
+                android:gravity="center_vertical"
+                />
+
+            <TextView
+                android:id="@+id/tvTakeOverNoteTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/fault_note"
+                android:textSize="@dimen/sp_38"
+                android:textColor="@color/white"
+                app:layout_constraintTop_toBottomOf="@id/tvTakeOverReason"
+                app:layout_constraintLeft_toLeftOf="@id/tvTakeOverReason"
+                android:layout_marginTop="@dimen/dp_36"
+                />
+
+            <TextView
+                android:id="@+id/tvTakeOverNoteSupplement"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toTopOf="@id/tvTakeOverNoteTitle"
+                app:layout_constraintBottom_toBottomOf="@id/tvTakeOverNoteTitle"
+                app:layout_constraintLeft_toRightOf="@id/tvTakeOverNoteTitle"
+                android:text="@string/fault_note_supplement"
+                android:textSize="@dimen/sp_30"
+                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/tvTakeOverNoteTitle"
+                app:layout_constraintLeft_toLeftOf="@id/tvTakeOverNoteTitle"
+                android:hint="@string/take_over_note_input"
+                android:textColorHint="#A3ABC0"
+                android:textCursorDrawable="@drawable/work_order_input_cursor"
+                android:textSize="@dimen/sp_30"
+                android:textColor="@color/white"
+                android:gravity="top|start"
+                android:paddingStart="@dimen/dp_28"
+                android:paddingTop="@dimen/dp_21"
+                android:paddingEnd="@dimen/dp_80"
+                android:layout_marginTop="@dimen/dp_25"
+                android:background="@drawable/bg_work_order_des_input"
+                />
+
+            <ImageView
+                android:id="@+id/ivNoteAudio"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/icon_reason_audio_normal"
+                app:layout_constraintTop_toTopOf="@id/etNoteInput"
+                app:layout_constraintBottom_toBottomOf="@id/etNoteInput"
+                app:layout_constraintEnd_toEndOf="@id/etNoteInput"
+                android:padding="@dimen/dp_30"
+                android:contentDescription="@string/take_over_note_audio"
+                />
+
+            <TextView
+                android:id="@+id/tvTakeOverSceneImageTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/take_over_scene_image"
+                android:textSize="@dimen/sp_38"
+                android:textColor="@color/white"
+                app:layout_constraintTop_toBottomOf="@id/etNoteInput"
+                app:layout_constraintLeft_toLeftOf="@id/etNoteInput"
+                android:layout_marginTop="@dimen/dp_36"
+                />
+
             <ImageView
                 android:id="@+id/ivFrontCamera"
                 android:layout_width="@dimen/dp_779"
                 android:layout_height="@dimen/dp_422"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tvTakeOverSceneImageTitle"
+                app:layout_constraintLeft_toLeftOf="@id/tvTakeOverSceneImageTitle"
+                android:layout_marginTop="@dimen/dp_13"
                 android:contentDescription="@string/take_over_front_camera"
                 android:scaleType="fitXY"
+                android:background="@drawable/bg_take_over_image"
                 />
 
             <TextView
@@ -204,6 +202,7 @@
                 android:contentDescription="@string/take_over_rear_camera"
                 android:layout_marginTop="@dimen/dp_13"
                 android:scaleType="fitXY"
+                android:background="@drawable/bg_take_over_image"
                 />
 
             <TextView
@@ -231,6 +230,7 @@
                 android:layout_marginTop="@dimen/dp_13"
                 android:layout_marginBottom="@dimen/dp_160"
                 android:scaleType="fitXY"
+                android:background="@drawable/bg_take_over_image"
                 />
 
             <TextView
@@ -246,16 +246,32 @@
                 android:gravity="center"
                 />
 
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rvTakeOverList"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="@dimen/dp_0"
+                app:layout_constraintLeft_toLeftOf="@id/tvTakeOverType"
+                app:layout_constraintRight_toRightOf="@id/tvTakeOverType"
+                app:layout_constraintTop_toBottomOf="@id/tvTakeOverType"
+                app:layout_constraintBottom_toBottomOf="parent"
+                android:background="@drawable/bg_reason_list"
+                android:visibility="gone"
+                android:layout_marginTop="@dimen/dp_m_5"
+                android:paddingTop="@dimen/dp_5"
+                android:layout_marginBottom="@dimen/dp_920"
+                />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </ScrollView>
 
+
     <TextView
         android:id="@+id/tvTakeOverSave"
         android:layout_width="@dimen/dp_380"
         android:layout_height="@dimen/dp_80"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="@id/etNoteInput"
+        app:layout_constraintLeft_toLeftOf="parent"
         android:background="@drawable/bg_take_over_reason_save"
         android:text="@string/take_over_save"
         android:textColor="#FFFFFF"
@@ -263,6 +279,7 @@
         android:textStyle="bold"
         android:gravity="center"
         android:layout_marginBottom="@dimen/dp_75"
+        android:layout_marginStart="@dimen/dp_60"
         />
 
     <TextView
@@ -270,7 +287,7 @@
         android:layout_width="@dimen/dp_380"
         android:layout_height="@dimen/dp_80"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="@id/etNoteInput"
+        app:layout_constraintRight_toRightOf="parent"
         android:text="@string/take_over_cancel"
         android:textColor="#FFFFFF"
         android:textSize="@dimen/sp_36"
@@ -278,21 +295,7 @@
         android:gravity="center"
         android:background="@drawable/bg_take_over_reason_cancel"
         android:layout_marginBottom="@dimen/dp_75"
-        />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rvTakeOverList"
-        android:layout_width="@dimen/dp_0"
-        android:layout_height="@dimen/dp_0"
-        app:layout_constraintLeft_toLeftOf="@id/tvTakeOverType"
-        app:layout_constraintRight_toRightOf="@id/tvTakeOverType"
-        app:layout_constraintTop_toBottomOf="@id/tvTakeOverType"
-        app:layout_constraintBottom_toTopOf="@id/tvTakeOverSave"
-        android:layout_marginBottom="@dimen/dp_39"
-        android:background="@drawable/bg_reason_list"
-        android:visibility="gone"
-        android:layout_marginTop="@dimen/dp_m_5"
-        android:paddingTop="@dimen/dp_5"
+        android:layout_marginEnd="@dimen/dp_60"
         />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file