From 9e1b7e5b9da5678a08a4d3c9a81242404ff5b822 Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Fri, 1 Apr 2022 10:58:16 +0800
Subject: [PATCH] =?UTF-8?q?[feedback]=E5=BD=95=E5=88=B6=E8=BF=87=E7=A8=8B?=
 =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=E5=80=92=E8=AE=A1=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feedback/FeedbackManager.kt                | 18 +++++++++++++++---
 .../src/main/res/values/ids.xml                |  1 +
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/FeedbackManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/FeedbackManager.kt
index a1032bd60f..2e777068a6 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/FeedbackManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/FeedbackManager.kt
@@ -1,5 +1,6 @@
 package com.zhjt.mogo_core_function_devatools.feedback
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.text.TextUtils
 import android.view.View
@@ -61,7 +62,7 @@ internal object FeedbackManager {
                     }
                     itx.adapter.notifyItemChanged(0)
                 }
-                override fun onStartBadCaseRecord(record: TextView) {
+                @SuppressLint("SetTextI18n") override fun onStartBadCaseRecord(record: TextView) {
                     if (!CallerAutoPilotManager.isConnected()) {
                         TipToast.shortTip("请检查车机与域控制器连接是否正常")
                         return
@@ -119,9 +120,20 @@ internal object FeedbackManager {
                         recordBag(1, taskId)
                         launch {
                             CallerLogger.d("${M_DEVA}${TAG}", "延时20秒开始....")
+                            launch {
+                                var left = 20
+                                while (left >= 0) {
+                                    record.text = "结束录制(${left}s)"
+                                    delay(1000)
+                                    left--
+                                }
+                            }.also {
+                                record.setTag(R.id.feed_back_badcase_count_down_job, it)
+                            }
                             delay(20000) //延时20秒
                             CallerLogger.d("${M_DEVA}${TAG}", "延时20秒结束....")
                             record.text = "正在结束录制"
+                            (record.getTag(R.id.feed_back_badcase_count_down_job) as? Job)?.safeCancel()
                             record.setTag(R.id.feed_back_badcase_tag, 2)
                             stopRecordBag(1, taskId)
                         }.also { itx ->
@@ -142,10 +154,10 @@ internal object FeedbackManager {
                         return
                     }
                     val taskId = (record.getTag(R.id.feed_back_badcase_taskid_tag) as? Int) ?: throw IllegalStateException("TaskId 不存在")
-                    val oldJob = record.getTag(R.id.feed_back_badcase_job) as? Job
+                    (record.getTag(R.id.feed_back_badcase_job) as? Job)?.safeCancel()
+                    (record.getTag(R.id.feed_back_badcase_count_down_job) as? Job)?.safeCancel()
                     record.text = "正在结束录制"
                     record.setTag(R.id.feed_back_badcase_tag, 2)
-                    oldJob?.safeCancel()
                     record.scope.launch {
                         stopRecordBag(1, taskId)
                     }
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/values/ids.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/values/ids.xml
index eefb61e677..732e05a41f 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/res/values/ids.xml
+++ b/core/function-impl/mogo-core-function-devatools/src/main/res/values/ids.xml
@@ -3,4 +3,5 @@
     <item name="feed_back_badcase_tag" type="id" />
     <item name="feed_back_badcase_taskid_tag" type="id" />
     <item name="feed_back_badcase_job" type="id" />
+    <item name="feed_back_badcase_count_down_job" type="id" />
 </resources>
\ No newline at end of file