diff --git a/app/src/main/java/com/gamedog/vididin/Constants.kt b/app/src/main/java/com/gamedog/vididin/Constants.kt index 9f5545a..e1102e7 100644 --- a/app/src/main/java/com/gamedog/vididin/Constants.kt +++ b/app/src/main/java/com/gamedog/vididin/Constants.kt @@ -23,6 +23,7 @@ object VidiConst { const val GOLD_IN_CONFIG: String = "金币" const val PER_CASH_COST_GOLD_NUM = 1000 + const val WATCH_AD_REWARD_GOLD = 200 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 c130c1d..21759eb 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 @@ -12,7 +12,9 @@ import androidx.core.view.updatePadding import com.ama.core.architecture.appBase.AppViewsActivity import com.ama.core.architecture.util.AndroidUtil import com.ama.core.architecture.util.eventbus.NotifyMan +import com.gamedog.vididin.VidiConst import com.gamedog.vididin.VididinEvents +import com.gamedog.vididin.main.fragments.task.DailySignSuccessDialog import com.gamedog.vididin.main.interfaces.OnTabStyleListener import dagger.hilt.android.AndroidEntryPoint import kotlin.getValue 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 298d8c4..9dbd1f0 100644 --- a/app/src/main/java/com/gamedog/vididin/main/MainActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/main/MainActivity.kt @@ -17,12 +17,17 @@ import com.ama.core.architecture.appBase.AppViewsActivity import com.ama.core.architecture.appBase.OnFragmentBackgroundListener import com.ama.core.architecture.ext.toast import com.ama.core.architecture.util.bindViewPager2 +import com.ama.core.architecture.util.eventbus.NotifyMan import com.ama.core.architecture.util.setCommonNavigator import com.ama.core.architecture.util.setDataOrAdapter import com.gamedog.vididin.R +import com.gamedog.vididin.VidiConst +import com.gamedog.vididin.VididinEvents import com.gamedog.vididin.adapter.MainTabsAdapter import com.gamedog.vididin.adapter.MainViewPagerAdapter +import com.gamedog.vididin.core.login.login.AccountManager import com.gamedog.vididin.features.watchad.WatchAdActivity +import com.gamedog.vididin.main.fragments.task.DailySignSuccessDialog import com.gamedog.vididin.main.interfaces.OnTabStyleListener import dagger.hilt.android.AndroidEntryPoint import kotlin.getValue @@ -57,6 +62,7 @@ class MainActivity : AppViewsActivity(), OnTabS } } + override fun ViewBinding.initViews() { content.foreground.alpha = 0 navigatorAdapter = MainTabsAdapter( @@ -100,6 +106,15 @@ class MainActivity : AppViewsActivity(), OnTabS onTabIsDarkFont(isBackgroundBright) } }, false) + + registerEvents( { data-> + when (data?.mEventType) { + VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_Earn_Gold-> { + DailySignSuccessDialog(this@MainActivity).initData(VidiConst.WATCH_AD_REWARD_GOLD.toInt(), false).show() + } + } + + }, VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_Earn_Gold) } override fun ViewBinding.initObservers() { diff --git a/app/src/main/java/com/gamedog/vididin/main/WatchAdDialog.kt b/app/src/main/java/com/gamedog/vididin/main/WatchAdDialog.kt index a63dcf9..1115ff9 100644 --- a/app/src/main/java/com/gamedog/vididin/main/WatchAdDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/main/WatchAdDialog.kt @@ -7,7 +7,9 @@ import com.gamedog.vididin.databinding.DialogWatchVideoBinding import com.gamedog.vididin.router.Router -class WatchAdDialog(context: Activity, private val mTaskType: Int, private val mTaskDataJson: String?) : BindingDialog(context, DialogWatchVideoBinding::inflate) { +class WatchAdDialog(context: Activity, private val mTaskType: Int, + private val mTaskDataJson: String?) + : BindingDialog(context, DialogWatchVideoBinding::inflate) { init { build() diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignSuccessDialog.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignSuccessDialog.kt index 6289b90..a6e1a91 100644 --- a/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignSuccessDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignSuccessDialog.kt @@ -1,14 +1,13 @@ package com.gamedog.vididin.main.fragments.task import android.app.Activity -import android.content.Context import androidx.core.view.isVisible import com.ama.core.architecture.util.setOnClickBatch import com.ama.core.architecture.widget.BindingDialog import com.gamedog.vididin.databinding.DialogDailySignSuccessBinding as ViewBinding -class DailySignSuccessDialog(context: Activity) : BindingDialog(context, ViewBinding::inflate) { +class DailySignSuccessDialog(activity: Activity) : BindingDialog(activity, ViewBinding::inflate) { init { build() 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 f5a03ee..ac8e7e8 100644 --- a/app/src/main/java/com/gamedog/vididin/manager/TaskManager.kt +++ b/app/src/main/java/com/gamedog/vididin/manager/TaskManager.kt @@ -3,6 +3,7 @@ package com.gamedog.vididin.manager import com.ama.core.architecture.util.FileUtil import com.ama.core.architecture.util.eventbus.NotifyMan +import com.gamedog.vididin.VidiConst import com.gamedog.vididin.VididinEvents import com.gamedog.vididin.core.login.login.AccountManager import com.gamedog.vididin.main.fragments.task.Task @@ -84,7 +85,7 @@ class TaskManager private constructor() { } VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_Earn_Gold -> { - // TODO - add gold for user + AccountManager.addGold(VidiConst.WATCH_AD_REWARD_GOLD) } } } diff --git a/app/src/main/java/com/gamedog/vididin/manager/helpers/DailyWatchVideoTaskHelper.kt b/app/src/main/java/com/gamedog/vididin/manager/helpers/DailyWatchVideoTaskHelper.kt index ea0a20d..ce0d46d 100644 --- a/app/src/main/java/com/gamedog/vididin/manager/helpers/DailyWatchVideoTaskHelper.kt +++ b/app/src/main/java/com/gamedog/vididin/manager/helpers/DailyWatchVideoTaskHelper.kt @@ -28,15 +28,6 @@ class DailyWatchVideoTaskHelper : BaseDailyTaskHelper() { mStateBean = spStateBean notifyEvents() } - - /*val spStateBean = SpUtil.instance().getObject(mSpKey) - if (spStateBean == null || !isTodayStatusBean(spStateBean)) { - generateTodayTask() - saveState2Sp() - } else { - mStateBean = spStateBean - notifyEvents() - }*/ } override fun notifyEvents() { diff --git a/core/architecture/src/main/java/com/ama/core/architecture/util/eventbus/NotifyMan.java b/core/architecture/src/main/java/com/ama/core/architecture/util/eventbus/NotifyMan.java index 18c2f88..40181d5 100644 --- a/core/architecture/src/main/java/com/ama/core/architecture/util/eventbus/NotifyMan.java +++ b/core/architecture/src/main/java/com/ama/core/architecture/util/eventbus/NotifyMan.java @@ -100,6 +100,10 @@ public class NotifyMan { } public void unregister(ICallback listener) { + if (listener == null) { + return; + } + TPoolAssis.instance().runBg(new Runnable() { @Override public void run() {