From da56a8cb425ccb54e7232eb90571a1a0ccac09d3 Mon Sep 17 00:00:00 2001 From: renhaoting <370797079@qq.com> Date: Mon, 1 Dec 2025 18:56:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B9=BF=E5=91=8A=E9=A1=B5?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gamedog/vididin/VididinEvents.kt | 5 +++++ .../features/watchad/WatchAdActivity.kt | 20 +++++++++---------- .../gamedog/vididin/main/WatchVideoDialog.kt | 11 ++-------- .../vididin/main/fragments/TasksFragment.kt | 8 ++++---- .../home/fragment/HomeItemFragment.kt | 3 ++- .../gamedog/vididin/router/RouterDefault.kt | 4 ++-- .../vididin/router/RouterInterfaces.kt | 2 +- ...inapp_feature_message_fragment_message.xml | 6 +++--- 8 files changed, 29 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/com/gamedog/vididin/VididinEvents.kt b/app/src/main/java/com/gamedog/vididin/VididinEvents.kt index b93c4f8..71edb4a 100644 --- a/app/src/main/java/com/gamedog/vididin/VididinEvents.kt +++ b/app/src/main/java/com/gamedog/vididin/VididinEvents.kt @@ -14,4 +14,9 @@ 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_Withdraw = 802 + const val Event_AD_TASK_TYPE_Complement = 803 + } \ No newline at end of file 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 2b1922f..8efedfa 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 @@ -2,9 +2,7 @@ package com.gamedog.vididin.features.watchad import android.app.Activity import android.content.Intent -import android.os.Bundle import android.os.CountDownTimer -import android.os.PersistableBundle import android.view.LayoutInflater import androidx.activity.addCallback import androidx.activity.viewModels @@ -12,10 +10,8 @@ import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import androidx.core.view.updatePadding import com.ama.core.architecture.appBase.AppViewsActivity -import com.ama.core.architecture.ext.toast import com.ama.core.architecture.util.AndroidUtil import com.ama.core.architecture.util.eventbus.NotifyMan -import com.gamedog.vididin.R import com.gamedog.vididin.main.interfaces.OnTabStyleListener import dagger.hilt.android.AndroidEntryPoint import kotlin.getValue @@ -32,7 +28,8 @@ class WatchAdActivity : AppViewsActivity(), OnT private lateinit var mCountDownTimer: CountDownTimer - private var mTaskUUID: Int = 0 + private var mTaskType: Int = 0 + private var mTaskData: String? = null override fun ViewBinding.initViews() { with(binding) { @@ -59,7 +56,7 @@ class WatchAdActivity : AppViewsActivity(), OnT private fun notifyAdWatchFinish() { - NotifyMan.instance().sendEvent(mTaskUUID, null) + NotifyMan.instance().sendEvent(mTaskType, null) } private fun stateCounter() { @@ -79,7 +76,8 @@ class WatchAdActivity : AppViewsActivity(), OnT override fun readIntent(intent: Intent) { super.readIntent(intent) - mTaskUUID = intent.getIntExtra(KEY_TASKID, 0) + mTaskType = intent.getIntExtra(KEY_TASK_TYPE, 0) + mTaskData = intent.getStringExtra(KEY_TASK_DATA) } @@ -102,11 +100,13 @@ class WatchAdActivity : AppViewsActivity(), OnT companion object { - private val KEY_TASKID = "KEY_TASKID" + private val KEY_TASK_TYPE = "KEY_TASK_TYPE" + private val KEY_TASK_DATA = "KEY_TASK_DATA" - internal fun startActivity(activity: Activity, taskUUID: Int) { + internal fun startActivity(activity: Activity, taskType: Int, taskDataJson: String?) { val intent = Intent(activity.applicationContext, WatchAdActivity::class.java) - intent.putExtra(KEY_TASKID, taskUUID) + intent.putExtra(KEY_TASK_TYPE, taskType) + intent.putExtra(KEY_TASK_DATA, taskDataJson) activity.startActivity(intent) } } diff --git a/app/src/main/java/com/gamedog/vididin/main/WatchVideoDialog.kt b/app/src/main/java/com/gamedog/vididin/main/WatchVideoDialog.kt index 5225550..75d188b 100644 --- a/app/src/main/java/com/gamedog/vididin/main/WatchVideoDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/main/WatchVideoDialog.kt @@ -1,14 +1,13 @@ package com.gamedog.vididin.main import android.app.Activity -import com.ama.core.architecture.util.AndroidUtil import com.ama.core.architecture.util.setOnClickBatch import com.ama.core.architecture.widget.BindingDialog import com.gamedog.vididin.databinding.DialogWatchVideoBinding import com.gamedog.vididin.router.Router -class WatchVideoDialog(context: Activity) : BindingDialog(context, DialogWatchVideoBinding::inflate) { +class WatchVideoDialog(context: Activity, private val mTaskType: Int, private val mTaskDataJson: String?) : BindingDialog(context, DialogWatchVideoBinding::inflate) { init { build() @@ -36,13 +35,7 @@ class WatchVideoDialog(context: Activity) : BindingDialog(), OnTab override fun ViewBinding.initViews() { with(binding) { setOnClickBatch(ivGotoDailySign, llTaskBenefit, llTaskWatchVideo, llTaskGame, - llTaskZerobuy, tvWatchVideo, tvWithdraw) { + llTaskZerobuy, tvWatchVideoForConvertGoldToCash, tvWithdraw) { when(this) { ivGotoDailySign->{ DailySignDialog(requireActivity()).show() @@ -78,7 +78,7 @@ class TasksFragment : AppViewsFragment(), OnTab } llTaskWatchVideo->{ - WatchVideoDialog(requireActivity()).show() + WatchVideoDialog(requireActivity(), VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_For_Gold, null).show() } llTaskGame->{ @@ -89,8 +89,8 @@ class TasksFragment : AppViewsFragment(), OnTab Router.ZeroBuy.startActivity(requireActivity()) } - tvWatchVideo->{ - WatchVideoDialog(requireActivity()).show() + tvWatchVideoForConvertGoldToCash->{ + WatchVideoDialog(requireActivity(), VididinEvents.Event_AD_TASK_TYPE_Convert_Gold_2_Cash, null).show() } tvWithdraw->{ 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 d2c2a8b..91e60b6 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 @@ -14,6 +14,7 @@ import androidx.core.view.isVisible import com.ama.core.architecture.appBase.AppViewsEmptyViewModelFragment import com.ama.core.common.widget.PopMenuIconView import com.gamedog.vididin.R +import com.gamedog.vididin.VididinEvents import com.gamedog.vididin.beans.YoutubeVideo import com.gamedog.vididin.main.WatchVideoDialog import com.gamedog.vididin.router.Router @@ -62,7 +63,7 @@ class HomeItemFragment : AppViewsEmptyViewModelFragment() { Router.Benefit.startActivity(requireActivity()) }, PopMenuIconView.MenuItem(R.mipmap.home_menu_2) { - WatchVideoDialog(requireActivity()).show() + WatchVideoDialog(requireActivity(), VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_For_Gold, null).show() }, PopMenuIconView.MenuItem(R.mipmap.home_menu_3) { diff --git a/app/src/main/java/com/gamedog/vididin/router/RouterDefault.kt b/app/src/main/java/com/gamedog/vididin/router/RouterDefault.kt index a9a6514..90a12d0 100644 --- a/app/src/main/java/com/gamedog/vididin/router/RouterDefault.kt +++ b/app/src/main/java/com/gamedog/vididin/router/RouterDefault.kt @@ -41,7 +41,7 @@ class DefaultVersionRouter: IRouterVersion { class DefaultWatchAdRouter: IRouterWatchAd { - override fun startActivity(activity: Activity, taskUUID: Int) { - WatchAdActivity.Companion.startActivity(activity, taskUUID) + override fun startActivity(activity: Activity, taskType: Int, taskDataJson: String?) { + WatchAdActivity.Companion.startActivity(activity, taskType, taskDataJson) } } 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 2ed5cd9..d456d97 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, taskUUID: Int) + fun startActivity(activity: Activity, taskType: Int, taskDataJson: String?) } diff --git a/app/src/main/res/layout/vididinapp_feature_message_fragment_message.xml b/app/src/main/res/layout/vididinapp_feature_message_fragment_message.xml index fcae1dd..9f1fdaf 100644 --- a/app/src/main/res/layout/vididinapp_feature_message_fragment_message.xml +++ b/app/src/main/res/layout/vididinapp_feature_message_fragment_message.xml @@ -79,8 +79,8 @@