Commit c1a10907 authored by wanglei's avatar wanglei

...

parent 58f4fba3
...@@ -135,7 +135,7 @@ class ResultActivity : BaseActivity<ActivityLayoutResultBinding>() { ...@@ -135,7 +135,7 @@ class ResultActivity : BaseActivity<ActivityLayoutResultBinding>() {
val s = AppPreferences.getInstance().getString("isShowBackIntAd", "0").toIntOrNull() val s = AppPreferences.getInstance().getString("isShowBackIntAd", "0").toIntOrNull()
?: 0 ?: 0
if (s == 1) { if (s == 1) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this@ResultActivity) { AdmobMaxHelper.admobMaxShowInterstitialAd(this@ResultActivity, isLoading = false) {
finishToMain() finishToMain()
} }
} else { } else {
......
...@@ -43,6 +43,7 @@ import com.base.filerecoveryrecyclebin.service.StayNotificationService.Companion ...@@ -43,6 +43,7 @@ import com.base.filerecoveryrecyclebin.service.StayNotificationService.Companion
import com.base.filerecoveryrecyclebin.utils.AppPreferences import com.base.filerecoveryrecyclebin.utils.AppPreferences
import com.base.filerecoveryrecyclebin.utils.BarUtils import com.base.filerecoveryrecyclebin.utils.BarUtils
import com.base.filerecoveryrecyclebin.utils.LogEx import com.base.filerecoveryrecyclebin.utils.LogEx
import com.ironsource.mediationsdk.f
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.cancel import kotlinx.coroutines.cancel
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
...@@ -255,7 +256,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>() { ...@@ -255,7 +256,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>() {
}, onHidden = { }, onHidden = {
val sp = AppPreferences.getInstance().getString("splashShowInter", "0").toInt() val sp = AppPreferences.getInstance().getString("splashShowInter", "0").toInt()
if (sp == 1 && !loaded) { if (sp == 1 && !loaded) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this) { AdmobMaxHelper.admobMaxShowInterstitialAd(this, isLoading = false) {
binding.pb.progress = 100 binding.pb.progress = 100
jumpNext() jumpNext()
} }
......
...@@ -46,7 +46,7 @@ class AppManagerActivity : BaseActivity<ActivityAppManagerBinding>() { ...@@ -46,7 +46,7 @@ class AppManagerActivity : BaseActivity<ActivityAppManagerBinding>() {
adapter = AppManagerAdapter(true) { pkg -> adapter = AppManagerAdapter(true) { pkg ->
if (uninstallTimes % 3 == 0 && uninstallTimes > 0) { if (uninstallTimes % 3 == 0 && uninstallTimes > 0) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this) { unInstall(pkg) } AdmobMaxHelper.admobMaxShowInterstitialAd(this, isLoading = false) { unInstall(pkg) }
} else { } else {
unInstall(pkg) unInstall(pkg)
} }
......
...@@ -94,7 +94,7 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() { ...@@ -94,7 +94,7 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
override fun handleOnBackPressed() { override fun handleOnBackPressed() {
showExitFunctionDialog { showExitFunctionDialog {
if (it) { if (it) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this@CleanJunkActivity) { AdmobMaxHelper.admobMaxShowInterstitialAd(this@CleanJunkActivity, isLoading = false) {
finishToMain() finishToMain()
} }
} else { } else {
......
...@@ -26,6 +26,7 @@ import com.base.filerecoveryrecyclebin.view.DialogViews.showDeletePermanentlyDia ...@@ -26,6 +26,7 @@ import com.base.filerecoveryrecyclebin.view.DialogViews.showDeletePermanentlyDia
import com.base.filerecoveryrecyclebin.view.DialogViews.showExitFunctionDialog import com.base.filerecoveryrecyclebin.view.DialogViews.showExitFunctionDialog
import com.base.filerecoveryrecyclebin.view.DialogViews.showGerPermission import com.base.filerecoveryrecyclebin.view.DialogViews.showGerPermission
import com.base.filerecoveryrecyclebin.view.DialogViews.showLargeFileTypeDialog import com.base.filerecoveryrecyclebin.view.DialogViews.showLargeFileTypeDialog
import com.ironsource.mediationsdk.f
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
...@@ -75,7 +76,7 @@ class LargeFileActivity : BaseActivity<ActivityLargeFileBinding>() { ...@@ -75,7 +76,7 @@ class LargeFileActivity : BaseActivity<ActivityLargeFileBinding>() {
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
showExitFunctionDialog { show -> showExitFunctionDialog { show ->
if (show) { if (show) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this@LargeFileActivity) { AdmobMaxHelper.admobMaxShowInterstitialAd(this@LargeFileActivity, isLoading = false) {
finishToMain() finishToMain()
} }
} else { } else {
......
...@@ -14,6 +14,7 @@ import com.base.filerecoveryrecyclebin.bean.FolderBean ...@@ -14,6 +14,7 @@ import com.base.filerecoveryrecyclebin.bean.FolderBean
import com.base.filerecoveryrecyclebin.databinding.ActivityFileRecoveredBinding import com.base.filerecoveryrecyclebin.databinding.ActivityFileRecoveredBinding
import com.base.filerecoveryrecyclebin.help.BaseActivity import com.base.filerecoveryrecyclebin.help.BaseActivity
import com.base.filerecoveryrecyclebin.utils.BarUtils import com.base.filerecoveryrecyclebin.utils.BarUtils
import com.ironsource.mediationsdk.f
import java.io.File import java.io.File
class FileRecoveredActivity : BaseActivity<ActivityFileRecoveredBinding>() { class FileRecoveredActivity : BaseActivity<ActivityFileRecoveredBinding>() {
...@@ -54,12 +55,12 @@ class FileRecoveredActivity : BaseActivity<ActivityFileRecoveredBinding>() { ...@@ -54,12 +55,12 @@ class FileRecoveredActivity : BaseActivity<ActivityFileRecoveredBinding>() {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
} }
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
AdmobMaxHelper.admobMaxShowInterstitialAd(this@FileRecoveredActivity) { AdmobMaxHelper.admobMaxShowInterstitialAd(this@FileRecoveredActivity, isLoading = false) {
finishToMain() finishToMain()
} }
} }
binding.tvContinue.setOnClickListener { binding.tvContinue.setOnClickListener {
AdmobMaxHelper.admobMaxShowInterstitialAd(this) { AdmobMaxHelper.admobMaxShowInterstitialAd(this, isLoading = false) {
finish() finish()
} }
} }
......
...@@ -31,6 +31,7 @@ import com.base.filerecoveryrecyclebin.view.DialogViews.showExitFunctionDialog ...@@ -31,6 +31,7 @@ import com.base.filerecoveryrecyclebin.view.DialogViews.showExitFunctionDialog
import com.base.filerecoveryrecyclebin.view.DialogViews.showGerPermission import com.base.filerecoveryrecyclebin.view.DialogViews.showGerPermission
import com.base.filerecoveryrecyclebin.view.FileScanDialog import com.base.filerecoveryrecyclebin.view.FileScanDialog
import com.google.gson.Gson import com.google.gson.Gson
import com.ironsource.mediationsdk.f
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.channels.BufferOverflow
import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableSharedFlow
...@@ -109,7 +110,7 @@ class FileScanResultActivity : BaseActivity<ActivityFileScanResultBinding>() { ...@@ -109,7 +110,7 @@ class FileScanResultActivity : BaseActivity<ActivityFileScanResultBinding>() {
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
showExitFunctionDialog { showExitFunctionDialog {
if (it) { if (it) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this@FileScanResultActivity) { AdmobMaxHelper.admobMaxShowInterstitialAd(this@FileScanResultActivity, isLoading = false) {
finishToMain() finishToMain()
} }
} else { } else {
...@@ -171,7 +172,7 @@ class FileScanResultActivity : BaseActivity<ActivityFileScanResultBinding>() { ...@@ -171,7 +172,7 @@ class FileScanResultActivity : BaseActivity<ActivityFileScanResultBinding>() {
binding.ivWancheng.visibility = View.VISIBLE binding.ivWancheng.visibility = View.VISIBLE
binding.tvScanning.text = "Completed" binding.tvScanning.text = "Completed"
lifecycleScope.launchWhenResumed { lifecycleScope.launchWhenResumed {
AdmobMaxHelper.admobMaxShowInterstitialAd(this@FileScanResultActivity) AdmobMaxHelper.admobMaxShowInterstitialAd(this@FileScanResultActivity, isLoading = false)
} }
binding.flEmpty.isVisible = pathList.isEmpty() binding.flEmpty.isVisible = pathList.isEmpty()
setAdapterData(null) setAdapterData(null)
......
...@@ -104,7 +104,7 @@ class RepeatActivity : BaseActivity<ActivityRepeatBinding>() { ...@@ -104,7 +104,7 @@ class RepeatActivity : BaseActivity<ActivityRepeatBinding>() {
binding.tvClean.setOnClickListener { binding.tvClean.setOnClickListener {
showDeletePermanentlyDialog { showDeletePermanentlyDialog {
if (showInterAdSp()) { if (showInterAdSp()) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this) { AdmobMaxHelper.admobMaxShowInterstitialAd(this, isLoading = false) {
cleanFile() cleanFile()
} }
} else { } else {
......
...@@ -102,7 +102,7 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() { ...@@ -102,7 +102,7 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() {
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
showExitFunctionDialog { showExitFunctionDialog {
if (it) { if (it) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this@ScreenShotActivity) { AdmobMaxHelper.admobMaxShowInterstitialAd(this@ScreenShotActivity, isLoading = false) {
finishToMain() finishToMain()
} }
} else { } else {
...@@ -123,7 +123,7 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() { ...@@ -123,7 +123,7 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() {
showDeletePermanentlyDialog { showDeletePermanentlyDialog {
if (showInterAdSp()) { if (showInterAdSp()) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this) { AdmobMaxHelper.admobMaxShowInterstitialAd(this, isLoading = false) {
cleanFile() cleanFile()
} }
} else { } else {
......
...@@ -72,7 +72,7 @@ class WhatsAppMessageCleanActivity : BaseActivity<ActivityWhatsAppMessageCleanBi ...@@ -72,7 +72,7 @@ class WhatsAppMessageCleanActivity : BaseActivity<ActivityWhatsAppMessageCleanBi
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
showExitFunctionDialog { showAd -> showExitFunctionDialog { showAd ->
if (showAd) { if (showAd) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this@WhatsAppMessageCleanActivity) { AdmobMaxHelper.admobMaxShowInterstitialAd(this@WhatsAppMessageCleanActivity, isLoading = false) {
finishToMain() finishToMain()
} }
} else { } else {
......
...@@ -63,14 +63,14 @@ object AdmobMaxHelper { ...@@ -63,14 +63,14 @@ object AdmobMaxHelper {
} }
//展示广告关闭时赋值 //展示广告关闭时赋值
var lastShowedOnHiddenTime = 0 var lastShowedOnHiddenTime = 0L
fun admobMaxShowInterstitialAd(activity: Activity, onHidden: (() -> Unit)? = null) { fun admobMaxShowInterstitialAd(activity: Activity, isLoading: Boolean = true, onHidden: (() -> Unit)? = null) {
if (isBlack) { if (isBlack) {
onHidden?.invoke() onHidden?.invoke()
return return
} }
val isShowLoadingAd = AppPreferences.getInstance().getString("isShowLoadingAd", "0").toInt() val isShowLoadingAd = AppPreferences.getInstance().getString("isShowLoadingAd", "0").toInt()
if (isShowLoadingAd == 0) { if (isShowLoadingAd == 0 && isLoading) {
onHidden?.invoke() onHidden?.invoke()
return return
} }
......
...@@ -58,7 +58,7 @@ class GuideFragment constructor() : BaseFragment<FragmentGuideBinding>() { ...@@ -58,7 +58,7 @@ class GuideFragment constructor() : BaseFragment<FragmentGuideBinding>() {
val showAd = AppPreferences.getInstance().getString("isShowGuideAd", "0")?.toInt() val showAd = AppPreferences.getInstance().getString("isShowGuideAd", "0")?.toInt()
LogEx.logDebug(TAG, "showAd=$showAd") LogEx.logDebug(TAG, "showAd=$showAd")
if (showAd == 1) { if (showAd == 1) {
AdmobMaxHelper.admobMaxShowInterstitialAd(requireActivity()) { AdmobMaxHelper.admobMaxShowInterstitialAd(requireActivity(), isLoading = false) {
startActivity(Intent(requireContext(), MainActivity::class.java)) startActivity(Intent(requireContext(), MainActivity::class.java))
requireActivity().finish() requireActivity().finish()
} }
......
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