Commit 30469ac7 authored by wanglei's avatar wanglei

...

parent 58e3f743
...@@ -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.showInterAdSp import com.base.datarecovery.ads.admob.AdmobInterstitialUtils.showDeleteInterAdSp
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,9 +99,9 @@ class RepeatActivity : BaseActivity<ActivityRepeatBinding>() { ...@@ -99,9 +99,9 @@ class RepeatActivity : BaseActivity<ActivityRepeatBinding>() {
} }
binding.tvClean.setOnClickListener { binding.tvClean.setOnClickListener {
showDeletePermanentlyDialog { showDeletePermanentlyDialog {
if (showInterAdSp()) { if (showDeleteInterAdSp()) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this@RepeatActivity) { AdmobMaxHelper.admobMaxShowInterstitialAd(this@RepeatActivity) {
finishToMain() cleanFile()
} }
} else { } else {
cleanFile() cleanFile()
......
...@@ -9,9 +9,7 @@ import androidx.core.view.updatePadding ...@@ -9,9 +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 import com.base.datarecovery.ads.admob.AdmobInterstitialUtils.showDeleteInterAdSp
import com.base.datarecovery.ads.admob.AdmobInterstitialUtils.showInterAdSp
import com.base.datarecovery.ads.admob.AdmobNativeUtils
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
...@@ -25,7 +23,6 @@ import com.base.datarecovery.utils.BarUtils ...@@ -25,7 +23,6 @@ import com.base.datarecovery.utils.BarUtils
import com.base.datarecovery.view.DialogViews.showDeletePermanentlyDialog import com.base.datarecovery.view.DialogViews.showDeletePermanentlyDialog
import com.base.datarecovery.view.DialogViews.showExitFunctionDialog import com.base.datarecovery.view.DialogViews.showExitFunctionDialog
import com.base.datarecovery.view.DialogViews.showGerPermission import com.base.datarecovery.view.DialogViews.showGerPermission
import com.facebook.ads.Ad
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async import kotlinx.coroutines.async
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
...@@ -125,7 +122,7 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() { ...@@ -125,7 +122,7 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() {
binding.tvClean.setOnClickListener { binding.tvClean.setOnClickListener {
showDeletePermanentlyDialog { showDeletePermanentlyDialog {
if (showInterAdSp()) { if (showDeleteInterAdSp()) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this) { AdmobMaxHelper.admobMaxShowInterstitialAd(this) {
cleanFile() cleanFile()
} }
......
...@@ -39,7 +39,7 @@ object AdmobInterstitialUtils { ...@@ -39,7 +39,7 @@ object AdmobInterstitialUtils {
return System.currentTimeMillis() - interLoadTime > 1000 * 60 * 60 return System.currentTimeMillis() - interLoadTime > 1000 * 60 * 60
} }
fun showInterAdSp(): Boolean { fun showDeleteInterAdSp(): Boolean {
val isDeleteInterAd = AppPreferences.getInstance().getString("isDeleteInterAd", "0").toInt() val isDeleteInterAd = AppPreferences.getInstance().getString("isDeleteInterAd", "0").toInt()
//1要看插屏 0不看 //1要看插屏 0不看
return isDeleteInterAd == 1 return isDeleteInterAd == 1
......
...@@ -15,22 +15,11 @@ import android.view.Gravity ...@@ -15,22 +15,11 @@ import android.view.Gravity
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.WindowManager import android.view.WindowManager
import android.widget.FrameLayout
import android.widget.ImageView
import android.widget.TextView
import androidx.constraintlayout.widget.ConstraintLayout 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.AdmobMaxHelper import com.base.datarecovery.ads.admob.AdmobInterstitialUtils.showDeleteInterAdSp
import com.base.datarecovery.ads.admob.AdmobInterstitialUtils.showInterAdSp
import com.base.datarecovery.bean.ConstObject.JUNK_CLEANER
import com.base.datarecovery.bean.ConstObject.PRIVACY_SPACE
import com.base.datarecovery.bean.ConstObject.RECOVERY_DOCUMENTS
import com.base.datarecovery.bean.ConstObject.RECOVERY_PHOTOS
import com.base.datarecovery.bean.ConstObject.RECOVERY_VIDEOS
import com.base.datarecovery.bean.ConstObject.REPEAT_PHOTOS
import com.base.datarecovery.bean.ConstObject.SCREENSHOT_CLEANER
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
...@@ -44,14 +33,10 @@ import com.base.datarecovery.databinding.DialogExitAppBinding ...@@ -44,14 +33,10 @@ import com.base.datarecovery.databinding.DialogExitAppBinding
import com.base.datarecovery.databinding.DialogExitFunctionBinding import com.base.datarecovery.databinding.DialogExitFunctionBinding
import com.base.datarecovery.databinding.DialogImageTakeBinding import com.base.datarecovery.databinding.DialogImageTakeBinding
import com.base.datarecovery.databinding.DialogLargeFileTypeBinding import com.base.datarecovery.databinding.DialogLargeFileTypeBinding
import com.base.datarecovery.databinding.DialogPermissionBottomsheetBinding
import com.base.datarecovery.databinding.DialogPermissonOpenBinding import com.base.datarecovery.databinding.DialogPermissonOpenBinding
import com.base.datarecovery.databinding.DialogRecoveringBinding import com.base.datarecovery.databinding.DialogRecoveringBinding
import com.base.datarecovery.databinding.DialogRemoveFileTipBinding import com.base.datarecovery.databinding.DialogRemoveFileTipBinding
import com.base.datarecovery.utils.AppPreferences
import com.base.datarecovery.utils.LogEx import com.base.datarecovery.utils.LogEx
import com.base.datarecovery.view.DialogViews.showExitDialog
import com.base.datarecovery.view.PermissionDialog.showPermissionBottomSheet
import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialog
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
...@@ -282,7 +267,7 @@ object DialogViews { ...@@ -282,7 +267,7 @@ object DialogViews {
exitAction: (showAd: Boolean) -> Unit exitAction: (showAd: Boolean) -> Unit
) { ) {
if (!mustShow) { if (!mustShow) {
if (!showInterAdSp()) { if (!showDeleteInterAdSp()) {
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