From 2ebaf58f56aa5811d7f87a4e7e074e8dd121316c Mon Sep 17 00:00:00 2001 From: renhaoting <370797079@qq.com> Date: Wed, 10 Dec 2025 17:35:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E5=B9=BF=E5=91=8Aact=20=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gamedog/vididin/VidiConst.kt | 17 ++++++++ .../java/com/gamedog/vididin/VididinEvents.kt | 12 +++--- .../features/benefit/BenefitActivity.kt | 3 +- .../features/watchad/WatchAdActivity.kt | 42 +++++++++++++++++-- .../dialogs/WithdrawInfoConfirmDialog.kt | 6 --- .../withdraw/dialogs/WithdrawWatchAdDialog.kt | 9 ++-- .../vididin/features/zero/ZeroBuyActivity.kt | 3 +- .../gamedog/vididin/login/AccountManager.kt | 4 +- .../com/gamedog/vididin/main/MainActivity.kt | 4 +- .../com/gamedog/vididin/main/WatchAdDialog.kt | 4 +- .../vididin/main/fragments/TasksFragment.kt | 6 +-- .../home/fragment/HomeItemFragment.kt | 2 +- .../gamedog/vididin/manager/TaskManager.kt | 6 +-- .../vididin/router/RouterInterfaces.kt | 2 +- 14 files changed, 85 insertions(+), 35 deletions(-) diff --git a/app/src/main/java/com/gamedog/vididin/VidiConst.kt b/app/src/main/java/com/gamedog/vididin/VidiConst.kt index dd104a5..7662ef2 100644 --- a/app/src/main/java/com/gamedog/vididin/VidiConst.kt +++ b/app/src/main/java/com/gamedog/vididin/VidiConst.kt @@ -3,6 +3,23 @@ package com.gamedog.vididin object VidiConst { + /** + * Varous type for watching Ad + */ + const val WATCH_AD_FOR_WITHDRAW = 1 + const val WATCH_AD_FOR_BOX_TASK = 2 + const val WATCH_AD_FOR_ZERO_EARN_DIAMOND = 3 + const val WATCH_AD_FOR_DAILY_WATCH_AD = 4 + const val WATCH_AD_FOR_DAILY_EARN_GOLD = 5 + const val WATCH_AD_FOR_CONVERT_GOLD_2_CASH = 6 + + + + + + + + const val URL_DISCORD: String = "https://www.baidu.com" const val URL_GAME: String = "https://www.baidu.com" diff --git a/app/src/main/java/com/gamedog/vididin/VididinEvents.kt b/app/src/main/java/com/gamedog/vididin/VididinEvents.kt index d9587ba..ee9f53d 100644 --- a/app/src/main/java/com/gamedog/vididin/VididinEvents.kt +++ b/app/src/main/java/com/gamedog/vididin/VididinEvents.kt @@ -24,14 +24,14 @@ object VididinEvents { - const val Event_AD_TASK_TYPE_Convert_Gold_2_Cash = 800 - 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_WATCHED_FOR_CONVERT_GOLD_2_CASH = 800 + const val EVENT_AD_WATCHED_FOR_EARN_GOLD = 801 + const val EVENT_AD_WATCHED_FOR_DAILY_WATCH_AD = 802 const val Event_AD_TASK_TYPE_Withdraw = 803 const val Event_AD_TASK_TYPE_Complement = 804 - const val Event_AD_TASK_TYPE_BOX_TASK = 805 - const val Event_AD_TASK_EARN_DIAMOND = 806 - const val Event_AD_TASK_WITHDRAW = 807 + const val EVENT_AD_WATCHED_FOR_BOX_TASK = 805 + const val EVENT_AD_WATCHED_FOR_ZEROBUY_EARN_DIAMOND = 806 + const val EVENT_AD_WATCHED_FOR_WITHDRAW = 807 diff --git a/app/src/main/java/com/gamedog/vididin/features/benefit/BenefitActivity.kt b/app/src/main/java/com/gamedog/vididin/features/benefit/BenefitActivity.kt index 048e258..336a296 100644 --- a/app/src/main/java/com/gamedog/vididin/features/benefit/BenefitActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/features/benefit/BenefitActivity.kt @@ -13,6 +13,7 @@ import com.ama.core.architecture.util.AndroidUtil import com.ama.core.architecture.util.ResUtil import com.ama.core.architecture.util.eventbus.NotifyMan import com.ama.core.architecture.util.setOnClickBatch +import com.gamedog.vididin.VidiConst import com.vididin.real.money.game.R import com.gamedog.vididin.VididinEvents import com.gamedog.vididin.core.login.login.AccountManager @@ -116,7 +117,7 @@ class BenefitActivity : AppViewsActivity(), OnT private fun handleActionButClicked(taskType: Int) { when (taskType) { BOX_SUB_TASK_TYPE_AD -> { - Router.WatchAd.startActivity(this@BenefitActivity, VididinEvents.Event_AD_TASK_TYPE_BOX_TASK, null) + Router.WatchAd.startActivity(this@BenefitActivity, VidiConst.WATCH_AD_FOR_BOX_TASK) } BOX_SUB_TASK_TYPE_SIGN -> { 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 d9deda4..99e71e8 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 @@ -14,7 +14,6 @@ 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 @@ -59,9 +58,11 @@ class WatchAdActivity : AppViewsActivity(), OnT private fun notifyAdWatchFinish() { - NotifyMan.instance().sendEvent(mTaskType, null) + NotifyMan.instance().sendEvent(getNotifyEventType(mTaskType), + if (mTaskData.isNullOrEmpty()) null else AndroidUtil.json2Object>(mTaskData!!)) - if (mTaskType != VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_Earn_Gold) { + if (mTaskType != VidiConst.WATCH_AD_FOR_DAILY_EARN_GOLD + && mTaskType != VidiConst.WATCH_AD_FOR_ZERO_EARN_DIAMOND) { NotifyMan.instance().sendEvent(VididinEvents.Event_Finish_One_Ad, NotifyMan.NotifyData(1)) } } @@ -87,6 +88,41 @@ class WatchAdActivity : AppViewsActivity(), OnT mTaskData = intent.getStringExtra(KEY_TASK_DATA) } + private fun getNotifyEventType(taskType: Int) : Int { + when (taskType) { + VidiConst.WATCH_AD_FOR_WITHDRAW -> { + return VididinEvents.EVENT_AD_WATCHED_FOR_WITHDRAW + } + + VidiConst.WATCH_AD_FOR_BOX_TASK -> { + return VididinEvents.EVENT_AD_WATCHED_FOR_BOX_TASK + } + + VidiConst.WATCH_AD_FOR_ZERO_EARN_DIAMOND -> { + return VididinEvents.EVENT_AD_WATCHED_FOR_ZEROBUY_EARN_DIAMOND + } + + VidiConst.WATCH_AD_FOR_DAILY_WATCH_AD -> { + return VididinEvents.EVENT_AD_WATCHED_FOR_DAILY_WATCH_AD + } + + VidiConst.WATCH_AD_FOR_DAILY_EARN_GOLD -> { + return VididinEvents.EVENT_AD_WATCHED_FOR_EARN_GOLD + } + + VidiConst.WATCH_AD_FOR_CONVERT_GOLD_2_CASH -> { + return VididinEvents.EVENT_AD_WATCHED_FOR_CONVERT_GOLD_2_CASH + } + + + + + + + + } + return 0 + } override fun onDestroy() { super.onDestroy() diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/dialogs/WithdrawInfoConfirmDialog.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/dialogs/WithdrawInfoConfirmDialog.kt index bbd2971..22c653c 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdraw/dialogs/WithdrawInfoConfirmDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/dialogs/WithdrawInfoConfirmDialog.kt @@ -9,7 +9,6 @@ import com.ama.core.architecture.widget.BindingDialog import com.vididin.real.money.game.R import com.gamedog.vididin.core.login.login.AccountManager import com.vididin.real.money.game.databinding.DialogWithdrawInfoConfirmBinding as ViewBinding -import com.gamedog.vididin.router.Router class WithdrawInfoConfirmDialog(context: Activity, ) : BindingDialog(context, ViewBinding::inflate) { @@ -55,11 +54,6 @@ class WithdrawInfoConfirmDialog(context: Activity, ) : BindingDialog(mWithdrawCashNum) + Router.WatchAd.startActivity(mActivity, VidiConst.WATCH_AD_FOR_WITHDRAW, AndroidUtil.object2Json(extraData)) } diff --git a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt index 37f5f0d..b59fad5 100644 --- a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt @@ -13,6 +13,7 @@ import com.ama.core.architecture.util.AndroidUtil import com.ama.core.architecture.util.CommonItemDecoration import com.ama.core.architecture.util.SpUtil import com.ama.core.architecture.util.setOnClickBatch +import com.gamedog.vididin.VidiConst import com.gamedog.vididin.VididinEvents import com.vididin.real.money.game.R import com.gamedog.vididin.beans.ZeroBuyItem @@ -114,7 +115,7 @@ class ZeroBuyActivity : AppViewsEmptyViewModelActivity() { } private fun gotoEarnDiamond() { - Router.WatchAd.startActivity(this, VididinEvents.Event_AD_TASK_EARN_DIAMOND, null) + Router.WatchAd.startActivity(this, VidiConst.WATCH_AD_FOR_ZERO_EARN_DIAMOND) } //----------------------- start ----------------------------- diff --git a/app/src/main/java/com/gamedog/vididin/login/AccountManager.kt b/app/src/main/java/com/gamedog/vididin/login/AccountManager.kt index c878caf..0a051e3 100644 --- a/app/src/main/java/com/gamedog/vididin/login/AccountManager.kt +++ b/app/src/main/java/com/gamedog/vididin/login/AccountManager.kt @@ -20,13 +20,13 @@ object AccountManager { NotifyMan.instance().register(object: NotifyMan.ICallback(true) { override fun onEvent(data: NotifyMan.NotifyData<*>?) { when (data?.mEventType) { - VididinEvents.Event_AD_TASK_EARN_DIAMOND -> { + VididinEvents.EVENT_AD_WATCHED_FOR_ZEROBUY_EARN_DIAMOND -> { addDiamond(VidiConst.DIAMOND_NUM_FOR_ONE_AD) } } } - }, VididinEvents.Event_AD_TASK_EARN_DIAMOND) + }, VididinEvents.EVENT_AD_WATCHED_FOR_ZEROBUY_EARN_DIAMOND) } private val mAccount: Account? by lazy { 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 2e03737..7cd2f97 100644 --- a/app/src/main/java/com/gamedog/vididin/main/MainActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/main/MainActivity.kt @@ -114,7 +114,7 @@ class MainActivity : AppViewsActivity(), OnTabS registerEvents( { data-> when (data?.mEventType) { - VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_Earn_Gold-> { + VididinEvents.EVENT_AD_WATCHED_FOR_EARN_GOLD-> { DailySignSuccessDialog(this@MainActivity).initData(VidiConst.WATCH_AD_REWARD_GOLD.toInt(), false).show() } @@ -123,7 +123,7 @@ class MainActivity : AppViewsActivity(), OnTabS } } - }, VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_Earn_Gold, VididinEvents.EVENT_JUMP_2_VIDEO) + }, VididinEvents.EVENT_AD_WATCHED_FOR_EARN_GOLD, VididinEvents.EVENT_JUMP_2_VIDEO) } 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 bd84df2..850b47c 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,7 @@ import com.vididin.real.money.game.databinding.DialogWatchVideoBinding import com.gamedog.vididin.router.Router -class WatchAdDialog(context: Activity, private val mTaskType: Int, private val mGoldNum: Int? = 0, +class WatchAdDialog(context: Activity, private val mWatchAdType: Int, private val mGoldNum: Int? = 0, private val mTaskDataJson: String? = "") : BindingDialog(context, DialogWatchVideoBinding::inflate) { @@ -39,7 +39,7 @@ class WatchAdDialog(context: Activity, private val mTaskType: Int, private val m } private fun gotoWatchVideo() { - Router.WatchAd.startActivity(mActivity, mTaskType, mTaskDataJson) + Router.WatchAd.startActivity(mActivity, mWatchAdType, mTaskDataJson) dismiss() } 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 8084de0..a51ed98 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 @@ -84,7 +84,7 @@ class TasksFragment : AppViewsFragment(), OnTab } llTaskWatchAd->{ - WatchAdDialog(requireActivity(), VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_Earn_Gold, 200).show() + WatchAdDialog(requireActivity(), VidiConst.WATCH_AD_FOR_DAILY_EARN_GOLD, 200).show() } llTaskGame->{ @@ -96,7 +96,7 @@ class TasksFragment : AppViewsFragment(), OnTab } tvWatchVideoForConvertGoldToCash->{ - WatchAdDialog(requireActivity(), VididinEvents.Event_AD_TASK_TYPE_Convert_Gold_2_Cash, null).show() + WatchAdDialog(requireActivity(), VidiConst.WATCH_AD_FOR_CONVERT_GOLD_2_CASH, null).show() } tvWithdraw->{ @@ -410,7 +410,7 @@ class TasksFragment : AppViewsFragment(), OnTab val subTaskState = subTaskList[itemIndex] when (subTaskState.state) { STATE_ONGOING -> { - WatchAdDialog(requireActivity(), VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_Daily, null).show() + WatchAdDialog(requireActivity(), VidiConst.WATCH_AD_FOR_DAILY_WATCH_AD, null).show() } STATE_FINISH -> { if (TaskManager.instance().dailyWatchAdStatus().claimSubTaskReward(itemIndex)) { 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 4017af4..1b085c1 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 @@ -68,7 +68,7 @@ class HomeItemFragment : AppViewsEmptyViewModelFragment() { Router.Benefit.startActivity(requireActivity()) }, PopMenuIconView.MenuItem(R.mipmap.home_menu_2) { - WatchAdDialog(requireActivity(), VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_Earn_Gold, null).show() + WatchAdDialog(requireActivity(), VidiConst.WATCH_AD_FOR_DAILY_EARN_GOLD, null).show() }, PopMenuIconView.MenuItem(R.mipmap.home_menu_3) { AndroidUtil.openUrl(VidiConst.URL_GAME) 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 57558ac..77cb03a 100644 --- a/app/src/main/java/com/gamedog/vididin/manager/TaskManager.kt +++ b/app/src/main/java/com/gamedog/vididin/manager/TaskManager.kt @@ -104,16 +104,16 @@ class TaskManager private constructor() { NotifyMan.instance().register(object : NotifyMan.ICallback(true) { override fun onEvent(data: NotifyMan.NotifyData<*>?) { when (data?.mEventType) { - VididinEvents.Event_AD_TASK_TYPE_Convert_Gold_2_Cash -> { + VididinEvents.EVENT_AD_WATCHED_FOR_CONVERT_GOLD_2_CASH -> { AccountManager.convertGold2Cash() } - VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_Earn_Gold -> { + VididinEvents.EVENT_AD_WATCHED_FOR_EARN_GOLD -> { AccountManager.addGold(VidiConst.WATCH_AD_REWARD_GOLD) } } } - }, VididinEvents.Event_AD_TASK_TYPE_Convert_Gold_2_Cash, VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_Earn_Gold) + }, VididinEvents.EVENT_AD_WATCHED_FOR_CONVERT_GOLD_2_CASH, VididinEvents.EVENT_AD_WATCHED_FOR_EARN_GOLD) } diff --git a/app/src/main/java/com/gamedog/vididin/router/RouterInterfaces.kt b/app/src/main/java/com/gamedog/vididin/router/RouterInterfaces.kt index d456d97..490eaec 100644 --- a/app/src/main/java/com/gamedog/vididin/router/RouterInterfaces.kt +++ b/app/src/main/java/com/gamedog/vididin/router/RouterInterfaces.kt @@ -24,7 +24,7 @@ interface IRouterSplash { } interface IRouterWatchAd { - fun startActivity(activity: Activity, taskType: Int, taskDataJson: String?) + fun startActivity(activity: Activity, taskType: Int, taskDataJson: String? = null) }