From 62db69b1d41338d251d5e39be5bcf06908e60db4 Mon Sep 17 00:00:00 2001
From: renhaoting <370797079@qq.com>
Date: Tue, 2 Dec 2025 15:23:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/gamedog/vididin/VididinEvents.kt      | 2 +-
 .../com/gamedog/vididin/features/watchad/WatchAdActivity.kt | 5 ++++-
 .../com/gamedog/vididin/main/fragments/TasksFragment.kt     | 2 +-
 .../main/fragments/home/fragment/HomeItemFragment.kt        | 2 +-
 .../main/java/com/gamedog/vididin/manager/TaskManager.kt    | 4 ++--
 .../com/gamedog/vididin/manager/taskbeans/BaseTaskState.kt  | 6 +++---
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/gamedog/vididin/VididinEvents.kt b/app/src/main/java/com/gamedog/vididin/VididinEvents.kt
index 9359f20..e91a370 100644
--- a/app/src/main/java/com/gamedog/vididin/VididinEvents.kt
+++ b/app/src/main/java/com/gamedog/vididin/VididinEvents.kt
@@ -17,7 +17,7 @@ object VididinEvents {
 
 
     const val Event_AD_TASK_TYPE_Convert_Gold_2_Cash = 800
-    const val Event_AD_TASK_TYPE_Watch_Ad_For_Gold = 801
+    const val Event_AD_TASK_TYPE_Watch_Ad_Earn_Gold = 801
     const val Event_AD_TASK_TYPE_Watch_Ad_Daily = 802
     const val Event_AD_TASK_TYPE_Withdraw = 803
     const val Event_AD_TASK_TYPE_Complement = 804
diff --git a/app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt b/app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt
index 7418efd..c130c1d 100644
--- a/app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt
+++ b/app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt
@@ -58,7 +58,10 @@ class WatchAdActivity : AppViewsActivity<ViewBinding, UiState, ViewModel>(), OnT
 
     private fun notifyAdWatchFinish() {
         NotifyMan.instance().sendEvent(mTaskType, null)
-        NotifyMan.instance().sendEvent(VididinEvents.Event_Finish_One_Ad, NotifyMan.NotifyData(1))
+
+        if (mTaskType != VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_Earn_Gold) {
+            NotifyMan.instance().sendEvent(VididinEvents.Event_Finish_One_Ad, NotifyMan.NotifyData(1))
+        }
     }
 
     private fun stateCounter() {
diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/TasksFragment.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/TasksFragment.kt
index 16e8973..c1271e7 100644
--- a/app/src/main/java/com/gamedog/vididin/main/fragments/TasksFragment.kt
+++ b/app/src/main/java/com/gamedog/vididin/main/fragments/TasksFragment.kt
@@ -79,7 +79,7 @@ class TasksFragment : AppViewsFragment<ViewBinding, UiState, ViewModel>(), OnTab
                     }
 
                     llTaskWatchVideo->{
-                        WatchAdDialog(requireActivity(), VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_For_Gold, null).show()
+                        WatchAdDialog(requireActivity(), VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_Earn_Gold, null).show()
                     }
 
                     llTaskGame->{
diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/home/fragment/HomeItemFragment.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/home/fragment/HomeItemFragment.kt
index c120261..4802de2 100644
--- a/app/src/main/java/com/gamedog/vididin/main/fragments/home/fragment/HomeItemFragment.kt
+++ b/app/src/main/java/com/gamedog/vididin/main/fragments/home/fragment/HomeItemFragment.kt
@@ -63,7 +63,7 @@ class HomeItemFragment : AppViewsEmptyViewModelFragment<ViewBinding>() {
                     Router.Benefit.startActivity(requireActivity())
                 },
                 PopMenuIconView.MenuItem(R.mipmap.home_menu_2) {
-                    WatchAdDialog(requireActivity(), VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_For_Gold, null).show()
+                    WatchAdDialog(requireActivity(), VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_Earn_Gold, null).show()
                 },
                 PopMenuIconView.MenuItem(R.mipmap.home_menu_3) {
 
diff --git a/app/src/main/java/com/gamedog/vididin/manager/TaskManager.kt b/app/src/main/java/com/gamedog/vididin/manager/TaskManager.kt
index 5ff1dda..f5a03ee 100644
--- a/app/src/main/java/com/gamedog/vididin/manager/TaskManager.kt
+++ b/app/src/main/java/com/gamedog/vididin/manager/TaskManager.kt
@@ -83,12 +83,12 @@ class TaskManager private constructor() {
                         AccountManager.convertGold2Cash()
                     }
 
-                    VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_For_Gold -> {
+                    VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_Earn_Gold -> {
                         // TODO - add gold for user
                     }
                 }
             }
-        }, VididinEvents.Event_AD_TASK_TYPE_Convert_Gold_2_Cash, VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_For_Gold)
+        }, VididinEvents.Event_AD_TASK_TYPE_Convert_Gold_2_Cash, VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_Earn_Gold)
     }
 
 
diff --git a/app/src/main/java/com/gamedog/vididin/manager/taskbeans/BaseTaskState.kt b/app/src/main/java/com/gamedog/vididin/manager/taskbeans/BaseTaskState.kt
index 2580327..c2f139d 100644
--- a/app/src/main/java/com/gamedog/vididin/manager/taskbeans/BaseTaskState.kt
+++ b/app/src/main/java/com/gamedog/vididin/manager/taskbeans/BaseTaskState.kt
@@ -6,8 +6,8 @@ import kotlinx.serialization.Serializable
 @Serializable
 abstract class BaseTaskState {
     companion object {
-        const val STATE_ONGOING = 1
-        const val STATE_FINISH = 2
-        const val STATE_CLAIMED = 3
+        const val STATE_ONGOING = 0
+        const val STATE_FINISH = 1
+        const val STATE_CLAIMED = 2
     }
 }
\ No newline at end of file