修改需求

app/src/main/AndroidManifest.xml

@@ -148,7 +148,7 @@
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
-        <activity android:name=".activity.scanjunk.PrepareScanAt"
+        <activity android:name=".activity.scanjunk.PrepareScanAt2"
             android:screenOrientation="portrait"/>
         <activity
             android:name=".activity.batteryinfo.BatteryInfoActivity"

app/src/main/java/com/test/easy/easycleanerjunk/activity/ResultActivity.kt

@@ -151,7 +151,7 @@ class ResultActivity : BaseActivity<ActivityLayoutResultBinding>() {
             onBackPressedDispatcher.onBackPressed()
         }
         val ss = SPUtils.getInstance().getInt("isShowResultNaAd", 0)
-        if (ss == 1) {
+        if (ss == 0) {
             binding.flAd.visibility = View.VISIBLE
             if(ConfigHelper.admobTrueMaxFlase==0){
                 MaxAdUtils.showNativeAd(this@ResultActivity, binding.flAd)

app/src/main/java/com/test/easy/easycleanerjunk/activity/scanjunk/CleanJunkActivity.kt

@@ -5,6 +5,7 @@ import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.Color
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.view.animation.LinearInterpolator
@@ -133,12 +134,14 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
         })
         binding.idClBtn.setOnClickListener {
             if (binding.idClBtn.text == "Got it") {
+                Log.e("MXL", "initListener: ", )
                 if(ConfigHelper.admobTrueMaxFlase==0){
                     MaxAdUtils.showInterstitialAd(this){
                         startActivity(Intent(this@CleanJunkActivity, ResultActivity::class.java).apply {
                             putExtra("clean_size", 0)
                             putExtra("from", AFunOb.JUNK_CLEANER)
                         })
+                        finish()
                     }
                 }else{
                     AdmobUtils.showInterstitialAd(this){
@@ -146,6 +149,7 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
                             putExtra("clean_size", 0)
                             putExtra("from", AFunOb.JUNK_CLEANER)
                         })
+                        finish()
                     }
                 }
             } else {
@@ -156,6 +160,7 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
                                 .putExtra("list", selectList.toTypedArray())
                                 .putExtra("size", selectSize)
                         )
+                        finish()
                     }
                 }else{
                     AdmobUtils.showInterstitialAd(this){
@@ -164,11 +169,12 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
                                 .putExtra("list", selectList.toTypedArray())
                                 .putExtra("size", selectSize)
                         )
+                        finish()
                     }
                 }
 
             }
-            finish()
+
         }
     }
 

app/src/main/java/com/test/easy/easycleanerjunk/activity/scanjunk/PrepareScanAt.kt → app/src/main/java/com/test/easy/easycleanerjunk/activity/scanjunk/PrepareScanAt2.kt

@@ -2,7 +2,6 @@ package com.test.easy.easycleanerjunk.activity.scanjunk
 
 import android.content.Intent
 import android.graphics.Color
-import android.util.Log
 import android.view.View
 import android.widget.Toast
 import androidx.activity.addCallback
