...

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

@@ -27,7 +27,9 @@ class NativeView(context: Context, val layout: Int, attrs: AttributeSet? = null)
         val adView = LayoutInflater.from(context)
             .inflate(layout, this, false) as NativeAdView
 
-        adView.advertiserView=adView.findViewById(R.id.ad_advertiser)
+        runCatching {
+            adView.advertiserView = adView.findViewById(R.id.ad_advertiser)
+        }
         adView.mediaView = adView.findViewById(R.id.ad_media)
         adView.headlineView = adView.findViewById(R.id.ad_headline)
         adView.bodyView = adView.findViewById(R.id.ad_body)

app/src/main/java/com/base/pdfviewerscannerwhite/ui/main/DocumentFragment.kt

@@ -2,7 +2,6 @@ package com.base.pdfviewerscannerwhite.ui.main
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.util.Log
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import androidx.core.content.ContextCompat
@@ -12,7 +11,6 @@ import androidx.viewpager2.widget.ViewPager2
 import com.angcyo.tablayout.DslTabIndicator
 import com.angcyo.tablayout.delegate2.ViewPager2Delegate
 import com.base.pdfviewerscannerwhite.R
-import com.base.pdfviewerscannerwhite.bean.ConstObject
 import com.base.pdfviewerscannerwhite.bean.ConstObject.BOOKMARK_DATA_TYPE
 import com.base.pdfviewerscannerwhite.bean.ConstObject.DOCUMENT_DATA_TYPE
 import com.base.pdfviewerscannerwhite.bean.ConstObject.RECENT_DATA_TYPE
@@ -89,7 +87,7 @@ class DocumentFragment(
         if (hidden) {
             return
         }
-        currentPage.refreshData()
+//        currentPage.refreshData()
     }
 
     private fun initSearchAdapter() {

app/src/main/java/com/base/pdfviewerscannerwhite/ui/main/DocumentPageFragment.kt

@@ -32,7 +32,7 @@ import java.util.Locale
 
 class DocumentPageFragment() : BaseFragment<FragmentDocumentPageBinding>(), DocumentView {
 
-    private val TAG = "DocumentFragment"
+    private val TAG = "DocumentPageFragment"
     var type = TYPE_PDF
     var dataType: String = ""
     lateinit var adapter: DocumentAdapter
@@ -59,34 +59,31 @@ class DocumentPageFragment() : BaseFragment<FragmentDocumentPageBinding>(), Docu
     }
 
     fun refreshData() = lifecycleScope.launch(Dispatchers.IO) {
+        LogEx.logDebug(TAG, "type=$type refreshData")
         if (isInitialized && !isHidden) {
             val list =
-                (requireActivity() as MainActivity).mainPresenter.getDataByType(type, dataType).toMutableList()
+                (requireActivity() as MainActivity).mainPresenter.getDataByType(type, dataType)
             val dataType = (parentFragment as DocumentFragment).dataType
 
-            launch(Dispatchers.Main) {
+            val arrayList = arrayListOf<DocumentBean>()
 
-                if (dataType == ConstObject.RECENT_DATA_TYPE) {
-                    if (list.isNotEmpty()) {
-                        list.add(1, DocumentBean().apply { isAd = true })
-                    }
-                    adapter.submitList(list)
-                } else {
+            if (dataType != ConstObject.RECENT_DATA_TYPE) {
                 val sortList = sortByMode(list)
-                    val arrayList = arrayListOf<DocumentBean>()
                 arrayList.addAll(sortList)
-                    if (arrayList.isNotEmpty()) {
-                        arrayList.add(1, DocumentBean().apply { isAd = true })
-                    }
-                    adapter.submitList(arrayList)
+            } else {
+                arrayList.addAll(list)
             }
-                binding.llEmpty.isVisible = list.isEmpty()
-                if (list.isEmpty()) {
+
+            launch(Dispatchers.Main) {
+                binding.llEmpty.isVisible = arrayList.isEmpty()
+                if (arrayList.isEmpty()) {
                     binding.flAd.visibility = View.VISIBLE
-                    AdmobNativeUtils.showNativeAd(requireActivity(), binding.flAd, R.layout.item_document)
+                    AdmobNativeUtils.showNativeAd(requireActivity(), binding.flAd, R.layout.layout_admob_document)
                 } else {
                     binding.flAd.visibility = View.GONE
+                    arrayList.add(1, DocumentBean().apply { isAd = true })
                 }
+                adapter.submitList(arrayList)
             }
 //            Log.d("glc", "加载数据成功：" + type + "  list:" + list.size)
         } else {