From 0a635e3b32463f38ceadcab63a47556840e74a9e Mon Sep 17 00:00:00 2001 From: renhaoting <370797079@qq.com> Date: Mon, 22 Dec 2025 18:39:52 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D-=E7=AD=BE=E5=88=B0?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9B=B4=E6=8E=A5=E7=82=B9=E5=87=BB=E9=A2=86?= =?UTF-8?q?=E5=8F=96=E5=8F=8C=E5=80=8D=E7=9A=84=E6=8C=89=E9=92=AE=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E7=8E=B0=E5=9C=A8=E6=B2=A1=E6=9C=89=E5=BC=B9=E5=8E=BB?= =?UTF-8?q?=E7=9C=8B=E5=B9=BF=E5=91=8A=EF=BC=8C=E6=98=AF=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E8=8E=B7=E5=BE=97=E9=87=91=E5=B8=81=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gamedog/vididin/VidiConst.kt | 5 ++ .../java/com/gamedog/vididin/VididinEvents.kt | 3 + .../features/watchad/WatchAdActivity.kt | 15 ++++ .../main/fragments/task/DailySignDialog.kt | 75 +++++++++++++------ .../vididin/widget/DailySignItemView.kt | 3 - 5 files changed, 75 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/com/gamedog/vididin/VidiConst.kt b/app/src/main/java/com/gamedog/vididin/VidiConst.kt index 88385cd..6449e6c 100644 --- a/app/src/main/java/com/gamedog/vididin/VidiConst.kt +++ b/app/src/main/java/com/gamedog/vididin/VidiConst.kt @@ -14,6 +14,11 @@ object VidiConst { const val WATCH_AD_FOR_DAILY_WATCH_AD = 5 const val WATCH_AD_FOR_DAILY_EARN_GOLD = 6 const val WATCH_AD_FOR_CONVERT_GOLD_2_CASH = 7 + const val WATCH_AD_FOR_DAILY_SIGN_SINGLE = 8 + const val WATCH_AD_FOR_DAILY_SIGN_DOUBLE = 9 + const val WATCH_AD_FOR_DAILY_SIGN_COMPLEMENT = 10 + + /** diff --git a/app/src/main/java/com/gamedog/vididin/VididinEvents.kt b/app/src/main/java/com/gamedog/vididin/VididinEvents.kt index a233a3d..9797d94 100644 --- a/app/src/main/java/com/gamedog/vididin/VididinEvents.kt +++ b/app/src/main/java/com/gamedog/vididin/VididinEvents.kt @@ -33,6 +33,9 @@ object VididinEvents { const val EVENT_AD_WATCHED_FOR_ZEROBUY_EARN_DIAMOND = 806 const val EVENT_AD_WATCHED_FOR_WITHDRAW_SMALL = 807 const val EVENT_AD_WATCHED_FOR_WITHDRAW_BIG = 808 + const val EVENT_AD_WATCHED_FOR_DAILY_SIGN_SINGLE = 809 + const val EVENT_AD_WATCHED_FOR_DAILY_SIGN_DOUBLE = 810 + const val EVENT_AD_WATCHED_FOR_DAILY_SIGN_COMPLEMENT = 811 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 731de76..3513d56 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 @@ -88,6 +88,21 @@ class WatchAdActivity : AppViewsEmptyViewModelActivity(), OnTabStyl notifyData.mData = WatchAdNotifyBean(mRewardedDollarNum, extraData) } + VidiConst.WATCH_AD_FOR_DAILY_SIGN_SINGLE -> { + shouldNotifyOneAdWatched = true + notifyEventType = VididinEvents.EVENT_AD_WATCHED_FOR_DAILY_SIGN_SINGLE + } + + VidiConst.WATCH_AD_FOR_DAILY_SIGN_DOUBLE-> { + shouldNotifyOneAdWatched = true + notifyEventType = VididinEvents.EVENT_AD_WATCHED_FOR_DAILY_SIGN_DOUBLE + } + + VidiConst.WATCH_AD_FOR_DAILY_SIGN_COMPLEMENT -> { + shouldNotifyOneAdWatched = true + notifyEventType = VididinEvents.EVENT_AD_WATCHED_FOR_DAILY_SIGN_COMPLEMENT + } + VidiConst.WATCH_AD_FOR_BOX_TASK -> { shouldNotifyOneAdWatched = true notifyEventType = VididinEvents.EVENT_AD_WATCHED_FOR_BOX_TASK diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignDialog.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignDialog.kt index 10e4408..99d9153 100644 --- a/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignDialog.kt @@ -1,11 +1,15 @@ package com.gamedog.vididin.main.fragments.task import android.app.Activity +import android.view.View import androidx.core.view.isVisible import com.ama.core.architecture.util.setOnClickBatch import com.ama.core.architecture.widget.BindingDialog +import com.gamedog.vididin.VidiConst +import com.gamedog.vididin.VididinEvents import com.vididin.real.money.game.databinding.DialogDailySignBinding import com.gamedog.vididin.manager.TaskManager +import com.gamedog.vididin.router.Router import com.gamedog.vididin.widget.DailySignItemView @@ -53,6 +57,38 @@ class DailySignDialog(context: Activity) : BindingDialog } } } + + + + registerEvents({ data-> + when (data?.mEventType) { + VididinEvents.EVENT_AD_WATCHED_FOR_DAILY_SIGN_SINGLE -> { + if (TaskManager.instance().dailySignStatus().executeDailySign(mCurDayIndex, false, true)) { + DailySignSuccessDialog(mActivity).initData(mConfigList?.get(mCurDayIndex)?.value, false).show() + updateUI(mCurDayIndex) + } + } + + VididinEvents.EVENT_AD_WATCHED_FOR_DAILY_SIGN_DOUBLE -> { + if (TaskManager.instance().dailySignStatus().executeDailySign(mCurDayIndex, true, true)) { + DailySignSuccessDialog(mActivity).initData((mConfigList?.get(mCurDayIndex)?.value)?.times( + 2 + ), false).show() + updateUI(mCurDayIndex) + } + } + + VididinEvents.EVENT_AD_WATCHED_FOR_DAILY_SIGN_COMPLEMENT -> { + val firstForgotSignDayIndex = TaskManager.instance().dailySignStatus().getForgotSignFirstDayIndex() + if (TaskManager.instance().dailySignStatus().executeDailySign(firstForgotSignDayIndex, false, false)){ + DailySignSuccessDialog(mActivity).initData(mConfigList?.get(firstForgotSignDayIndex)?.value, false).show() + updateUI(firstForgotSignDayIndex) + } + } + } + }, VididinEvents.EVENT_AD_WATCHED_FOR_DAILY_SIGN_SINGLE, + VididinEvents.EVENT_AD_WATCHED_FOR_DAILY_SIGN_DOUBLE, + VididinEvents.EVENT_AD_WATCHED_FOR_DAILY_SIGN_COMPLEMENT) } private fun clickedNormalSign() { @@ -63,43 +99,25 @@ class DailySignDialog(context: Activity) : BindingDialog } private fun clickedAdSingleBut() { - startAdTask("signalAd", { - if (TaskManager.instance().dailySignStatus().executeDailySign(mCurDayIndex, false, true)) { - DailySignSuccessDialog(mActivity).initData(mConfigList?.get(mCurDayIndex)?.value, false).show() - updateUI(mCurDayIndex) - } - }) + startAdTask(VidiConst.WATCH_AD_FOR_DAILY_SIGN_SINGLE) } private fun clickedAdDoubleBut() { - startAdTask("doubleAd", { - if (TaskManager.instance().dailySignStatus().executeDailySign(mCurDayIndex, true, true)) { - DailySignSuccessDialog(mActivity).initData((mConfigList?.get(mCurDayIndex)?.value)?.times( - 2 - ), false).show() - updateUI(mCurDayIndex) - } - }) + startAdTask(VidiConst.WATCH_AD_FOR_DAILY_SIGN_DOUBLE) } private fun clickedComplementSign() { val firstForgotSignDayIndex = TaskManager.instance().dailySignStatus().getForgotSignFirstDayIndex() if (firstForgotSignDayIndex > 0) { - startAdTask("complementAd", { - if (TaskManager.instance().dailySignStatus().executeDailySign(firstForgotSignDayIndex, false, false)){ - DailySignSuccessDialog(mActivity).initData(mConfigList?.get(firstForgotSignDayIndex)?.value, false).show() - updateUI(firstForgotSignDayIndex) - } - }) + startAdTask(VidiConst.WATCH_AD_FOR_DAILY_SIGN_COMPLEMENT) } else { updateUI(firstForgotSignDayIndex) } } - private fun startAdTask(taskUUid: String, completeCallback: ()->Unit) { - // start ad page with uuidKey, register notify of ad done event - completeCallback.invoke() + private fun startAdTask(startType: Int) { + Router.WatchAd.startActivity(mActivity, startType) } @@ -117,6 +135,17 @@ class DailySignDialog(context: Activity) : BindingDialog mSignItemViewList.add(signItem6) mSignItemViewList.add(signItem7) + + mSignItemViewList[mCurDayIndex].setOnClickListener { + fun onClick(v: View?) { + val curDayView = mSignItemViewList[mCurDayIndex] + val curDayStateBean = curDayView.getStateBean() + if (!curDayStateBean.hasSigned) { + clickedNormalSign() + } + } + } + mConfigList?.let { mSignItemViewList.forEachIndexed { index, itemView-> itemView.setData(mConfigList!![index], diff --git a/app/src/main/java/com/gamedog/vididin/widget/DailySignItemView.kt b/app/src/main/java/com/gamedog/vididin/widget/DailySignItemView.kt index 93f72e6..edeb6e6 100644 --- a/app/src/main/java/com/gamedog/vididin/widget/DailySignItemView.kt +++ b/app/src/main/java/com/gamedog/vididin/widget/DailySignItemView.kt @@ -28,9 +28,6 @@ class DailySignItemView @JvmOverloads constructor( init { mBinding = DailySignItemBinding.inflate(LayoutInflater.from(context), this, true) - mBinding.run { - - } }