From 91260dc651c27332505055c36497652ed3df8c80 Mon Sep 17 00:00:00 2001
From: renhaoting <370797079@qq.com>
Date: Fri, 23 Jan 2026 17:50:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=9F=8B=E7=82=B9=E3=80=91=E7=A6=8F?=
 =?UTF-8?q?=E5=88=A9=E4=BB=BB=E5=8A=A1=E5=AE=8C=E6=88=90=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=AF=E5=AE=8C=E6=88=90=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=B0=B1=E4=B8=8A=E6=8A=A5=E4=B8=80=E6=9D=A1?=
 =?UTF-8?q?=EF=BC=8C=E7=9B=AE=E5=89=8D=E6=98=AF=E5=85=A8=E9=83=A8=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E4=BA=86=E6=89=8D=E4=BC=9A=E4=B8=8A=E6=8A=A5=E4=B8=80?=
 =?UTF-8?q?=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vididin/manager/helpers/BoxTaskHelper.kt      | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/gamedog/vididin/manager/helpers/BoxTaskHelper.kt b/app/src/main/java/com/gamedog/vididin/manager/helpers/BoxTaskHelper.kt
index b8d531a..7a97fd4 100644
--- a/app/src/main/java/com/gamedog/vididin/manager/helpers/BoxTaskHelper.kt
+++ b/app/src/main/java/com/gamedog/vididin/manager/helpers/BoxTaskHelper.kt
@@ -90,8 +90,8 @@ class BoxTaskHelper: BaseTaskHelper<TaskStateBoxRoot, BoxTaskRoot>() {
                 if (taskType == subTask.task_type
                             && !isBoxSubTaskFinished(currentBoxIndex, index)) {
                     subTask.finishedNum++
-                    if (isBoxTasksFinished(currentBoxIndex)) {
-                        sendSubBoxFinishEvent(currentBoxIndex)
+                    if (subTask.required_count <= subTask.finishedNum) {
+                        sendSubBoxSubTaskFinishEvent(index, subTask)
                     }
                     saveState2Sp()
                     notifyEvent()
@@ -131,14 +131,9 @@ class BoxTaskHelper: BaseTaskHelper<TaskStateBoxRoot, BoxTaskRoot>() {
         }
     }
 
-    private fun sendSubBoxFinishEvent(index: Int) {
-        val subBox = getBoxState(index)
-
-        subBox?.let {
-            val resetBoxCount = mStateBean.boxList.size - index - 1
-            StatisticUtil.reportEvents(StatisticUtil.KEY_Welfare_Task_Click,
-                mapOf("total_amount" to it.reward_value, "chest_count" to resetBoxCount, "task_type" to "subBox", "task_progress" to "100"))
-        }
+    private fun sendSubBoxSubTaskFinishEvent(index: Int, subTask: TaskStateBoxSub) {
+        StatisticUtil.reportEvents(StatisticUtil.KEY_Welfare_Task_Click,
+            mapOf(/*"total_amount" to it.reward_value, "chest_count" to resetBoxCount, */"task_type" to subTask.task_type, "task_progress" to subTask.task_id))
     }
 
     private fun notifyEvent() {