调整广告页参数
This commit is contained in:
parent
97f9a39e95
commit
da56a8cb42
|
|
@ -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
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -2,9 +2,7 @@ package com.gamedog.vididin.features.watchad
|
||||||
|
|
||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.os.Bundle
|
|
||||||
import android.os.CountDownTimer
|
import android.os.CountDownTimer
|
||||||
import android.os.PersistableBundle
|
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import androidx.activity.addCallback
|
import androidx.activity.addCallback
|
||||||
import androidx.activity.viewModels
|
import androidx.activity.viewModels
|
||||||
|
|
@ -12,10 +10,8 @@ import androidx.core.view.ViewCompat
|
||||||
import androidx.core.view.WindowInsetsCompat
|
import androidx.core.view.WindowInsetsCompat
|
||||||
import androidx.core.view.updatePadding
|
import androidx.core.view.updatePadding
|
||||||
import com.ama.core.architecture.appBase.AppViewsActivity
|
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.AndroidUtil
|
||||||
import com.ama.core.architecture.util.eventbus.NotifyMan
|
import com.ama.core.architecture.util.eventbus.NotifyMan
|
||||||
import com.gamedog.vididin.R
|
|
||||||
import com.gamedog.vididin.main.interfaces.OnTabStyleListener
|
import com.gamedog.vididin.main.interfaces.OnTabStyleListener
|
||||||
import dagger.hilt.android.AndroidEntryPoint
|
import dagger.hilt.android.AndroidEntryPoint
|
||||||
import kotlin.getValue
|
import kotlin.getValue
|
||||||
|
|
@ -32,7 +28,8 @@ class WatchAdActivity : AppViewsActivity<ViewBinding, UiState, ViewModel>(), OnT
|
||||||
|
|
||||||
|
|
||||||
private lateinit var mCountDownTimer: CountDownTimer
|
private lateinit var mCountDownTimer: CountDownTimer
|
||||||
private var mTaskUUID: Int = 0
|
private var mTaskType: Int = 0
|
||||||
|
private var mTaskData: String? = null
|
||||||
|
|
||||||
override fun ViewBinding.initViews() {
|
override fun ViewBinding.initViews() {
|
||||||
with(binding) {
|
with(binding) {
|
||||||
|
|
@ -59,7 +56,7 @@ class WatchAdActivity : AppViewsActivity<ViewBinding, UiState, ViewModel>(), OnT
|
||||||
|
|
||||||
|
|
||||||
private fun notifyAdWatchFinish() {
|
private fun notifyAdWatchFinish() {
|
||||||
NotifyMan.instance().sendEvent(mTaskUUID, null)
|
NotifyMan.instance().sendEvent(mTaskType, null)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun stateCounter() {
|
private fun stateCounter() {
|
||||||
|
|
@ -79,7 +76,8 @@ class WatchAdActivity : AppViewsActivity<ViewBinding, UiState, ViewModel>(), OnT
|
||||||
|
|
||||||
override fun readIntent(intent: Intent) {
|
override fun readIntent(intent: Intent) {
|
||||||
super.readIntent(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<ViewBinding, UiState, ViewModel>(), OnT
|
||||||
|
|
||||||
|
|
||||||
companion object {
|
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)
|
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)
|
activity.startActivity(intent)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,13 @@
|
||||||
package com.gamedog.vididin.main
|
package com.gamedog.vididin.main
|
||||||
|
|
||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
import com.ama.core.architecture.util.AndroidUtil
|
|
||||||
import com.ama.core.architecture.util.setOnClickBatch
|
import com.ama.core.architecture.util.setOnClickBatch
|
||||||
import com.ama.core.architecture.widget.BindingDialog
|
import com.ama.core.architecture.widget.BindingDialog
|
||||||
import com.gamedog.vididin.databinding.DialogWatchVideoBinding
|
import com.gamedog.vididin.databinding.DialogWatchVideoBinding
|
||||||
import com.gamedog.vididin.router.Router
|
import com.gamedog.vididin.router.Router
|
||||||
|
|
||||||
|
|
||||||
class WatchVideoDialog(context: Activity) : BindingDialog<DialogWatchVideoBinding>(context, DialogWatchVideoBinding::inflate) {
|
class WatchVideoDialog(context: Activity, private val mTaskType: Int, private val mTaskDataJson: String?) : BindingDialog<DialogWatchVideoBinding>(context, DialogWatchVideoBinding::inflate) {
|
||||||
|
|
||||||
init {
|
init {
|
||||||
build()
|
build()
|
||||||
|
|
@ -36,13 +35,7 @@ class WatchVideoDialog(context: Activity) : BindingDialog<DialogWatchVideoBindin
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun gotoWatchVideo() {
|
private fun gotoWatchVideo() {
|
||||||
val taskUUID = AndroidUtil.genRandomInt(500000, Int.MAX_VALUE)
|
Router.WatchAd.startActivity(mActivity, mTaskType, mTaskDataJson)
|
||||||
registerEvents({
|
|
||||||
AndroidUtil.showToast("广告任务完成")
|
|
||||||
dismiss()
|
|
||||||
}, taskUUID)
|
|
||||||
|
|
||||||
Router.WatchAd.startActivity(mActivity, taskUUID)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,7 @@ class TasksFragment : AppViewsFragment<ViewBinding, UiState, ViewModel>(), OnTab
|
||||||
override fun ViewBinding.initViews() {
|
override fun ViewBinding.initViews() {
|
||||||
with(binding) {
|
with(binding) {
|
||||||
setOnClickBatch(ivGotoDailySign, llTaskBenefit, llTaskWatchVideo, llTaskGame,
|
setOnClickBatch(ivGotoDailySign, llTaskBenefit, llTaskWatchVideo, llTaskGame,
|
||||||
llTaskZerobuy, tvWatchVideo, tvWithdraw) {
|
llTaskZerobuy, tvWatchVideoForConvertGoldToCash, tvWithdraw) {
|
||||||
when(this) {
|
when(this) {
|
||||||
ivGotoDailySign->{
|
ivGotoDailySign->{
|
||||||
DailySignDialog(requireActivity()).show()
|
DailySignDialog(requireActivity()).show()
|
||||||
|
|
@ -78,7 +78,7 @@ class TasksFragment : AppViewsFragment<ViewBinding, UiState, ViewModel>(), OnTab
|
||||||
}
|
}
|
||||||
|
|
||||||
llTaskWatchVideo->{
|
llTaskWatchVideo->{
|
||||||
WatchVideoDialog(requireActivity()).show()
|
WatchVideoDialog(requireActivity(), VididinEvents.Event_AD_TASK_TYPE_Watch_Ad_For_Gold, null).show()
|
||||||
}
|
}
|
||||||
|
|
||||||
llTaskGame->{
|
llTaskGame->{
|
||||||
|
|
@ -89,8 +89,8 @@ class TasksFragment : AppViewsFragment<ViewBinding, UiState, ViewModel>(), OnTab
|
||||||
Router.ZeroBuy.startActivity(requireActivity())
|
Router.ZeroBuy.startActivity(requireActivity())
|
||||||
}
|
}
|
||||||
|
|
||||||
tvWatchVideo->{
|
tvWatchVideoForConvertGoldToCash->{
|
||||||
WatchVideoDialog(requireActivity()).show()
|
WatchVideoDialog(requireActivity(), VididinEvents.Event_AD_TASK_TYPE_Convert_Gold_2_Cash, null).show()
|
||||||
}
|
}
|
||||||
|
|
||||||
tvWithdraw->{
|
tvWithdraw->{
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@ import androidx.core.view.isVisible
|
||||||
import com.ama.core.architecture.appBase.AppViewsEmptyViewModelFragment
|
import com.ama.core.architecture.appBase.AppViewsEmptyViewModelFragment
|
||||||
import com.ama.core.common.widget.PopMenuIconView
|
import com.ama.core.common.widget.PopMenuIconView
|
||||||
import com.gamedog.vididin.R
|
import com.gamedog.vididin.R
|
||||||
|
import com.gamedog.vididin.VididinEvents
|
||||||
import com.gamedog.vididin.beans.YoutubeVideo
|
import com.gamedog.vididin.beans.YoutubeVideo
|
||||||
import com.gamedog.vididin.main.WatchVideoDialog
|
import com.gamedog.vididin.main.WatchVideoDialog
|
||||||
import com.gamedog.vididin.router.Router
|
import com.gamedog.vididin.router.Router
|
||||||
|
|
@ -62,7 +63,7 @@ class HomeItemFragment : AppViewsEmptyViewModelFragment<ViewBinding>() {
|
||||||
Router.Benefit.startActivity(requireActivity())
|
Router.Benefit.startActivity(requireActivity())
|
||||||
},
|
},
|
||||||
PopMenuIconView.MenuItem(R.mipmap.home_menu_2) {
|
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) {
|
PopMenuIconView.MenuItem(R.mipmap.home_menu_3) {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ class DefaultVersionRouter: IRouterVersion {
|
||||||
|
|
||||||
|
|
||||||
class DefaultWatchAdRouter: IRouterWatchAd {
|
class DefaultWatchAdRouter: IRouterWatchAd {
|
||||||
override fun startActivity(activity: Activity, taskUUID: Int) {
|
override fun startActivity(activity: Activity, taskType: Int, taskDataJson: String?) {
|
||||||
WatchAdActivity.Companion.startActivity(activity, taskUUID)
|
WatchAdActivity.Companion.startActivity(activity, taskType, taskDataJson)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ interface IRouterSplash {
|
||||||
}
|
}
|
||||||
|
|
||||||
interface IRouterWatchAd {
|
interface IRouterWatchAd {
|
||||||
fun startActivity(activity: Activity, taskUUID: Int)
|
fun startActivity(activity: Activity, taskType: Int, taskDataJson: String?)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -79,8 +79,8 @@
|
||||||
|
|
||||||
|
|
||||||
<androidx.appcompat.widget.AppCompatTextView
|
<androidx.appcompat.widget.AppCompatTextView
|
||||||
android:id="@+id/tv_watch_video"
|
android:id="@+id/tv_watch_video_for_convert_gold_to_cash"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center_horizontal"
|
||||||
android:layout_marginLeft="8dp"
|
android:layout_marginLeft="8dp"
|
||||||
|
|
@ -144,7 +144,7 @@
|
||||||
|
|
||||||
<androidx.appcompat.widget.AppCompatTextView
|
<androidx.appcompat.widget.AppCompatTextView
|
||||||
android:id="@+id/tv_withdraw"
|
android:id="@+id/tv_withdraw"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
android:textSize="15sp"
|
android:textSize="15sp"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue