From deb267dec0d035b2594d2cfb90958ff4d6b2a40e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E5=8B=A4=E6=B0=91?= <xuqinmin@bjca.org.cn>
Date: Thu, 23 Apr 2026 10:38:57 +0800
Subject: [PATCH] =?UTF-8?q?fix(ui):=20=E4=BF=AE=E5=A4=8D=E5=A4=8D=E5=90=88?=
 =?UTF-8?q?=E9=93=BA=E8=B4=B4=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2=E5=80=92?=
 =?UTF-8?q?=E8=AE=A1=E6=97=B6=E8=BF=94=E5=9B=9E=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加 completeCountdownSeconds 变量用于倒计时控制
- 修改 completeRunnable 中的逻辑，实现正确的倒计时功能
- 修复倒计时显示文本为"任务列表界面"而不是"铺贴任务界面"
- 将倒计时从3秒改为1秒间隔更新，提升用户体验
- 添加对非 COMPLETE 模式的提前返回处理，避免无效操作
---
 .../java/com/nova/brain/glass/MyApplication.java    |  1 +
 .../brain/glass/ui/CompositeLayupResultActivity.kt  | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/nova/brain/glass/MyApplication.java b/app/src/main/java/com/nova/brain/glass/MyApplication.java
index 0afd12e..d4276a2 100644
--- a/app/src/main/java/com/nova/brain/glass/MyApplication.java
+++ b/app/src/main/java/com/nova/brain/glass/MyApplication.java
@@ -37,6 +37,7 @@ public class MyApplication extends App {
     public static AppComponent appComponent2;
     // 单证检验服务的 Dagger 网络组件
     public static AppComponent appComponent3;
+    // 铺贴
     public static AppComponent appComponent4;
 
     @Override
diff --git a/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupResultActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupResultActivity.kt
index 5ddf127..52b3245 100644
--- a/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupResultActivity.kt
+++ b/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupResultActivity.kt
@@ -59,6 +59,7 @@ class CompositeLayupResultActivity : BaseActivity<ActivityCompositeLayupResultBi
 
     private var isPhoto = false
     private var uiMode = UiMode.RECOGNIZE_SUCCESS
+    private var completeCountdownSeconds = 0
 
     private val layupWorkingRunnable: Runnable = Runnable {
         if (isFinishing || isDestroyed) return@Runnable
@@ -68,9 +69,14 @@ class CompositeLayupResultActivity : BaseActivity<ActivityCompositeLayupResultBi
     }
     private val completeRunnable: Runnable = Runnable {
         if (isFinishing || isDestroyed) return@Runnable
-        if (uiMode == UiMode.COMPLETE) {
+        if (uiMode != UiMode.COMPLETE) return@Runnable
+        completeCountdownSeconds -= 1
+        if (completeCountdownSeconds <= 0) {
             goTaskList()
+            return@Runnable
         }
+        binding.subtitle1.text = "${completeCountdownSeconds}S后自动返回任务列表界面"
+        uiHandler.postDelayed(completeRunnable, 1000L)
     }
 
     private val listener: OfflineCmdListener = object : OfflineCmdListener {
@@ -209,11 +215,12 @@ class CompositeLayupResultActivity : BaseActivity<ActivityCompositeLayupResultBi
             UiMode.COMPLETE -> {
                 binding.icon.setImageResource(R.mipmap.ocr_true)
                 binding.title.text = "恭喜完成当前铺贴任务！"
-                binding.subtitle1.text = "3S后自动返回铺贴任务界面"
+                completeCountdownSeconds = 3
+                binding.subtitle1.text = "3S后自动返回任务列表界面"
                 binding.subtitle2.text = ""
                 renderActions(listOf("返回任务列表"))
                 binding.hint.text = ""
-                uiHandler.postDelayed(completeRunnable, 3000L)
+                uiHandler.postDelayed(completeRunnable, 1000L)
             }
         }
         binding.icon.visibility = android.view.View.VISIBLE