@@ -21,7 +20,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
-class PrepareScanAt: BaseActivity<ActivityLayoutParepreScanBinding>() {
+class PrepareScanAt2: BaseActivity<ActivityLayoutParepreScanBinding>() {
 
     override val binding: ActivityLayoutParepreScanBinding by lazy {
         ActivityLayoutParepreScanBinding.inflate(layoutInflater)
@@ -44,7 +43,7 @@ class PrepareScanAt: BaseActivity<ActivityLayoutParepreScanBinding>() {
 //            }
 //        })
         onBackPressedDispatcher.addCallback {
-            Toast.makeText(this@PrepareScanAt, "wait a moment", Toast.LENGTH_SHORT).show()
+            Toast.makeText(this@PrepareScanAt2, "wait a moment", Toast.LENGTH_SHORT).show()
         }
 
         // requestPermisson()
@@ -73,11 +72,8 @@ class PrepareScanAt: BaseActivity<ActivityLayoutParepreScanBinding>() {
 
     override fun onResume() {
         super.onResume()
-        if (checkStorePermission()) {
-            resumeLottie()
-            job = waitJob()
-        }
-
+        resumeLottie()
+        job = waitJob()
     }
 
     private fun resumeLottie() {
@@ -88,13 +84,6 @@ class PrepareScanAt: BaseActivity<ActivityLayoutParepreScanBinding>() {
     }
     var isPlayAd=false
     private fun waitJob() = lifecycleScope.launch(Dispatchers.Main) {
-        Log.e("MXL", "waitJob: "+1111 )
-        delay(5000)
-        binding.lottie.visibility = View.GONE
-        binding.lottieCompleted.visibility = View.VISIBLE
-        binding.lottieCompleted.playAnimation()
-        binding.idTv.text = "Completed!"
-        delay(1000)
         if(isPlayAd){
             if (!checkStorePermission()) {
                 showGerPermission(
@@ -102,7 +91,7 @@ class PrepareScanAt: BaseActivity<ActivityLayoutParepreScanBinding>() {
                     allow = {
                         requestStorePermission(launcher, result = {
                             if (it) {
-                                startActivity(Intent(this@PrepareScanAt, CleanJunkActivity::class.java))
+                                startActivity(Intent(this@PrepareScanAt2, CleanJunkActivity::class.java))
                                 finish()
                             } else {
                                 finishToMain()
@@ -111,15 +100,21 @@ class PrepareScanAt: BaseActivity<ActivityLayoutParepreScanBinding>() {
                     })
             }
         }else{
-            AdsUtils.showInterAds(this@PrepareScanAt){
-                isPlayAd=true
+            delay(5000)
+            binding.lottie.visibility = View.GONE
+            binding.lottieCompleted.visibility = View.VISIBLE
+            binding.lottieCompleted.playAnimation()
+            binding.idTv.text = "Completed!"
+            delay(1000)
+            isPlayAd=true
+            AdsUtils.showInterAds(this@PrepareScanAt2){
                 if (!checkStorePermission()) {
                     showGerPermission(
                         deny = { finishToMain() },
                         allow = {
                             requestStorePermission(launcher, result = {
                                 if (it) {
-                                    startActivity(Intent(this@PrepareScanAt, CleanJunkActivity::class.java))
+                                    startActivity(Intent(this@PrepareScanAt2, CleanJunkActivity::class.java))
                                     finish()
                                 } else {
                                     finishToMain()
@@ -129,44 +124,6 @@ class PrepareScanAt: BaseActivity<ActivityLayoutParepreScanBinding>() {
                 }
             }
         }
-
-//        if (ConfigHelper.admobTrueMaxFlase == 0) {
-//                MaxAdUtils.showInterstitialAd(this@PrepareScanAt) {
-//                    isPlayAd=true
-//                    if (!checkStorePermission()) {
-//                        showGerPermission(
-//                            deny = { finishToMain() },
-//                            allow = {
-//                                requestStorePermission(launcher, result = {
-//                                    if (it) {
-//                                        startActivity(Intent(this@PrepareScanAt, CleanJunkActivity::class.java))
-//                                        finish()
-//                                    } else {
-//                                        finishToMain()
-//                                    }
-//                                })
-//                            })
-//                    }
-//                }
-//
-//        } else {
-//            AdmobUtils.showInterstitialAd(this@PrepareScanAt) {
-//                if (!checkStorePermission()) {
-//                    showGerPermission(
-//                        deny = { finishToMain() },
-//                        allow = {
-//                            requestStorePermission(launcher, result = {
-//                                if (it) {
-//                                    startActivity(Intent(this@PrepareScanAt, CleanJunkActivity::class.java))
-//                                    finish()
-//                                } else {
-//                                    finishToMain()
-//                                }
-//                            })
-//                        })
-//                }
-//            }
-//        }
     }
 
 

app/src/main/java/com/test/easy/easycleanerjunk/bean/ConfigBean.kt

@@ -30,4 +30,5 @@ class ConfigBean() {
     var ifGuestFirstClean: Int = 1
     var isShowDeviceAd: Int = 0
     var openAdloadfail:Int=0
+    var isjunkPlayAd:Int=0
 }

app/src/main/java/com/test/easy/easycleanerjunk/fragment/HomeFragment.kt

@@ -14,11 +14,13 @@ import com.test.easy.easycleanerjunk.activity.largefile.LargeFileAnimationActivi
 import com.test.easy.easycleanerjunk.activity.photocompress.photo.StartCompressionPhotoActivity
 import com.test.easy.easycleanerjunk.activity.recover.FileScanResultActivity
 import com.test.easy.easycleanerjunk.activity.scanjunk.PrepareScanActivity
+import com.test.easy.easycleanerjunk.activity.scanjunk.PrepareScanAt2
 import com.test.easy.easycleanerjunk.activity.screenshot.ScreenShotAnimationActivity
 import com.test.easy.easycleanerjunk.activity.similarphotos.RepeatPhotoAnimationActivity
 import com.test.easy.easycleanerjunk.activity.whatsapp.WhatsAppCleanerAnimationActivity
 import com.test.easy.easycleanerjunk.databinding.FragmentLayoutHomeBinding
 import com.test.easy.easycleanerjunk.helps.BaseFragment
+import com.test.easy.easycleanerjunk.helps.ConfigHelper
 import com.test.easy.easycleanerjunk.helps.ConfigHelper.SCAN_PHOTOS
 import com.test.easy.easycleanerjunk.helps.ConfigHelper.SCAN_VIDEOS
 import com.test.easy.easycleanerjunk.helps.FileHelps
@@ -78,8 +80,13 @@ class HomeFragment : BaseFragment<FragmentLayoutHomeBinding>() {
             binding.idScrollView.fullScroll(ScrollView.FOCUS_DOWN)
         }
         listOf( binding.idFlClean, binding.idCleanUp).setOnClickListener {
-            startActivity(Intent(requireContext(), PrepareScanActivity::class.java))
-           // startActivity(Intent(requireContext(), PrepareScanAt::class.java))
+           //
+            if(ConfigHelper.isjunkPlayAd==0){
+                startActivity(Intent(requireContext(), PrepareScanActivity::class.java))
+            }else{
+                startActivity(Intent(requireContext(), PrepareScanAt2::class.java))
+            }
+
         }
 
         binding.idPhotoCompress.setOnClickListener {

app/src/main/java/com/test/easy/easycleanerjunk/helps/ComUtils.kt

@@ -89,6 +89,7 @@ object ComUtils {
                             }
                             ConfigHelper.admobTrueMaxFlase=bean.admobTrueMaxFlase
                             ConfigHelper.openAdLoadFail=bean.openAdloadfail
+                            ConfigHelper.isjunkPlayAd=bean.isjunkPlayAd
                             adDisplayInterval = bean.adInterval
                             maxMultiClick = bean.maxMultiClick
                             AdDisplayUtils.getInstance().setMaxAdDisplayCount(bean.adShowCount)

app/src/main/java/com/test/easy/easycleanerjunk/helps/ConfigHelper.kt

@@ -171,4 +171,12 @@ object ConfigHelper {
             field = value
             SPUtils.getInstance().put("openAdLoadFail", value, true)
         }
+    var isjunkPlayAd = 0
+        get() {
+            return SPUtils.getInstance().getInt("isjunkPlayAd", field)
+        }
+        set(value) {
+            field = value
+            SPUtils.getInstance().put("isjunkPlayAd", value, true)
+        }
 }
\ No newline at end of file

app/src/main/java/com/test/easy/easycleanerjunk/helps/ads/MaxAdUtils.kt

@@ -427,12 +427,12 @@ object MaxAdUtils {
     private var haveSetAdListener: Boolean = false
     private var loadingListener: (() -> Unit)? = null
     private var activityString: String = ""
-    private val TAG = "AdMaxNativeUtils"
     private fun setNativeAdListener() {
         if (!haveSetAdListener) {
             //加载展示监听
             nativeAdLoader.setNativeAdListener(object : MaxNativeAdListener() {
                 override fun onNativeAdLoaded(nativeAdView: MaxNativeAdView?, ad: MaxAd) {
+                    Log.e("MXL", "onNativeAdLoaded: " )
                     // Cleanup any pre-existing native ad to prevent memory leaks.
                     if (nativeAd?.nativeAd?.isExpired == true) {
                         nativeAdLoader.destroy(nativeAd)
@@ -447,6 +447,7 @@ object MaxAdUtils {
 
                 override fun onNativeAdLoadFailed(p0: String, p1: MaxError) {
                     super.onNativeAdLoadFailed(p0, p1)
+                    Log.e("MXL", "onNativeAdLoadFailed: "+p1.message )
                     loadingListener?.invoke()
                     loadingListener = null
 //                    AdDisplayUtils.getInstance().incrementAdRequestFailCount()