From 60fa7faa2f8f0e8b4ee43d717f7b95eae01fdb49 Mon Sep 17 00:00:00 2001
From: renhaoting <370797079@qq.com>
Date: Fri, 16 Jan 2026 17:59:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=20=E5=A4=84=E7=90=86=20notif?=
 =?UTF-8?q?y=20intent=E6=98=AF=E5=90=A6=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gamedog/vididin/main/MainActivity.kt  | 35 ++++++++++---------
 .../core/architecture/base/BaseActivity.kt    |  7 +++-
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/gamedog/vididin/main/MainActivity.kt b/app/src/main/java/com/gamedog/vididin/main/MainActivity.kt
index d3b9728..c91c06f 100644
--- a/app/src/main/java/com/gamedog/vididin/main/MainActivity.kt
+++ b/app/src/main/java/com/gamedog/vididin/main/MainActivity.kt
@@ -12,6 +12,7 @@ import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentManager.FragmentLifecycleCallbacks
 import androidx.lifecycle.lifecycleScope
 import androidx.viewpager2.widget.ViewPager2
+import com.ama.core.architecture.BaseApp
 import com.ama.core.architecture.appBase.AppViewsActivity
 import com.ama.core.architecture.appBase.OnFragmentBackgroundListener
 import com.ama.core.architecture.ext.toast
@@ -191,27 +192,29 @@ class MainActivity : AppViewsActivity<ViewBinding, UiState, ViewModel>(), OnTabS
 
     private fun handleNotificationAction() {
         if (NotificationLandingController.isFromNotification(intent)) {
-            val notificationAction = intent.getIntExtra(LANDING_NOTIFICATION_ACTION, -1)
-            when (notificationAction) {
-                PushContent.ACTION_TYPE_GAME -> {
-                    Router.Game.startActivity(this)
-                }
+            if (BaseApp.getCurrentActivity()?.localClassName?.contains("WatchAdActivity") != true) {
+                val notificationAction = intent.getIntExtra(LANDING_NOTIFICATION_ACTION, -1)
+                when (notificationAction) {
+                    PushContent.ACTION_TYPE_GAME -> {
+                        Router.Game.startActivity(this)
+                    }
 
-                PushContent.ACTION_TYPE_GOLD -> {
-                    switchTab(1)
-                }
+                    PushContent.ACTION_TYPE_GOLD -> {
+                        switchTab(1)
+                    }
 
-                PushContent.ACTION_TYPE_WITHDRAW -> {
-                    Router.Withdraw.startActivity(this)
-                }
+                    PushContent.ACTION_TYPE_WITHDRAW -> {
+                        Router.Withdraw.startActivity(this)
+                    }
 
-                PushContent.ACTION_TYPE_BOX -> {
-                    Router.Benefit.startActivity(this)
+                    PushContent.ACTION_TYPE_BOX -> {
+                        Router.Benefit.startActivity(this)
+                    }
                 }
+                NotificationLandingController.clearNotificationParameters(intent)
+
+                sendNotificationClickStatistics(notificationAction)
             }
-            NotificationLandingController.clearNotificationParameters(intent)
-
-            sendNotificationClickStatistics(notificationAction)
         }
     }
 
diff --git a/core/architecture/src/main/java/com/ama/core/architecture/base/BaseActivity.kt b/core/architecture/src/main/java/com/ama/core/architecture/base/BaseActivity.kt
index 5909931..da82be9 100644
--- a/core/architecture/src/main/java/com/ama/core/architecture/base/BaseActivity.kt
+++ b/core/architecture/src/main/java/com/ama/core/architecture/base/BaseActivity.kt
@@ -1,10 +1,15 @@
 package com.ama.core.architecture.base
 
+import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import com.ama.core.architecture.BaseApp
 
 
 abstract class BaseActivity : AppCompatActivity() {
 
-
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        BaseApp.setCurrentActivity(this)
+    }
 
 }
\ No newline at end of file