Commit 965af066 authored by wanglei's avatar wanglei

..

parent e1bb2fc2
This diff is collapsed.
...@@ -12,16 +12,20 @@ import com.base.scanqrclear.qr.CameraUtils ...@@ -12,16 +12,20 @@ import com.base.scanqrclear.qr.CameraUtils
*Create by SleepDog on 2025-01-20 *Create by SleepDog on 2025-01-20
*/ */
class ScanAc : BaseActivity<ActivityScanBinding>(ActivityScanBinding::inflate) { class ScanAc : BaseActivity<ActivityScanBinding>(ActivityScanBinding::inflate) {
var cameraUtils: CameraUtils? = null
private var isPopupIn = false//通知进来的
var cameraUtils: CameraUtils? = null
override fun initView() { override fun initView() {
super.initView() super.initView()
cameraUtils = CameraUtils(this) cameraUtils = CameraUtils(this)
isPopupIn = intent.extras?.getBoolean("isPopupIn", false) ?: false
} }
override fun onResumeOneShoot() { override fun onResumeOneShoot() {
super.onResumeOneShoot() super.onResumeOneShoot()
if (AdConfigBean.adsConfigBean.functionInShowAd) { if (AdConfigBean.adsConfigBean.functionInShowAd) {
if (isPopupIn) return
AdsMgr.showInsert(this, false, object : AdsShowCallBack() { AdsMgr.showInsert(this, false, object : AdsShowCallBack() {
override fun close(where: Int) { override fun close(where: Int) {
} }
......
...@@ -163,7 +163,9 @@ class StartActivity : BaseActivity<ActivityStartBinding>(ActivityStartBinding::i ...@@ -163,7 +163,9 @@ class StartActivity : BaseActivity<ActivityStartBinding>(ActivityStartBinding::i
// addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT) // addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
// }) // })
startActivity(Intent(this, ScanAc::class.java)) startActivity(Intent(this, ScanAc::class.java).apply {
putExtra("isPopupIn", true)
})
} }
ACTION_ID_WIFI -> { ACTION_ID_WIFI -> {
......
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