修改bug

app/src/main/java/com/base/pdfviewerscannerwhite/ads/admob/AdmobManager.kt

@@ -165,12 +165,12 @@ object AdmobManager {
         }
 
     private var showTime
-        get() = AppPreferences.getInstance().getString(SAVE_DATE,"")
+        get() = AppPreferences.getInstance().getString(SAVE_DATE, "")
         set(value) = AppPreferences.getInstance().put(SAVE_DATE, value)
 
     private const val SHOW_INTER_COUNT = "showInterCount"
     private var showInterCount
-        get() = AppPreferences.getInstance().getInt(SHOW_INTER_COUNT,0)
+        get() = AppPreferences.getInstance().getInt(SHOW_INTER_COUNT, 0)
         set(value) = AppPreferences.getInstance().put(SHOW_INTER_COUNT, value)
 
     fun init(
@@ -764,13 +764,20 @@ object AdmobManager {
 
     fun checkNative(): Boolean {
         val lastShowTime = nativeAdLastShowTime
-        val adInterval = AppPreferences.getInstance().getString(KEY_AD_NATIVE_INTERVAL, DEFAULT_AD_NATIVE)
+        val adInterval =
+            AppPreferences.getInstance().getString(KEY_AD_NATIVE_INTERVAL, DEFAULT_AD_NATIVE)
                 .toInt() * 1000
         val interval = adInterval
         val flag = System.currentTimeMillis() - lastShowTime > interval
         return flag
     }
 
+    fun isHaveNativeInterval(): Boolean {
+        val adInterval = AppPreferences.getInstance().getString(KEY_AD_NATIVE_INTERVAL, DEFAULT_AD_NATIVE)
+                .toInt()
+        return adInterval>0
+    }
+
     private fun getNativeAd(): NativeAd? {
         val nativeAd = nativeCacheItems.poll() ?: return null
         if (!isNativeAdAvailable()) {
@@ -912,24 +919,29 @@ object AdmobManager {
 
     fun isShowAdNativeBottom(): Boolean {
         val isShowAdNative =
-            AppPreferences.getInstance().getString(KEY_IS_SHOW_AD_NATIVE_BOTTOM, DEFAULT_SWITCH).toInt()
+            AppPreferences.getInstance().getString(KEY_IS_SHOW_AD_NATIVE_BOTTOM, DEFAULT_SWITCH)
+                .toInt()
         return isShowAdNative == 1
     }
+
     fun isShowNads(): Boolean {
         val isShowAdNative =
             AppPreferences.getInstance().getString(KEY_NA_ADS, DEFAULT_SWITCH).toInt()
         return isShowAdNative == 1
     }
+
     fun isShowAdInter(): Boolean {
         val isShowAdInter =
             AppPreferences.getInstance().getString(KEY_IS_SHOW_AD_INTER, DEFAULT_SWITCH).toInt()
         return isShowAdInter == 1
     }
+
     fun isShowLoadingAdInter(): Boolean {
         val isShowAdInter =
             AppPreferences.getInstance().getString(KEY_IS_LOADING_INTER, "0").toInt()
         return isShowAdInter == 1
     }
+
     fun isShowAdBackInter(): Boolean {
         val isShowAdBackInter =
             AppPreferences.getInstance().getString(KEY_IS_SHOW_AD_BACK_INTER, "0").toInt()
@@ -982,25 +994,31 @@ object AdmobManager {
             return false
         }
         reset()
-        var displayNumber = AppPreferences.getInstance().getInt(NUMBER_DISPLAY,0)
-        val requestNumber = AppPreferences.getInstance().getInt(NUMBER_REQUEST,0)
-        val clickNumber = AppPreferences.getInstance().getInt(NUMBER_CLICK,0)
-        var adShow = AppPreferences.getInstance().getString(KEY_AD_SHOW, DEFAULT_OPEN_AD_SHOW).toInt()
-        if(adUnit== AD_UNIT_INTER){
-            adShow = AppPreferences.getInstance().getString(KEY_INTER_AD_SHOW, DEFAULT_INTER_AD_SHOW).toInt()
-            displayNumber= AppPreferences.getInstance().getInt(NUMBER_INTER_DISPLAY,0)
-        }else if(adUnit== AD_UNIT_NATIVE){
-            adShow = AppPreferences.getInstance().getString(KEY_NATIVE_AD_SHOW, DEFAULT_NATIVE_AD_SHOW).toInt()
-            displayNumber= AppPreferences.getInstance().getInt(NUMBER_NATIVE_DISPLAY,0)
-        }
-
-        val adRequest = AppPreferences.getInstance().getString(KEY_AD_REQUEST, DEFAULT_AD_REQUEST).toInt()
+        var displayNumber = AppPreferences.getInstance().getInt(NUMBER_DISPLAY, 0)
+        val requestNumber = AppPreferences.getInstance().getInt(NUMBER_REQUEST, 0)
+        val clickNumber = AppPreferences.getInstance().getInt(NUMBER_CLICK, 0)
+        var adShow =
+            AppPreferences.getInstance().getString(KEY_AD_SHOW, DEFAULT_OPEN_AD_SHOW).toInt()
+        if (adUnit == AD_UNIT_INTER) {
+            adShow =
+                AppPreferences.getInstance().getString(KEY_INTER_AD_SHOW, DEFAULT_INTER_AD_SHOW)
+                    .toInt()
+            displayNumber = AppPreferences.getInstance().getInt(NUMBER_INTER_DISPLAY, 0)
+        } else if (adUnit == AD_UNIT_NATIVE) {
+            adShow =
+                AppPreferences.getInstance().getString(KEY_NATIVE_AD_SHOW, DEFAULT_NATIVE_AD_SHOW)
+                    .toInt()
+            displayNumber = AppPreferences.getInstance().getInt(NUMBER_NATIVE_DISPLAY, 0)
+        }
+
+        val adRequest =
+            AppPreferences.getInstance().getString(KEY_AD_REQUEST, DEFAULT_AD_REQUEST).toInt()
         val adClick = AppPreferences.getInstance().getString(KEY_AD_CLICK, DEFAULT_AD_CLICK).toInt()
         if (displayNumber >= adShow) {
             ReportAdUtils.limitErrorAd(LIMIT_ERROR_DISPLAY, adUnit)
             return false
         }
-        if(adUnit== AD_UNIT_NATIVE){
+        if (adUnit == AD_UNIT_NATIVE) {
             return checkNative()
         }
 
@@ -1016,10 +1034,11 @@ object AdmobManager {
 
         var lastShowTime = appOpenAdLastShowTime
         var adInterval =
-            AppPreferences.getInstance().getString(KEY_AD_INTERVAL, DEFAULT_AD_INTERVAL).toInt() * 1000
+            AppPreferences.getInstance().getString(KEY_AD_INTERVAL, DEFAULT_AD_INTERVAL)
+                .toInt() * 1000
         if (adUnit == AD_UNIT_INTER) {
             lastShowTime = interstitialAdLastShowTime
-            if (showInterCount >1) {
+            if (showInterCount > 1) {
                 val start = AppPreferences.getInstance()
                     .getString(KEY_AD_INTER_INTERVAL_START, DEFAULT_AD_INTER_INTERVAL_START).toInt()
                 val end = AppPreferences.getInstance()
@@ -1056,7 +1075,7 @@ object AdmobManager {
 
     fun calculate(key: String) {
         reset()
-        val value = AppPreferences.getInstance().getInt(key,0)
+        val value = AppPreferences.getInstance().getInt(key, 0)
         AppPreferences.getInstance().put(key, value + 1)
     }
 

app/src/main/java/com/base/pdfviewerscannerwhite/ui/guide/GuideActivity.kt

 package com.base.pdfviewerscannerwhite.ui.guide
 
 import android.content.Intent
-import android.view.View
 import androidx.activity.addCallback
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
@@ -36,7 +35,7 @@ class GuideActivity : BaseActivity<ActivityGuideBinding>() {
 
 
     override fun initView() {
-        if (!AdmobManager.checkNative()) {
+        if (!AdmobManager.checkNative() || AdmobManager.isHaveNativeInterval()) {
             fragments.removeAt(2)
         }
         updateAppLanguage(MyApplication.guideLanguage) {