Commit f7d06600 authored by wanglei's avatar wanglei

...进去处理广告开关

parent 0a239489
...@@ -5,12 +5,11 @@ class AdConfigBean( ...@@ -5,12 +5,11 @@ class AdConfigBean(
var numDisplayLimit: Int = -1, var numDisplayLimit: Int = -1,
var numRequestLimit: Int = -1, var numRequestLimit: Int = -1,
var numClickLimit: Int = -1, var numClickLimit: Int = -1,
var timeInterval: Int = 1, var timeInterval: Int = 60,
var openAdLoading: Int = 15, var openAdLoading: Int = 15,
var functionBackShowAd: Boolean = true, var functionBackShowAd: Boolean = true,
var functionInShowAd: Boolean = true, var functionInShowAd: Boolean = true,
var tabFgInterval: Int = 15, var tabFgInterval: Int = 30,
var taichiAdValue: Int = 1,//价值上报阀值 var taichiAdValue: Int = 1,//价值上报阀值
var adRatio: Int = 100//价值上报随机控制 var adRatio: Int = 100//价值上报随机控制
) { ) {
......
...@@ -5,7 +5,7 @@ class PopupConfigBean( ...@@ -5,7 +5,7 @@ class PopupConfigBean(
var popupForegroundCanPush: Boolean = false, var popupForegroundCanPush: Boolean = false,
var popupStatus: Boolean = true, var popupStatus: Boolean = true,
var popupCount: Int = 100, var popupCount: Int = 100,
var popupStart: Int = 0, var popupStart: Int = 6,
var popupEnd: Int = 24, var popupEnd: Int = 24,
var popupInterval: Int = 1, var popupInterval: Int = 1,
...@@ -16,7 +16,7 @@ class PopupConfigBean( ...@@ -16,7 +16,7 @@ class PopupConfigBean(
//定时器 //定时器
var timerS: Boolean = true, var timerS: Boolean = true,
var timerDelay: Int = 1, var timerDelay: Int = 1,
var timerInterval: Int = 1, var timerInterval: Int = 7,
//解锁 //解锁
var screenS: Boolean = true, var screenS: Boolean = true,
......
...@@ -12,6 +12,7 @@ import com.base.scanqr.ads.AdsMgr ...@@ -12,6 +12,7 @@ import com.base.scanqr.ads.AdsMgr
import com.base.scanqr.ads.AdsShowCallBack import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseActivity import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.ContractUIBean import com.base.scanqr.bean.ContractUIBean
import com.base.scanqr.bean.config.AdConfigBean
import com.base.scanqr.databinding.ActivityContractBinding import com.base.scanqr.databinding.ActivityContractBinding
import com.base.scanqr.utils.BarUtils import com.base.scanqr.utils.BarUtils
import com.base.scanqr.utils.ContactUtils.queryMediaContract import com.base.scanqr.utils.ContactUtils.queryMediaContract
...@@ -42,6 +43,7 @@ class ContractActivity : BaseActivity<ActivityContractBinding>(ActivityContractB ...@@ -42,6 +43,7 @@ class ContractActivity : BaseActivity<ActivityContractBinding>(ActivityContractB
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
if (AdConfigBean.adsConfigBean.functionBackShowAd) {
AdsMgr.showInsert(this@ContractActivity, false, object : AdsShowCallBack() { AdsMgr.showInsert(this@ContractActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) { override fun close(where: Int) {
finishToMainTop() finishToMainTop()
...@@ -55,6 +57,9 @@ class ContractActivity : BaseActivity<ActivityContractBinding>(ActivityContractB ...@@ -55,6 +57,9 @@ class ContractActivity : BaseActivity<ActivityContractBinding>(ActivityContractB
finishToMainTop() finishToMainTop()
} }
}) })
} else {
finishToMainTop()
}
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -9,6 +9,7 @@ import com.base.scanqr.ads.AdsShowCallBack ...@@ -9,6 +9,7 @@ import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseActivity import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.ContractUIBean import com.base.scanqr.bean.ContractUIBean
import com.base.scanqr.bean.FunctionUIBean import com.base.scanqr.bean.FunctionUIBean
import com.base.scanqr.bean.config.AdConfigBean
import com.base.scanqr.databinding.ActivityContractCodeBinding import com.base.scanqr.databinding.ActivityContractCodeBinding
import com.base.scanqr.ui.vm.QrViewModel import com.base.scanqr.ui.vm.QrViewModel
import com.base.scanqr.ui.widget.InputNameDialog.showInputNameDialog import com.base.scanqr.ui.widget.InputNameDialog.showInputNameDialog
...@@ -82,6 +83,7 @@ class ContractCodeActivity : BaseActivity<ActivityContractCodeBinding>(ActivityC ...@@ -82,6 +83,7 @@ class ContractCodeActivity : BaseActivity<ActivityContractCodeBinding>(ActivityC
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
if (AdConfigBean.adsConfigBean.functionBackShowAd) {
AdsMgr.showInsert(this@ContractCodeActivity, false, object : AdsShowCallBack() { AdsMgr.showInsert(this@ContractCodeActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) { override fun close(where: Int) {
finishToMainTop() finishToMainTop()
...@@ -95,6 +97,9 @@ class ContractCodeActivity : BaseActivity<ActivityContractCodeBinding>(ActivityC ...@@ -95,6 +97,9 @@ class ContractCodeActivity : BaseActivity<ActivityContractCodeBinding>(ActivityC
finishToMainTop() finishToMainTop()
} }
}) })
} else {
finishToMainTop()
}
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -8,6 +8,7 @@ import com.base.scanqr.ads.AdsMgr ...@@ -8,6 +8,7 @@ import com.base.scanqr.ads.AdsMgr
import com.base.scanqr.ads.AdsShowCallBack import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseActivity import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.EmailUIBean import com.base.scanqr.bean.EmailUIBean
import com.base.scanqr.bean.config.AdConfigBean
import com.base.scanqr.databinding.ActivityEmailBinding import com.base.scanqr.databinding.ActivityEmailBinding
import com.base.scanqr.utils.BarUtils import com.base.scanqr.utils.BarUtils
import com.base.scanqr.utils.ToastUtils.toast import com.base.scanqr.utils.ToastUtils.toast
...@@ -32,6 +33,7 @@ class EmailActivity : BaseActivity<ActivityEmailBinding>(ActivityEmailBinding::i ...@@ -32,6 +33,7 @@ class EmailActivity : BaseActivity<ActivityEmailBinding>(ActivityEmailBinding::i
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
if (AdConfigBean.adsConfigBean.functionBackShowAd) {
AdsMgr.showInsert(this@EmailActivity, false, object : AdsShowCallBack() { AdsMgr.showInsert(this@EmailActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) { override fun close(where: Int) {
finishToMainTop() finishToMainTop()
...@@ -45,6 +47,9 @@ class EmailActivity : BaseActivity<ActivityEmailBinding>(ActivityEmailBinding::i ...@@ -45,6 +47,9 @@ class EmailActivity : BaseActivity<ActivityEmailBinding>(ActivityEmailBinding::i
finishToMainTop() finishToMainTop()
} }
}) })
} else {
finishToMainTop()
}
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -10,6 +10,7 @@ import com.base.scanqr.base.BaseActivity ...@@ -10,6 +10,7 @@ import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.EmailUIBean import com.base.scanqr.bean.EmailUIBean
import com.base.scanqr.bean.EmailUIBean.Companion.createEmailQrString import com.base.scanqr.bean.EmailUIBean.Companion.createEmailQrString
import com.base.scanqr.bean.FunctionUIBean.Companion.KEY_EMAIL import com.base.scanqr.bean.FunctionUIBean.Companion.KEY_EMAIL
import com.base.scanqr.bean.config.AdConfigBean
import com.base.scanqr.databinding.ActivityEmailCodeBinding import com.base.scanqr.databinding.ActivityEmailCodeBinding
import com.base.scanqr.ui.vm.QrViewModel import com.base.scanqr.ui.vm.QrViewModel
import com.base.scanqr.ui.widget.InputNameDialog.showInputNameDialog import com.base.scanqr.ui.widget.InputNameDialog.showInputNameDialog
...@@ -79,7 +80,7 @@ class EmailCodeActivity : BaseActivity<ActivityEmailCodeBinding>(ActivityEmailCo ...@@ -79,7 +80,7 @@ class EmailCodeActivity : BaseActivity<ActivityEmailCodeBinding>(ActivityEmailCo
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
if (AdConfigBean.adsConfigBean.functionBackShowAd) {
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
AdsMgr.showInsert(this@EmailCodeActivity, false, object : AdsShowCallBack() { AdsMgr.showInsert(this@EmailCodeActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) { override fun close(where: Int) {
...@@ -95,6 +96,9 @@ class EmailCodeActivity : BaseActivity<ActivityEmailCodeBinding>(ActivityEmailCo ...@@ -95,6 +96,9 @@ class EmailCodeActivity : BaseActivity<ActivityEmailCodeBinding>(ActivityEmailCo
} }
}) })
} }
}else{
finishToMainTop()
}
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
} }
......
...@@ -11,6 +11,7 @@ import com.base.scanqr.ads.AdsShowCallBack ...@@ -11,6 +11,7 @@ import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseActivity import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.ConstObject.appLanguageSp import com.base.scanqr.bean.ConstObject.appLanguageSp
import com.base.scanqr.bean.EventUIBean import com.base.scanqr.bean.EventUIBean
import com.base.scanqr.bean.config.AdConfigBean
import com.base.scanqr.databinding.ActivityEventBinding import com.base.scanqr.databinding.ActivityEventBinding
import com.base.scanqr.utils.BarUtils import com.base.scanqr.utils.BarUtils
import com.base.scanqr.utils.LogEx import com.base.scanqr.utils.LogEx
...@@ -128,6 +129,7 @@ class EventActivity : BaseActivity<ActivityEventBinding>(ActivityEventBinding::i ...@@ -128,6 +129,7 @@ class EventActivity : BaseActivity<ActivityEventBinding>(ActivityEventBinding::i
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
if (AdConfigBean.adsConfigBean.functionBackShowAd) {
AdsMgr.showInsert(this@EventActivity, false, object : AdsShowCallBack() { AdsMgr.showInsert(this@EventActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) { override fun close(where: Int) {
finishToMainTop() finishToMainTop()
...@@ -141,6 +143,9 @@ class EventActivity : BaseActivity<ActivityEventBinding>(ActivityEventBinding::i ...@@ -141,6 +143,9 @@ class EventActivity : BaseActivity<ActivityEventBinding>(ActivityEventBinding::i
finishToMainTop() finishToMainTop()
} }
}) })
}else{
finishToMainTop()
}
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -11,6 +11,7 @@ import com.base.scanqr.ads.AdsShowCallBack ...@@ -11,6 +11,7 @@ import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseActivity import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.EventUIBean import com.base.scanqr.bean.EventUIBean
import com.base.scanqr.bean.FunctionUIBean import com.base.scanqr.bean.FunctionUIBean
import com.base.scanqr.bean.config.AdConfigBean
import com.base.scanqr.databinding.ActivityEventCodeBinding import com.base.scanqr.databinding.ActivityEventCodeBinding
import com.base.scanqr.ui.vm.QrViewModel import com.base.scanqr.ui.vm.QrViewModel
import com.base.scanqr.ui.widget.InputNameDialog.showInputNameDialog import com.base.scanqr.ui.widget.InputNameDialog.showInputNameDialog
...@@ -84,6 +85,7 @@ class EventCodeActivity : BaseActivity<ActivityEventCodeBinding>(ActivityEventCo ...@@ -84,6 +85,7 @@ class EventCodeActivity : BaseActivity<ActivityEventCodeBinding>(ActivityEventCo
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
if (AdConfigBean.adsConfigBean.functionBackShowAd) {
AdsMgr.showInsert(this@EventCodeActivity, false, object : AdsShowCallBack() { AdsMgr.showInsert(this@EventCodeActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) { override fun close(where: Int) {
finishToMainTop() finishToMainTop()
...@@ -97,6 +99,9 @@ class EventCodeActivity : BaseActivity<ActivityEventCodeBinding>(ActivityEventCo ...@@ -97,6 +99,9 @@ class EventCodeActivity : BaseActivity<ActivityEventCodeBinding>(ActivityEventCo
finishToMainTop() finishToMainTop()
} }
}) })
} else {
finishToMainTop()
}
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -16,6 +16,7 @@ import com.base.scanqr.bean.FunctionUIBean.Companion.KEY_TELEPHONE ...@@ -16,6 +16,7 @@ import com.base.scanqr.bean.FunctionUIBean.Companion.KEY_TELEPHONE
import com.base.scanqr.bean.FunctionUIBean.Companion.KEY_TEXT import com.base.scanqr.bean.FunctionUIBean.Companion.KEY_TEXT
import com.base.scanqr.bean.FunctionUIBean.Companion.KEY_WEBSITE import com.base.scanqr.bean.FunctionUIBean.Companion.KEY_WEBSITE
import com.base.scanqr.bean.FunctionUIBean.Companion.KEY_WIFI import com.base.scanqr.bean.FunctionUIBean.Companion.KEY_WIFI
import com.base.scanqr.bean.config.AdConfigBean.Companion.adsConfigBean
import com.base.scanqr.databinding.FragmentCreateBinding import com.base.scanqr.databinding.FragmentCreateBinding
import com.base.scanqr.ui.contact.ContractActivity import com.base.scanqr.ui.contact.ContractActivity
import com.base.scanqr.ui.email.EmailActivity import com.base.scanqr.ui.email.EmailActivity
...@@ -55,6 +56,7 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding ...@@ -55,6 +56,7 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding
adapter?.itemClick = { key -> adapter?.itemClick = { key ->
val activity = requireActivity() as MainActivity? val activity = requireActivity() as MainActivity?
activity?.let { activity?.let {
if (adsConfigBean.functionInShowAd) {
AdsMgr.showInsert(it, false, object : AdsShowCallBack() { AdsMgr.showInsert(it, false, object : AdsShowCallBack() {
override fun close(where: Int) { override fun close(where: Int) {
itemKeyClick(key) itemKeyClick(key)
...@@ -69,6 +71,9 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding ...@@ -69,6 +71,9 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding
itemKeyClick(key) itemKeyClick(key)
} }
}) })
} else {
itemKeyClick(key)
}
} }
} }
} }
......
...@@ -13,6 +13,7 @@ import com.base.scanqr.ads.AdsMgr ...@@ -13,6 +13,7 @@ import com.base.scanqr.ads.AdsMgr
import com.base.scanqr.ads.AdsShowCallBack import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseActivity import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.MessageUIBean import com.base.scanqr.bean.MessageUIBean
import com.base.scanqr.bean.config.AdConfigBean
import com.base.scanqr.databinding.ActivityMessageBinding import com.base.scanqr.databinding.ActivityMessageBinding
import com.base.scanqr.utils.BarUtils import com.base.scanqr.utils.BarUtils
import com.base.scanqr.utils.ContactUtils.queryTel import com.base.scanqr.utils.ContactUtils.queryTel
...@@ -44,6 +45,7 @@ class MessageActivity : BaseActivity<ActivityMessageBinding>(ActivityMessageBind ...@@ -44,6 +45,7 @@ class MessageActivity : BaseActivity<ActivityMessageBinding>(ActivityMessageBind
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
if (AdConfigBean.adsConfigBean.functionBackShowAd) {
AdsMgr.showInsert(this@MessageActivity, false, object : AdsShowCallBack() { AdsMgr.showInsert(this@MessageActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) { override fun close(where: Int) {
finishToMainTop() finishToMainTop()
...@@ -57,6 +59,9 @@ class MessageActivity : BaseActivity<ActivityMessageBinding>(ActivityMessageBind ...@@ -57,6 +59,9 @@ class MessageActivity : BaseActivity<ActivityMessageBinding>(ActivityMessageBind
finishToMainTop() finishToMainTop()
} }
}) })
}else{
finishToMainTop()
}
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -10,6 +10,7 @@ import com.base.scanqr.ads.AdsShowCallBack ...@@ -10,6 +10,7 @@ import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseActivity import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.FunctionUIBean import com.base.scanqr.bean.FunctionUIBean
import com.base.scanqr.bean.MessageUIBean import com.base.scanqr.bean.MessageUIBean
import com.base.scanqr.bean.config.AdConfigBean
import com.base.scanqr.databinding.ActivityMessageCodeBinding import com.base.scanqr.databinding.ActivityMessageCodeBinding
import com.base.scanqr.ui.vm.QrViewModel import com.base.scanqr.ui.vm.QrViewModel
import com.base.scanqr.ui.widget.InputNameDialog.showInputNameDialog import com.base.scanqr.ui.widget.InputNameDialog.showInputNameDialog
...@@ -79,6 +80,7 @@ class MessageCodeActivity : BaseActivity<ActivityMessageCodeBinding>(ActivityMes ...@@ -79,6 +80,7 @@ class MessageCodeActivity : BaseActivity<ActivityMessageCodeBinding>(ActivityMes
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
if (AdConfigBean.adsConfigBean.functionBackShowAd) {
AdsMgr.showInsert(this@MessageCodeActivity, false, object : AdsShowCallBack() { AdsMgr.showInsert(this@MessageCodeActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) { override fun close(where: Int) {
finishToMainTop() finishToMainTop()
...@@ -92,6 +94,9 @@ class MessageCodeActivity : BaseActivity<ActivityMessageCodeBinding>(ActivityMes ...@@ -92,6 +94,9 @@ class MessageCodeActivity : BaseActivity<ActivityMessageCodeBinding>(ActivityMes
finishToMainTop() finishToMainTop()
} }
}) })
}else{
finishToMainTop()
}
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -13,6 +13,7 @@ import com.base.scanqr.ads.AdsShowCallBack ...@@ -13,6 +13,7 @@ import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseActivity import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.FunctionUIBean import com.base.scanqr.bean.FunctionUIBean
import com.base.scanqr.bean.ProductUIBean import com.base.scanqr.bean.ProductUIBean
import com.base.scanqr.bean.config.AdConfigBean
import com.base.scanqr.databinding.ActivityProductCodeBinding import com.base.scanqr.databinding.ActivityProductCodeBinding
import com.base.scanqr.ui.vm.QrViewModel import com.base.scanqr.ui.vm.QrViewModel
import com.base.scanqr.ui.widget.InputNameDialog.showInputNameDialog import com.base.scanqr.ui.widget.InputNameDialog.showInputNameDialog
...@@ -85,6 +86,7 @@ class ProductCodeActivity : BaseActivity<ActivityProductCodeBinding>(ActivityPro ...@@ -85,6 +86,7 @@ class ProductCodeActivity : BaseActivity<ActivityProductCodeBinding>(ActivityPro
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
if (AdConfigBean.adsConfigBean.functionBackShowAd) {
AdsMgr.showInsert(this@ProductCodeActivity, false, object : AdsShowCallBack() { AdsMgr.showInsert(this@ProductCodeActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) { override fun close(where: Int) {
finishToMainTop() finishToMainTop()
...@@ -98,6 +100,9 @@ class ProductCodeActivity : BaseActivity<ActivityProductCodeBinding>(ActivityPro ...@@ -98,6 +100,9 @@ class ProductCodeActivity : BaseActivity<ActivityProductCodeBinding>(ActivityPro
finishToMainTop() finishToMainTop()
} }
}) })
} else {
finishToMainTop()
}
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -11,6 +11,7 @@ import com.base.scanqr.ads.AdsMgr ...@@ -11,6 +11,7 @@ import com.base.scanqr.ads.AdsMgr
import com.base.scanqr.ads.AdsShowCallBack import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseActivity import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.TelephoneUIBean import com.base.scanqr.bean.TelephoneUIBean
import com.base.scanqr.bean.config.AdConfigBean
import com.base.scanqr.databinding.ActivityTelephoneBinding import com.base.scanqr.databinding.ActivityTelephoneBinding
import com.base.scanqr.utils.BarUtils import com.base.scanqr.utils.BarUtils
import com.base.scanqr.utils.ContactUtils.queryTel import com.base.scanqr.utils.ContactUtils.queryTel
...@@ -42,6 +43,7 @@ class TelephoneActivity : BaseActivity<ActivityTelephoneBinding>(ActivityTelepho ...@@ -42,6 +43,7 @@ class TelephoneActivity : BaseActivity<ActivityTelephoneBinding>(ActivityTelepho
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
if (AdConfigBean.adsConfigBean.functionBackShowAd) {
AdsMgr.showInsert(this@TelephoneActivity, false, object : AdsShowCallBack() { AdsMgr.showInsert(this@TelephoneActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) { override fun close(where: Int) {
finishToMainTop() finishToMainTop()
...@@ -55,6 +57,9 @@ class TelephoneActivity : BaseActivity<ActivityTelephoneBinding>(ActivityTelepho ...@@ -55,6 +57,9 @@ class TelephoneActivity : BaseActivity<ActivityTelephoneBinding>(ActivityTelepho
finishToMainTop() finishToMainTop()
} }
}) })
}else{
finishToMainTop()
}
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -10,6 +10,7 @@ import com.base.scanqr.ads.AdsShowCallBack ...@@ -10,6 +10,7 @@ import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseActivity import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.FunctionUIBean import com.base.scanqr.bean.FunctionUIBean
import com.base.scanqr.bean.TelephoneUIBean import com.base.scanqr.bean.TelephoneUIBean
import com.base.scanqr.bean.config.AdConfigBean
import com.base.scanqr.databinding.ActivityTelephoneCodeBinding import com.base.scanqr.databinding.ActivityTelephoneCodeBinding
import com.base.scanqr.ui.vm.QrViewModel import com.base.scanqr.ui.vm.QrViewModel
import com.base.scanqr.ui.widget.InputNameDialog.showInputNameDialog import com.base.scanqr.ui.widget.InputNameDialog.showInputNameDialog
...@@ -82,6 +83,7 @@ class TelephoneCodeActivity : BaseActivity<ActivityTelephoneCodeBinding>(Activit ...@@ -82,6 +83,7 @@ class TelephoneCodeActivity : BaseActivity<ActivityTelephoneCodeBinding>(Activit
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
if (AdConfigBean.adsConfigBean.functionBackShowAd) {
AdsMgr.showInsert(this@TelephoneCodeActivity, false, object : AdsShowCallBack() { AdsMgr.showInsert(this@TelephoneCodeActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) { override fun close(where: Int) {
finishToMainTop() finishToMainTop()
...@@ -95,6 +97,9 @@ class TelephoneCodeActivity : BaseActivity<ActivityTelephoneCodeBinding>(Activit ...@@ -95,6 +97,9 @@ class TelephoneCodeActivity : BaseActivity<ActivityTelephoneCodeBinding>(Activit
finishToMainTop() finishToMainTop()
} }
}) })
}else{
finishToMainTop()
}
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -8,6 +8,7 @@ import com.base.scanqr.ads.AdsMgr ...@@ -8,6 +8,7 @@ import com.base.scanqr.ads.AdsMgr
import com.base.scanqr.ads.AdsShowCallBack import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseActivity import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.TextUIBean import com.base.scanqr.bean.TextUIBean
import com.base.scanqr.bean.config.AdConfigBean
import com.base.scanqr.databinding.ActivityTextBinding import com.base.scanqr.databinding.ActivityTextBinding
import com.base.scanqr.utils.BarUtils import com.base.scanqr.utils.BarUtils
import com.base.scanqr.utils.ToastUtils.toast import com.base.scanqr.utils.ToastUtils.toast
...@@ -31,6 +32,7 @@ class TextActivity : BaseActivity<ActivityTextBinding>(ActivityTextBinding::infl ...@@ -31,6 +32,7 @@ class TextActivity : BaseActivity<ActivityTextBinding>(ActivityTextBinding::infl
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
if (AdConfigBean.adsConfigBean.functionBackShowAd) {
AdsMgr.showInsert(this@TextActivity, false, object : AdsShowCallBack() { AdsMgr.showInsert(this@TextActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) { override fun close(where: Int) {
finishToMainTop() finishToMainTop()
...@@ -44,6 +46,9 @@ class TextActivity : BaseActivity<ActivityTextBinding>(ActivityTextBinding::infl ...@@ -44,6 +46,9 @@ class TextActivity : BaseActivity<ActivityTextBinding>(ActivityTextBinding::infl
finishToMainTop() finishToMainTop()
} }
}) })
} else {
finishToMainTop()
}
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -13,6 +13,7 @@ import com.base.scanqr.ads.AdsShowCallBack ...@@ -13,6 +13,7 @@ import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseActivity import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.FunctionUIBean import com.base.scanqr.bean.FunctionUIBean
import com.base.scanqr.bean.TextUIBean import com.base.scanqr.bean.TextUIBean
import com.base.scanqr.bean.config.AdConfigBean
import com.base.scanqr.databinding.ActivityTextCodeBinding import com.base.scanqr.databinding.ActivityTextCodeBinding
import com.base.scanqr.ui.vm.QrViewModel import com.base.scanqr.ui.vm.QrViewModel
import com.base.scanqr.ui.widget.InputNameDialog.showInputNameDialog import com.base.scanqr.ui.widget.InputNameDialog.showInputNameDialog
...@@ -79,6 +80,7 @@ class TextCodeActivity : BaseActivity<ActivityTextCodeBinding>(ActivityTextCodeB ...@@ -79,6 +80,7 @@ class TextCodeActivity : BaseActivity<ActivityTextCodeBinding>(ActivityTextCodeB
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
if (AdConfigBean.adsConfigBean.functionBackShowAd) {
AdsMgr.showInsert(this@TextCodeActivity, false, object : AdsShowCallBack() { AdsMgr.showInsert(this@TextCodeActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) { override fun close(where: Int) {
finishToMainTop() finishToMainTop()
...@@ -92,6 +94,9 @@ class TextCodeActivity : BaseActivity<ActivityTextCodeBinding>(ActivityTextCodeB ...@@ -92,6 +94,9 @@ class TextCodeActivity : BaseActivity<ActivityTextCodeBinding>(ActivityTextCodeB
finishToMainTop() finishToMainTop()
} }
}) })
} else {
finishToMainTop()
}
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -10,6 +10,7 @@ import com.base.scanqr.ads.AdsMgr ...@@ -10,6 +10,7 @@ import com.base.scanqr.ads.AdsMgr
import com.base.scanqr.ads.AdsShowCallBack import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseActivity import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.WebsiteUIBean import com.base.scanqr.bean.WebsiteUIBean
import com.base.scanqr.bean.config.AdConfigBean
import com.base.scanqr.databinding.ActivityWebsiteBinding import com.base.scanqr.databinding.ActivityWebsiteBinding
import com.base.scanqr.utils.BarUtils import com.base.scanqr.utils.BarUtils
import com.base.scanqr.utils.ToastUtils.toast import com.base.scanqr.utils.ToastUtils.toast
...@@ -35,6 +36,7 @@ class WebsiteActivity : BaseActivity<ActivityWebsiteBinding>(ActivityWebsiteBind ...@@ -35,6 +36,7 @@ class WebsiteActivity : BaseActivity<ActivityWebsiteBinding>(ActivityWebsiteBind
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
if (AdConfigBean.adsConfigBean.functionBackShowAd) {
AdsMgr.showInsert(this@WebsiteActivity, false, object : AdsShowCallBack() { AdsMgr.showInsert(this@WebsiteActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) { override fun close(where: Int) {
finishToMainTop() finishToMainTop()
...@@ -48,6 +50,9 @@ class WebsiteActivity : BaseActivity<ActivityWebsiteBinding>(ActivityWebsiteBind ...@@ -48,6 +50,9 @@ class WebsiteActivity : BaseActivity<ActivityWebsiteBinding>(ActivityWebsiteBind
finishToMainTop() finishToMainTop()
} }
}) })
}else{
finishToMainTop()
}
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -10,6 +10,7 @@ import com.base.scanqr.ads.AdsShowCallBack ...@@ -10,6 +10,7 @@ import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseActivity import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.FunctionUIBean import com.base.scanqr.bean.FunctionUIBean
import com.base.scanqr.bean.WebsiteUIBean import com.base.scanqr.bean.WebsiteUIBean
import com.base.scanqr.bean.config.AdConfigBean
import com.base.scanqr.databinding.ActivityWebsiteCodeBinding import com.base.scanqr.databinding.ActivityWebsiteCodeBinding
import com.base.scanqr.ui.vm.QrViewModel import com.base.scanqr.ui.vm.QrViewModel
import com.base.scanqr.ui.widget.InputNameDialog.showInputNameDialog import com.base.scanqr.ui.widget.InputNameDialog.showInputNameDialog
...@@ -79,6 +80,7 @@ class WebsiteCodeActivity : BaseActivity<ActivityWebsiteCodeBinding>(ActivityWeb ...@@ -79,6 +80,7 @@ class WebsiteCodeActivity : BaseActivity<ActivityWebsiteCodeBinding>(ActivityWeb
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
if (AdConfigBean.adsConfigBean.functionBackShowAd) {
AdsMgr.showInsert(this@WebsiteCodeActivity, false, object : AdsShowCallBack() { AdsMgr.showInsert(this@WebsiteCodeActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) { override fun close(where: Int) {
finishToMainTop() finishToMainTop()
...@@ -92,6 +94,9 @@ class WebsiteCodeActivity : BaseActivity<ActivityWebsiteCodeBinding>(ActivityWeb ...@@ -92,6 +94,9 @@ class WebsiteCodeActivity : BaseActivity<ActivityWebsiteCodeBinding>(ActivityWeb
finishToMainTop() finishToMainTop()
} }
}) })
} else {
finishToMainTop()
}
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -18,6 +18,7 @@ import com.base.scanqr.ads.AdsMgr ...@@ -18,6 +18,7 @@ import com.base.scanqr.ads.AdsMgr
import com.base.scanqr.ads.AdsShowCallBack import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseActivity import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.WifiUIBean import com.base.scanqr.bean.WifiUIBean
import com.base.scanqr.bean.config.AdConfigBean
import com.base.scanqr.databinding.ActivityWifiBinding import com.base.scanqr.databinding.ActivityWifiBinding
import com.base.scanqr.ui.widget.WifiSelectDialog.showWifiSelectDialog import com.base.scanqr.ui.widget.WifiSelectDialog.showWifiSelectDialog
import com.base.scanqr.utils.BarUtils import com.base.scanqr.utils.BarUtils
...@@ -53,6 +54,7 @@ class WifiActivity : BaseActivity<ActivityWifiBinding>(ActivityWifiBinding::infl ...@@ -53,6 +54,7 @@ class WifiActivity : BaseActivity<ActivityWifiBinding>(ActivityWifiBinding::infl
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
if (AdConfigBean.adsConfigBean.functionBackShowAd) {
AdsMgr.showInsert(this@WifiActivity, false, object : AdsShowCallBack() { AdsMgr.showInsert(this@WifiActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) { override fun close(where: Int) {
finishToMainTop() finishToMainTop()
...@@ -67,6 +69,9 @@ class WifiActivity : BaseActivity<ActivityWifiBinding>(ActivityWifiBinding::infl ...@@ -67,6 +69,9 @@ class WifiActivity : BaseActivity<ActivityWifiBinding>(ActivityWifiBinding::infl
finishToMainTop() finishToMainTop()
} }
}) })
}else{
finishToMainTop()
}
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -11,6 +11,7 @@ import com.base.scanqr.base.BaseActivity ...@@ -11,6 +11,7 @@ import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.FunctionUIBean import com.base.scanqr.bean.FunctionUIBean
import com.base.scanqr.bean.WifiUIBean import com.base.scanqr.bean.WifiUIBean
import com.base.scanqr.bean.WifiUIBean.Companion.createWifiQRString import com.base.scanqr.bean.WifiUIBean.Companion.createWifiQRString
import com.base.scanqr.bean.config.AdConfigBean
import com.base.scanqr.databinding.ActivityWifiCodeBinding import com.base.scanqr.databinding.ActivityWifiCodeBinding
import com.base.scanqr.ui.vm.QrViewModel import com.base.scanqr.ui.vm.QrViewModel
import com.base.scanqr.ui.widget.InputNameDialog.showInputNameDialog import com.base.scanqr.ui.widget.InputNameDialog.showInputNameDialog
...@@ -97,6 +98,7 @@ class WifiCodeActivity : BaseActivity<ActivityWifiCodeBinding>(ActivityWifiCodeB ...@@ -97,6 +98,7 @@ class WifiCodeActivity : BaseActivity<ActivityWifiCodeBinding>(ActivityWifiCodeB
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
if (AdConfigBean.adsConfigBean.functionBackShowAd) {
AdsMgr.showInsert(this@WifiCodeActivity, false, object : AdsShowCallBack() { AdsMgr.showInsert(this@WifiCodeActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) { override fun close(where: Int) {
finishToMainTop() finishToMainTop()
...@@ -111,6 +113,9 @@ class WifiCodeActivity : BaseActivity<ActivityWifiCodeBinding>(ActivityWifiCodeB ...@@ -111,6 +113,9 @@ class WifiCodeActivity : BaseActivity<ActivityWifiCodeBinding>(ActivityWifiCodeB
finishToMainTop() finishToMainTop()
} }
}) })
} else {
finishToMainTop()
}
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
This image diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment