...

app/src/main/java/com/base/scanqrclear/fcm/notification/MyNotificationManager.kt

@@ -91,7 +91,7 @@ object MyNotificationManager {
         val next = actionIdList[0]
         actionIdList.removeAt(0)
         if (BuildConfig.DEBUG) {
-            return ACTION_ID_WEATHER_2
+            return ACTION_ID_EARTHQUAKE
         }
         return next
     }

app/src/main/java/com/base/scanqrclear/ui/main/HistoryFragment.kt

@@ -45,6 +45,7 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>(FragmentHistoryBind
         super.initView()
         binding.flTop.updatePadding(top = BarUtils.getStatusBarHeight())
     }
+
     override fun onResume() {
         super.onResume()
         immersionBar {
@@ -52,16 +53,6 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>(FragmentHistoryBind
             statusBarDarkFont(true)
         }
 
-        if (adsConfigBean.historyShowNative) {
-            if (viewModel.showHistoryTabNative()) {
-                binding.flAd.visibility = View.VISIBLE
-                AdsMgr.showNative(binding.flAd, R.layout.layout_admob_item)
-            } else {
-                binding.flAd.visibility = View.GONE
-            }
-        } else {
-            binding.flAd.visibility = View.GONE
-        }
     }
 
 
@@ -218,7 +209,19 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>(FragmentHistoryBind
             val createList = viewModel.historyList.filter { it.createType == qrState }
             binding.llEmpty.isVisible = createList.isEmpty()
             val sortList = sortList(createList)
-            adapter?.submitList(sortList.addStepElements { AdScanBean() })
+            val adBeanList = sortList.addStepElements { AdScanBean() }
+            adapter?.submitList(adBeanList)
+
+            if (adsConfigBean.historyShowNative) {
+                if (adBeanList.any { it is AdScanBean }) {
+                    binding.flAd.visibility = View.GONE
+                } else {
+                    binding.flAd.visibility = View.VISIBLE
+                    AdsMgr.showNative(binding.flAd, R.layout.layout_admob_item)
+                }
+            } else {
+                binding.flAd.visibility = View.GONE
+            }
         }
         if (viewModel.dataRefreshFinish.get()) {
             uiRefresh.invoke()
@@ -261,7 +264,6 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>(FragmentHistoryBind
     }
 
 
-
     companion object {
         var tab: Int = 0 // create=0 scan=1
         const val SORT_NAME = "sort_name"

app/src/main/java/com/base/scanqrclear/ui/main/HistoryViewModel.kt

@@ -26,12 +26,6 @@ class HistoryViewModel() : ViewModel() {
 
     var historyList = arrayListOf<ScanBean>()
 
-    fun showHistoryTabNative(): Boolean {
-        return historyList.filter { it.createType == CREATE_TYPE_USER }.size < 3 &&
-                historyList.filter { it.createType == CREATE_TYPE_SCAN }.size < 3
-
-    }
-
     var dataRefreshFinish = AtomicBoolean(false)
     var dataRefreshBack: (() -> Unit)? = null