From 8841eabbfc703c47e53b477d1220972f0032e988 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Fri, 30 Aug 2024 15:27:13 +0800
Subject: [PATCH] =?UTF-8?q?[6.6.0]=E4=B8=8A=E6=8A=A5=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=BC=B9=E7=AA=97=E5=86=8D=E6=AC=A1=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=8C=89=E9=92=AE=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../badcase/BadCaseManager.kt                 |  7 ++++++-
 .../workorder/ReportTypeWindow.kt             | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt
index d08eb0cbea..3caa82f8ad 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt
@@ -257,7 +257,12 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis
                                     }
                                 })
                             }
-                            reportTypeWindow?.showFloatWindow(xPosition,yPosition)
+                            if(reportTypeWindow?.getWindowShowStatus() == true){
+                                reportTypeWindow?.hideFloatWindow()
+                                reportTypeWindow = null
+                            }else{
+                                reportTypeWindow?.showFloatWindow(xPosition,yPosition)
+                            }
                         }else{
                             //展示工单上报弹窗
                             val workOrderWindow = WorkOrderWindow(activity)
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt
index 6319683057..02be6b7c9c 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt
@@ -84,6 +84,8 @@ class ReportTypeWindow constructor(activity: Activity): IMoGoDevaToolsListener {
 
     private var canOneReport: Boolean = false //是否可以一键上报
 
+    private var isShowing: Boolean = false //弹窗是否是展示状态
+
     init {
         initFloatWindow()
     }
@@ -236,6 +238,7 @@ class ReportTypeWindow constructor(activity: Activity): IMoGoDevaToolsListener {
                 showTypeSelectView()
             }
         }
+        setWindowShowStatus(true)
     }
 
     /**
@@ -259,6 +262,7 @@ class ReportTypeWindow constructor(activity: Activity): IMoGoDevaToolsListener {
 
     fun hideFloatWindow() {
         CallerDevaToolsListenerManager.removeListener(TAG)
+        setWindowShowStatus(false)
         if (mFloatLayout.parent != null){
             mWindowManager!!.removeView(mFloatLayout)
         }
@@ -272,6 +276,21 @@ class ReportTypeWindow constructor(activity: Activity): IMoGoDevaToolsListener {
         fun closeWindow()
     }
 
+    /**
+     * 获取弹窗展示状态
+     */
+    fun getWindowShowStatus(): Boolean{
+        return isShowing
+    }
+
+    /**
+     * 设置弹窗展示状态
+     */
+    fun setWindowShowStatus(isShow: Boolean){
+        isShowing = isShow
+    }
+
+
     /**
      * 故障上报成功
      */