Commit 9476ff70 authored by wanglei's avatar wanglei

...

parent 2c43eff5
...@@ -18,6 +18,7 @@ import com.base.datarecovery.databinding.ActivityAppManagerBinding ...@@ -18,6 +18,7 @@ import com.base.datarecovery.databinding.ActivityAppManagerBinding
import com.base.datarecovery.help.BaseActivity import com.base.datarecovery.help.BaseActivity
import com.base.datarecovery.utils.BarUtils import com.base.datarecovery.utils.BarUtils
import com.base.datarecovery.utils.RamUtils.ramPair import com.base.datarecovery.utils.RamUtils.ramPair
import com.base.datarecovery.view.DialogViews.showExitFunctionDialog
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
...@@ -79,7 +80,16 @@ class AppManagerActivity : BaseActivity<ActivityAppManagerBinding>() { ...@@ -79,7 +80,16 @@ class AppManagerActivity : BaseActivity<ActivityAppManagerBinding>() {
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
finishToMain() showExitFunctionDialog{showAd ->
if (showAd){
AdmobMaxHelper.admobMaxShowInterstitialAd(this@AppManagerActivity, isLoading = false) {
finishToMain()
}
}else{
finishToMain()
}
}
} }
binding.flFanhui.setOnClickListener { binding.flFanhui.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -14,6 +14,7 @@ import androidx.core.view.updatePadding ...@@ -14,6 +14,7 @@ import androidx.core.view.updatePadding
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.base.datarecovery.adapter.AppManagerAdapter import com.base.datarecovery.adapter.AppManagerAdapter
import com.base.datarecovery.ads.AdmobMaxHelper import com.base.datarecovery.ads.AdmobMaxHelper
import com.base.datarecovery.ads.AdmobMaxHelper.showBackInterAdSp
import com.base.datarecovery.bean.AppBean import com.base.datarecovery.bean.AppBean
import com.base.datarecovery.databinding.ActivityAppProcessBinding import com.base.datarecovery.databinding.ActivityAppProcessBinding
import com.base.datarecovery.help.BaseActivity import com.base.datarecovery.help.BaseActivity
...@@ -64,7 +65,13 @@ class AppProcessActivity : BaseActivity<ActivityAppProcessBinding>() { ...@@ -64,7 +65,13 @@ class AppProcessActivity : BaseActivity<ActivityAppProcessBinding>() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
showAppProcessExitDialog(ePercent) { showAppProcessExitDialog(ePercent) {
finishToMain() if (showBackInterAdSp()) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this@AppProcessActivity, false) {
finishToMain()
}
} else {
finishToMain()
}
} }
} }
binding.flFanhui.setOnClickListener { binding.flFanhui.setOnClickListener {
......
...@@ -14,6 +14,7 @@ import com.base.datarecovery.databinding.ActivityBatteryBinding ...@@ -14,6 +14,7 @@ import com.base.datarecovery.databinding.ActivityBatteryBinding
import com.base.datarecovery.help.BaseActivity import com.base.datarecovery.help.BaseActivity
import com.base.datarecovery.receiver.BatteryReceiver import com.base.datarecovery.receiver.BatteryReceiver
import com.base.datarecovery.utils.BarUtils import com.base.datarecovery.utils.BarUtils
import com.base.datarecovery.view.DialogViews.showExitFunctionDialog
import kotlin.math.abs import kotlin.math.abs
...@@ -62,7 +63,15 @@ class BatteryActivity : BaseActivity<ActivityBatteryBinding>() { ...@@ -62,7 +63,15 @@ class BatteryActivity : BaseActivity<ActivityBatteryBinding>() {
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
finishToMain() showExitFunctionDialog { showAd ->
if (showAd) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this@BatteryActivity) {
finishToMain()
}
} else {
finishToMain()
}
}
} }
binding.flFanhui.setOnClickListener { binding.flFanhui.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -9,7 +9,7 @@ import androidx.core.view.updatePadding ...@@ -9,7 +9,7 @@ import androidx.core.view.updatePadding
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.base.datarecovery.adapter.MediaAdapter import com.base.datarecovery.adapter.MediaAdapter
import com.base.datarecovery.ads.AdmobMaxHelper import com.base.datarecovery.ads.AdmobMaxHelper
import com.base.datarecovery.ads.admob.AdmobInterstitialUtils.showDeleteInterAdSp import com.base.datarecovery.ads.AdmobMaxHelper.showDeleteAdSp
import com.base.datarecovery.bean.MediaBean import com.base.datarecovery.bean.MediaBean
import com.base.datarecovery.bean.MediaTimeBean import com.base.datarecovery.bean.MediaTimeBean
import com.base.datarecovery.databinding.ActivityRepeatBinding import com.base.datarecovery.databinding.ActivityRepeatBinding
...@@ -99,7 +99,7 @@ class RepeatActivity : BaseActivity<ActivityRepeatBinding>() { ...@@ -99,7 +99,7 @@ class RepeatActivity : BaseActivity<ActivityRepeatBinding>() {
} }
binding.tvClean.setOnClickListener { binding.tvClean.setOnClickListener {
showDeletePermanentlyDialog { showDeletePermanentlyDialog {
if (showDeleteInterAdSp()) { if (showDeleteAdSp()) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this@RepeatActivity,false) { AdmobMaxHelper.admobMaxShowInterstitialAd(this@RepeatActivity,false) {
cleanFile() cleanFile()
} }
......
...@@ -9,7 +9,7 @@ import androidx.core.view.updatePadding ...@@ -9,7 +9,7 @@ import androidx.core.view.updatePadding
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.base.datarecovery.adapter.ScreenShotAdapter import com.base.datarecovery.adapter.ScreenShotAdapter
import com.base.datarecovery.ads.AdmobMaxHelper import com.base.datarecovery.ads.AdmobMaxHelper
import com.base.datarecovery.ads.admob.AdmobInterstitialUtils.showDeleteInterAdSp import com.base.datarecovery.ads.AdmobMaxHelper.showDeleteAdSp
import com.base.datarecovery.bean.ScreenPhotoBean import com.base.datarecovery.bean.ScreenPhotoBean
import com.base.datarecovery.bean.ScreenshotBean import com.base.datarecovery.bean.ScreenshotBean
import com.base.datarecovery.databinding.ActivityScreenShotBinding import com.base.datarecovery.databinding.ActivityScreenShotBinding
...@@ -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,false) { AdmobMaxHelper.admobMaxShowInterstitialAd(this@ScreenShotActivity, false) {
finishToMain() finishToMain()
} }
} else { } else {
...@@ -122,8 +122,8 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() { ...@@ -122,8 +122,8 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() {
binding.tvClean.setOnClickListener { binding.tvClean.setOnClickListener {
showDeletePermanentlyDialog { showDeletePermanentlyDialog {
if (showDeleteInterAdSp()) { if (showDeleteAdSp()) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this,false) { AdmobMaxHelper.admobMaxShowInterstitialAd(this, false) {
cleanFile() cleanFile()
} }
} else { } else {
......
...@@ -25,6 +25,28 @@ object AdmobMaxHelper { ...@@ -25,6 +25,28 @@ object AdmobMaxHelper {
var isAdInit = AtomicBoolean(false) var isAdInit = AtomicBoolean(false)
fun haveSpAdmobTrueMaxFalse(): Boolean {
return AppPreferences.getInstance().getString("admobTrueMaxFalse", "-1").toInt() != -1
}
private fun getSpAdmobTrueMaxFalse(): Boolean {
val ss = AppPreferences.getInstance().getString("admobTrueMaxFalse", "0").toInt()
return ss == 1
}
fun showBackInterAdSp(): Boolean {
val isShowBackIntAd = AppPreferences.getInstance().getString("isShowBackIntAd", "0").toInt()
//1要看插屏 0不看
return isShowBackIntAd == 1
}
fun showDeleteAdSp(): Boolean {
val isDeleteInterAd = AppPreferences.getInstance().getString("isDeleteInterAd", "0").toInt()
//1要看插屏 0不看
return isDeleteInterAd == 1
}
fun isOpenAdLoaded(): Boolean { fun isOpenAdLoaded(): Boolean {
return if (getSpAdmobTrueMaxFalse()) { return if (getSpAdmobTrueMaxFalse()) {
AdmobOpenUtils.isOpenAdLoaded() AdmobOpenUtils.isOpenAdLoaded()
...@@ -101,14 +123,6 @@ object AdmobMaxHelper { ...@@ -101,14 +123,6 @@ object AdmobMaxHelper {
} }
} }
private fun getSpAdmobTrueMaxFalse(): Boolean {
val ss = AppPreferences.getInstance().getString("admobTrueMaxFalse", "0").toInt()
return ss == 1
}
fun haveSpAdmobTrueMaxFalse(): Boolean {
return AppPreferences.getInstance().getString("admobTrueMaxFalse", "-1").toInt() != -1
}
fun initAdmobMaxAd(activity: Activity? = null) { fun initAdmobMaxAd(activity: Activity? = null) {
if (isBlack) { if (isBlack) {
......
...@@ -40,12 +40,6 @@ object AdmobInterstitialUtils { ...@@ -40,12 +40,6 @@ object AdmobInterstitialUtils {
return System.currentTimeMillis() - interLoadTime > 1000 * 60 * 60 return System.currentTimeMillis() - interLoadTime > 1000 * 60 * 60
} }
fun showDeleteInterAdSp(): Boolean {
val isDeleteInterAd = AppPreferences.getInstance().getString("isDeleteInterAd", "0").toInt()
//1要看插屏 0不看
return isDeleteInterAd == 1
}
fun showInterstitialAd( fun showInterstitialAd(
activity: Activity, activity: Activity,
isReLoadAd: Boolean = false, isReLoadAd: Boolean = false,
......
...@@ -19,7 +19,7 @@ import androidx.constraintlayout.widget.ConstraintLayout ...@@ -19,7 +19,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
import androidx.lifecycle.LifecycleCoroutineScope import androidx.lifecycle.LifecycleCoroutineScope
import com.base.datarecovery.R import com.base.datarecovery.R
import com.base.datarecovery.activity.junkclean.ScanJunkActivity import com.base.datarecovery.activity.junkclean.ScanJunkActivity
import com.base.datarecovery.ads.admob.AdmobInterstitialUtils.showDeleteInterAdSp import com.base.datarecovery.ads.AdmobMaxHelper
import com.base.datarecovery.bean.ConstObject.SELECT_FILE_ALL import com.base.datarecovery.bean.ConstObject.SELECT_FILE_ALL
import com.base.datarecovery.bean.ConstObject.SELECT_FILE_AUDIO import com.base.datarecovery.bean.ConstObject.SELECT_FILE_AUDIO
import com.base.datarecovery.bean.ConstObject.SELECT_FILE_DOCUMENT import com.base.datarecovery.bean.ConstObject.SELECT_FILE_DOCUMENT
...@@ -267,7 +267,7 @@ object DialogViews { ...@@ -267,7 +267,7 @@ object DialogViews {
exitAction: (showAd: Boolean) -> Unit exitAction: (showAd: Boolean) -> Unit
) { ) {
if (!mustShow) { if (!mustShow) {
if (!showDeleteInterAdSp()) { if (!AdmobMaxHelper.showBackInterAdSp()) {
exitAction.invoke(false) exitAction.invoke(false)
return return
} }
......
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