renhaoting
/
VidiDin-Android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复-签到界面直接点击领取双倍的按钮时，现在没有弹去看广告，是直接获得金币的

This commit is contained in:
renhaoting 2025-12-22 18:39:52 +08:00
parent f0cad1497f
commit 0a635e3b32
5 changed files with 75 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/gamedog/vididin/VidiConst.kt
View File

@ -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
/**

3
app/src/main/java/com/gamedog/vididin/VididinEvents.kt
View File

@ -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

15
app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt
View File

@ -88,6 +88,21 @@ class WatchAdActivity : AppViewsEmptyViewModelActivity<ViewBinding>(), 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

75
app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignDialog.kt
View File

@ -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<DialogDailySignBinding>
}
}
}
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<DialogDailySignBinding>
}
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<DialogDailySignBinding>
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],

3
app/src/main/java/com/gamedog/vididin/widget/DailySignItemView.kt
View File

@ -28,9 +28,6 @@ class DailySignItemView @JvmOverloads constructor(
init {
mBinding = DailySignItemBinding.inflate(LayoutInflater.from(context), this, true)
mBinding.run {
}
}