diff --git a/app/build.gradle b/app/build.gradle index 372ad7c51b..31a45c8fb6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,15 +21,15 @@ if (!isAndroidTestBuild()) { } if (!isAndroidTestBuild()) { - apply plugin: 'bytex.threadOpt' - thread_opt { - enable true - enableInDebug true - rxJavaIoReplacer 'com/mogo/eagle/core/utilcode/util/ThreadUtils@@getIoPool@@()Ljava/util/concurrent/ExecutorService;' - rxJavaComputationReplacer 'com/mogo/eagle/core/utilcode/util/ThreadUtils@@getCpuPool@@()Ljava/util/concurrent/ExecutorService;' - coroutineIoReplacer 'com/mogo/eagle/core/utilcode/util/ThreadUtils@@getIoPool@@()Ljava/util/concurrent/ExecutorService;' - coroutineDefaultReplacer 'com/mogo/eagle/core/utilcode/util/ThreadUtils@@getCpuPool@@()Ljava/util/concurrent/ExecutorService;' - } +// apply plugin: 'bytex.threadOpt' +// thread_opt { +// enable true +// enableInDebug true +// rxJavaIoReplacer 'com/mogo/eagle/core/utilcode/util/ThreadUtils@@getIoPool@@()Ljava/util/concurrent/ExecutorService;' +// rxJavaComputationReplacer 'com/mogo/eagle/core/utilcode/util/ThreadUtils@@getCpuPool@@()Ljava/util/concurrent/ExecutorService;' +// coroutineIoReplacer 'com/mogo/eagle/core/utilcode/util/ThreadUtils@@getIoPool@@()Ljava/util/concurrent/ExecutorService;' +// coroutineDefaultReplacer 'com/mogo/eagle/core/utilcode/util/ThreadUtils@@getCpuPool@@()Ljava/util/concurrent/ExecutorService;' +// } /** * 方便使用systrace工具,在工程侧打点,便于分析工程侧性能问题 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index be7cafaebb..0659589fe7 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -297,13 +297,14 @@ class MoGoHmiFragment : MvpFragment if (autoPilotToolsFloat == null) { if (autoPilotBadCaseView == null) { autoPilotBadCaseView = AutoPilotBadCaseView(it).also { itx -> + val record = + autoPilotBadCaseEntrance?.getTag(R.id.autopilot_badcase_record) as? AutoPilotRecordResult + itx.tag = record itx.onDismiss { dismissBadCaseFloatView() } itx.onSelect { lifecycleScope.launch { - val record = - autoPilotBadCaseEntrance?.getTag(R.id.autopilot_badcase_record) as? AutoPilotRecordResult try { val params = mutableMapOf() autoPilotBadCaseEntrance?.apply { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotBadCase.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotBadCase.kt index 79de48ee02..28e6ce710c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotBadCase.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotBadCase.kt @@ -40,6 +40,8 @@ import retrofit2.http.FieldMap import retrofit2.http.FormUrlEncoded import retrofit2.http.GET import retrofit2.http.POST +import java.text.SimpleDateFormat +import java.util.* import kotlin.Result.Companion.failure import kotlin.Result.Companion.success @@ -247,7 +249,6 @@ class AutoPilotBadCaseView: ConstraintLayout { background = ColorDrawable(Color.parseColor("#F0151D41")) isClickable = true layoutParams = ViewGroup.LayoutParams(960.toPixels().toInt(), 1528.toPixels().toInt()) - close?.onClick { dismiss?.invoke() } @@ -279,6 +280,15 @@ class AutoPilotBadCaseView: ConstraintLayout { if (adapter != null && adapter.itemCount > 0) { return } + time_of_take_over?.text = "接管时间: ${(tag as? AutoPilotRecordResult)?.timestamp?.let { + try { + SimpleDateFormat("yyyyMMddHHmmss", Locale.getDefault()).parse(it)?.let { itx -> + SimpleDateFormat("yyyy.MM.dd HH:mm", Locale.getDefault()).format(itx) + } + } catch (e: Throwable) { + null + } ?: SimpleDateFormat("yyyy.MM.dd HH:mm", Locale.getDefault()).format(Date())}}" + scope.launch { showLoading() try { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_badcase_collect.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_badcase_collect.xml index ca9711a934..38406da135 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_badcase_collect.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_badcase_collect.xml @@ -79,7 +79,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" android:enabled="false" - android:layout_marginBottom="100px"/> + android:layout_marginBottom="150px"/> + android:layout_marginBottom="150px"/>