Merge branch 'master' of gitlab.huolea.com:koko/data-recovery-white

app/src/main/java/com/base/datarecovery/activity/MainActivity.kt

@@ -31,7 +31,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
     override val binding: ActivityMainBinding by lazy {
         ActivityMainBinding.inflate(layoutInflater)
     }
-
+    var permissionDialogShowed: Boolean = false
 
     override fun initView() {
         BarUtils.setStatusBarLightMode(this, true)
@@ -55,7 +55,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                 dialog = showPermissionBottomSheet(launcher)
             }
         } else {
-
+            permissionDialogShowed = true
         }
 
         lifecycleScope.launch(Dispatchers.Main) {

app/src/main/java/com/base/datarecovery/activity/junkclean/ScanJunkActivity.kt

@@ -8,11 +8,8 @@ import android.widget.Toast
 import androidx.activity.addCallback
 import androidx.core.view.updatePadding
 import com.base.datarecovery.ads.AdmobMaxHelper.admobMaxShowInterstitialAd
-import com.base.datarecovery.ads.admob.AdmobInterstitialUtils
-import com.base.datarecovery.ads.max.AdMaxInterstitialUtils
 import com.base.datarecovery.databinding.ActivityLayoutScanJunkBinding
 import com.base.datarecovery.help.BaseActivity
-import com.base.datarecovery.help.ConfigHelper
 import com.base.datarecovery.help.PermissionHelp.checkStorePermission
 import com.base.datarecovery.help.PermissionHelp.requestStorePermission
 import com.base.datarecovery.utils.BarUtils

app/src/main/java/com/base/datarecovery/ads/max/AdMaxInterstitialUtils.kt

@@ -87,7 +87,7 @@ object AdMaxInterstitialUtils {
                     val obj2 = JSONObject()
                     obj2.put("code", p1.code)
                     obj2.put("reason", p1.message)
-                    obj2.put("ad_unit", "openAd")
+                    obj2.put("ad_unit", "interstitialAd")
                     EventUtils.event("ad_show_error", ext = obj2)
                 }
             })

app/src/main/java/com/base/datarecovery/fragment/HomeFragment.kt

@@ -6,7 +6,6 @@ import android.annotation.SuppressLint
 import android.content.Intent
 import android.view.View
 import android.view.animation.AccelerateDecelerateInterpolator
-import com.base.datarecovery.R
 import com.base.datarecovery.activity.MainActivity
 import com.base.datarecovery.activity.SettingActivity
 import com.base.datarecovery.activity.junkclean.ScanJunkActivity
@@ -16,7 +15,6 @@ import com.base.datarecovery.activity.recovery.FileScanResultActivity
 import com.base.datarecovery.activity.repeat.RepeatAnimationActivity
 import com.base.datarecovery.activity.screenshot.ScreenShotAnimationActivity
 import com.base.datarecovery.ads.AdmobMaxHelper
-import com.base.datarecovery.ads.admob.AdmobNativeUtils
 import com.base.datarecovery.bean.ConstObject.SCAN_DOCUMENTS
 import com.base.datarecovery.bean.ConstObject.SCAN_PHOTOS
 import com.base.datarecovery.bean.ConstObject.SCAN_VIDEOS
@@ -34,7 +32,10 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
 
     override fun setView() {
         animatorSet = createHeartbeatAnimation(binding.flScan)
-        AdmobMaxHelper.admobMaxShowNativeAd(requireActivity(), binding.flAd, 0)
+        val flag = (requireActivity() as MainActivity).permissionDialogShowed
+        if (flag) {
+            AdmobMaxHelper.admobMaxShowNativeAd(requireActivity(), binding.flAd, 0)
+        }
     }
 
     override fun setListener() {
@@ -113,10 +114,15 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
     override fun onResume() {
         super.onResume()
         animatorSet.resume()
+
         if (resumeTime != 0) {
-            AdmobMaxHelper.admobMaxShowNativeAd(requireActivity(), binding.flAd, 0)
-            resumeTime++
+            val flag = (requireActivity() as MainActivity).permissionDialogShowed
+            if (flag) {
+                AdmobMaxHelper.admobMaxShowNativeAd(requireActivity(), binding.flAd, 0)
+            }
         }
+        resumeTime++
+
         (requireActivity() as MainActivity).setScreenSize {
             if (it > 0) {
                 binding.tvScreenSize.visibility = View.VISIBLE

app/src/main/java/com/base/datarecovery/view/PermissionDialog.kt

@@ -3,6 +3,7 @@ package com.base.datarecovery.view
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
+import com.base.datarecovery.activity.MainActivity
 import com.base.datarecovery.databinding.DialogPermissionBottomsheetBinding
 import com.base.datarecovery.help.ActivityLauncher
 import com.base.datarecovery.help.PermissionHelp.requestStorePermission
@@ -11,7 +12,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
 
 object PermissionDialog {
 
-    fun Context.showPermissionBottomSheet(launcher: ActivityLauncher): BottomSheetDialog {
+    fun MainActivity.showPermissionBottomSheet(launcher: ActivityLauncher): BottomSheetDialog {
         val dialog = BottomSheetDialog(this)
         val binding = DialogPermissionBottomsheetBinding.inflate(LayoutInflater.from(this))
         dialog.setContentView(binding.root)
@@ -26,6 +27,7 @@ object PermissionDialog {
             requestStorePermission(launcher, result = {
                 if (it) {
                     dialog.dismiss()
+                    this.permissionDialogShowed = true
                 }
             })
         }