From 9aee433e0a8d43098ac6652c618c6badb5efea3b Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Mon, 2 Sep 2024 18:01:53 +0800
Subject: [PATCH] =?UTF-8?q?[6.6.0]FSM=E6=98=AF=E5=90=A6=E8=83=BD=E5=90=AF?=
 =?UTF-8?q?=E8=87=AA=E9=A9=BE=E5=8F=98=E4=B8=BAtrue=EF=BC=8C=E4=B9=8B?=
 =?UTF-8?q?=E5=90=8E=E5=8F=88=E5=8F=98=E4=B8=BAfalse=E5=BC=B9=E4=B8=80?=
 =?UTF-8?q?=E9=94=AE=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../badcase/BadCaseManager.kt                 | 47 ++++++++++---------
 .../badcase/consts/BadCaseConfig.kt           |  3 ++
 2 files changed, 29 insertions(+), 21 deletions(-)

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 e840f6b236..b86c0d0b66 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
@@ -579,30 +579,35 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis
      */
     override fun onFSM2024State(fsmState: Fsm2024.FSMStateMsg) {
         Log.i(TAG,"onFSM2024State fsmState.pilotStandbyFlag="+fsmState.pilotStandbyFlag+" pilotNotStandbyReason="+ fsmState.pilotNotStandbyReason)
-        if(!fsmState.pilotStandbyFlag){
-            //pilotStandbyFlag == false代表自动驾驶无法启动
-            if(!BadCaseConfig.alreadyShowOneReport){
-                //触发一键上报
-                ThreadUtils.runOnUiThread {
-                    val activity = AppStateManager.currentActivity()
-                    if (activity !is AppCompatActivity) {
-                        return@runOnUiThread
+        if(fsmState.pilotStandbyFlag){
+            BadCaseConfig.fsmAlreadyStandby = true
+        }
+        if(BadCaseConfig.fsmAlreadyStandby){
+            if(!fsmState.pilotStandbyFlag){
+                //pilotStandbyFlag == false代表自动驾驶无法启动
+                if(!BadCaseConfig.alreadyShowOneReport){
+                    //触发一键上报
+                    ThreadUtils.runOnUiThread {
+                        val activity = AppStateManager.currentActivity()
+                        if (activity !is AppCompatActivity) {
+                            return@runOnUiThread
+                        }
+                        if(reportTypeWindow == null){
+                            reportTypeWindow = ReportTypeWindow(activity)
+                            reportTypeWindow?.setClickListener(object: ReportTypeWindow.ClickListener{
+                                override fun closeWindow() {
+                                    reportTypeWindow?.hideFloatWindow()
+                                    reportTypeWindow = null
+                                }
+                            })
+                        }
+                        reportTypeWindow?.showOneClickReportWindow(xPosition,yPosition)
+                        BadCaseConfig.alreadyShowOneReport = true
                     }
-                    if(reportTypeWindow == null){
-                        reportTypeWindow = ReportTypeWindow(activity)
-                        reportTypeWindow?.setClickListener(object: ReportTypeWindow.ClickListener{
-                            override fun closeWindow() {
-                                reportTypeWindow?.hideFloatWindow()
-                                reportTypeWindow = null
-                            }
-                        })
-                    }
-                    reportTypeWindow?.showOneClickReportWindow(xPosition,yPosition)
-                    BadCaseConfig.alreadyShowOneReport = true
                 }
+            }else{
+                BadCaseConfig.alreadyShowOneReport = false
             }
-        }else{
-            BadCaseConfig.alreadyShowOneReport = false
         }
     }
 
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseConfig.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseConfig.kt
index f9229805b4..76103413a4 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseConfig.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseConfig.kt
@@ -62,6 +62,9 @@ object BadCaseConfig {
     //本次问题是否已经触发一键上报
     @JvmField
     var alreadyShowOneReport: Boolean = false
+    //FSM是否已经变为可以启自驾
+    @JvmField
+    var fsmAlreadyStandby: Boolean = false
     //租户ID
     @JvmField
     var tenantId: Long = 0