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(), 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