Merge branch 'dev_robotaxi-d-app-module_265_220329_2.6.5' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_265_220329_2.6.5

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)
                     }

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>