From bcf18f1fa6bda455fc8dddaad15c948e1a9f59ac Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Tue, 3 Sep 2024 18:28:36 +0800
Subject: [PATCH] =?UTF-8?q?[6.6.0]=E6=8E=A5=E7=AE=A1=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=B6=EF=BC=8C=E8=AE=BE=E7=BD=AE=E9=94=AE?=
 =?UTF-8?q?=E7=9B=98=E9=9A=8F=E7=9D=80=E5=BC=B9=E7=AA=97=E7=9A=84=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E8=80=8C=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workorder/TakeOverReasonWindow.kt                        | 5 +++++
 .../workorder/TakeOverRecordView.kt                          | 4 ++++
 2 files changed, 9 insertions(+)

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 2fa0647b4e..36c297a959 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
@@ -301,10 +301,12 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene
             mTakeOverRecordInfo.level3Name = level3Name
             CallerTakeOverManager.updateRecord(mActivity,mTakeOverRecordInfo)
             clickListener?.onSaveReason(mTakeOverRecordInfo)
+            clickListener?.closeWindow()
             hideFloatWindow()
         }
         //取消
         tvTakeOverCancel.setOnClickListener {
+            clickListener?.closeWindow()
             hideFloatWindow()
         }
     }
@@ -454,6 +456,7 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene
     }
 
     fun hideFloatWindow() {
+        etNoteInput.clearFocus()
         if (mFloatLayout.parent != null){
             mWindowManager!!.removeView(mFloatLayout)
         }
@@ -481,6 +484,8 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene
 
     interface ClickListener {
         fun onSaveReason(info: TakeOverRecordInfo)
+
+        fun closeWindow()
     }
 
     override fun getCategoriesSuccess(list: List<CategoryInfo>) {
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt
index 69060aa01d..c12e760472 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt
@@ -87,6 +87,10 @@ class TakeOverRecordView @JvmOverloads constructor(
                         override fun onSaveReason(info: TakeOverRecordInfo) {
                             takeOverListAdapter?.notifyRecordItemChanged(info)
                         }
+
+                        override fun closeWindow() {
+                            takeOverReasonWindow = null
+                        }
                     })
                 }
                 if(takeOverReasonWindow?.getWindowShowStatus() == true){