From 3e0dfc8e78013cc6e5ae9962dcc2a9ea56026bd5 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Tue, 12 Dec 2023 16:15:52 +0800
Subject: [PATCH] =?UTF-8?q?[6.2.4]=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=87=87=E9=9B=86=E5=BD=95bag=E6=97=B6=E4=B8=8D=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=8E=9F=E5=9B=A0=EF=BC=8C=E5=9C=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E5=86=8D=E6=AC=A1=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E4=B8=8A=E6=8A=A5=E4=BC=9A=E4=BA=A7=E7=94=9F?=
 =?UTF-8?q?=E6=96=B0=E7=9A=84=E5=BD=95=E5=8C=85=E8=80=8C=E9=9D=9E=E5=9C=A8?=
 =?UTF-8?q?=E5=8E=9F=E5=BD=95=E5=8C=85=E4=B8=8A=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../badcase/biz/AIDataCollectWindow.kt        | 31 ++++++++++++++-----
 .../badcase/biz/BadCaseManagerView.kt         |  2 +-
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt
index 5a653f02b9..361d7639bb 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt
@@ -13,6 +13,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.deva.badcase.AiDataEntity
 import com.mogo.eagle.core.data.deva.badcase.BagDescriptionEntity
+import com.mogo.eagle.core.data.deva.badcase.BagInfoEntity
 import com.mogo.eagle.core.data.deva.badcase.BagManagerEntity
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener
 import com.mogo.eagle.core.function.api.devatools.badcase.BadCaseNetListener
@@ -114,13 +115,6 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
             "时间：${millis2String(System.currentTimeMillis(), TimeUtils.getHourMinSecondFormat())}"
         //采集结果回调监听
         CallerAutopilotRecordListenerManager.addListener(this.hashCode().toString(), this)
-        //开始录制AI数据采集Bag包
-        CallerAutoPilotControlManager.recordPackage(
-            99,
-            Random(SystemClock.elapsedRealtime()).nextInt(),
-            20,
-            12
-        )
         val linearLayoutManager = LinearLayoutManager(mActivity)
         linearLayoutManager.orientation = LinearLayoutManager.VERTICAL
         rvCollectList?.layoutManager = linearLayoutManager
@@ -262,6 +256,29 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
             mWindowParams!!.y = metrics.heightPixels - BarUtils.getStatusBarHeight() - 950
             mWindowManager!!.addView(mFloatLayout, mWindowParams)
         }
+        //开始录制AI数据采集Bag包
+        CallerAutoPilotControlManager.recordPackage(
+            99,
+            Random(SystemClock.elapsedRealtime()).nextInt(),
+            20,
+            12
+        )
+    }
+
+    fun showReportBIWindow(bagInfoEntity: BagInfoEntity){
+        if (mFloatLayout.parent == null) {
+            val metrics = DisplayMetrics()
+            // 默认固定位置，靠屏幕右边缘的中间
+            mWindowManager!!.defaultDisplay.getMetrics(metrics)
+            mWindowParams!!.x = metrics.widthPixels
+            mWindowParams!!.y = metrics.heightPixels - BarUtils.getStatusBarHeight() - 950
+            mWindowManager!!.addView(mFloatLayout, mWindowParams)
+        }
+        //已经录包无需再次启动录包，只要将录包信息同步到弹窗
+        bagInfoEntity.let {
+            recordKey = it.key
+            recordFileName = it.bagPath
+        }
     }
 
     fun hideFloatWindow() {
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt
index 14cd988e10..91a9798b34 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt
@@ -204,7 +204,7 @@ class BadCaseManagerView @JvmOverloads constructor(
                         aiDataCollectWindow.hideFloatWindow()
                     }
                 })
-                aiDataCollectWindow.showFloatWindow()
+                aiDataCollectWindow.showReportBIWindow(bagInfoEntity)
             }
 
             override fun editDescription(key: Long, description: BagDescriptionEntity) {