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

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

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
 
 
 

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

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

app/src/main/java/com/gamedog/vididin/main/WatchAdDialog.kt

@@ -1,6 +1,7 @@
 package com.gamedog.vididin.main
 
 import android.app.Activity
+import androidx.core.view.isVisible
 import com.ama.core.architecture.util.setOnClickBatch
 import com.ama.core.architecture.widget.BindingDialog
 import com.vididin.real.money.game.databinding.DialogWatchVideoBinding
@@ -34,8 +35,14 @@ class WatchAdDialog(context: Activity, private val mWatchAdType: Int, private va
                 }
             }
 
+            mGoldNum?.let {
                 tvGoldNum.text = "+$mGoldNum"
             }
+            if (mGoldNum == null) {
+                tvGoldNum.isVisible = false
+            }
+
+        }
     }
 
     private fun gotoWatchVideo() {

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<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", {
+        startAdTask(VidiConst.WATCH_AD_FOR_DAILY_SIGN_SINGLE)
-            if (TaskManager.instance().dailySignStatus().executeDailySign(mCurDayIndex, false, true)) {
-                DailySignSuccessDialog(mActivity).initData(mConfigList?.get(mCurDayIndex)?.value, false).show()
-                updateUI(mCurDayIndex)
-            }
-        })
     }
 
     private fun clickedAdDoubleBut() {
-        startAdTask("doubleAd", {
+        startAdTask(VidiConst.WATCH_AD_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)
-            }
-        })
     }
 
     private fun clickedComplementSign() {
         val firstForgotSignDayIndex = TaskManager.instance().dailySignStatus().getForgotSignFirstDayIndex()
         if (firstForgotSignDayIndex > 0) {
-            startAdTask("complementAd", {
+            startAdTask(VidiConst.WATCH_AD_FOR_DAILY_SIGN_COMPLEMENT)
-                if (TaskManager.instance().dailySignStatus().executeDailySign(firstForgotSignDayIndex, false, false)){
-                    DailySignSuccessDialog(mActivity).initData(mConfigList?.get(firstForgotSignDayIndex)?.value, false).show()
-                    updateUI(firstForgotSignDayIndex)
-                }
-            })
         } else {
             updateUI(firstForgotSignDayIndex)
         }
     }
 
 
-    private fun startAdTask(taskUUid: String, completeCallback: ()->Unit) {
+    private fun startAdTask(startType: Int) {
-        // start ad page with uuidKey, register notify of ad done event
+        Router.WatchAd.startActivity(mActivity, startType)
-        completeCallback.invoke()
     }
 
 
@@ -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],

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 {
-
-        }
     }
 
 

app/src/main/res/layout/dialog_watch_video.xml

@@ -72,7 +72,7 @@
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="20dp"
         android:paddingVertical="10dp"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="30dp"
         android:background="@mipmap/icon_action_but_bg">
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_reward_gold_num"