...

app/src/main/java/com/base/browserwhite/ui/activity/cleanjunk/ScanJunkActivity.kt

@@ -15,6 +15,7 @@ import com.base.browserwhite.bean.ChildBean
 import com.base.browserwhite.bean.ParentBean
 import com.base.browserwhite.databinding.ActivityScanJunkBinding
 import com.base.browserwhite.ui.activity.BaseActivity
+import com.base.browserwhite.ui.activity.result.ResultActivity
 import com.base.browserwhite.ui.adapter.JunkExpandAdapter
 import com.base.browserwhite.ui.adapter.JunkScanAdapter
 import com.base.browserwhite.utils.BarUtils
@@ -88,14 +89,15 @@ class ScanJunkActivity : BaseActivity<ActivityScanJunkBinding>() {
 
         binding.tvBtn.setOnClickListener {
             if (binding.tvBtn.text == "Got it") {
-//                startActivity(Intent(this, ResultActivity::class.java))
-                startActivity(Intent(this, CleaningActivity::class.java))
+                startActivity(Intent(this, ResultActivity::class.java))
+                finish()
             } else {
                 startActivity(Intent(this, CleaningActivity::class.java).apply {
                     val list = junkExpandAdapter.getChoosePath()
 //                    putExtra("list", list.toTypedArray())
                     putExtra("size", cleanSize)
                 })
+                finish()
             }
         }
     }

app/src/main/java/com/base/browserwhite/ui/activity/result/ResultActivity.kt

@@ -6,13 +6,21 @@ import androidx.activity.addCallback
 import com.base.browserwhite.bean.ConstObject.JUNK_CLEANER
 import com.base.browserwhite.databinding.ActivityResultBinding
 import com.base.browserwhite.ui.activity.BaseActivity
-import com.base.browserwhite.utils.AppPreferences
+import com.base.browserwhite.ui.adapter.NewsAdapter
 import com.base.browserwhite.utils.BarUtils
 import com.base.browserwhite.utils.KotlinExt.toFormatSize
-import com.google.gson.JsonObject
+import com.base.browserwhite.utils.LogEx
+import com.base.browserwhite.utils.NewsUtils
+import com.chad.library.adapter4.QuickAdapterHelper
+import com.chad.library.adapter4.loadState.LoadState
+import com.chad.library.adapter4.loadState.trailing.TrailingLoadStateAdapter
 
 class ResultActivity : BaseActivity<ActivityResultBinding>() {
 
+    private lateinit var newsAdapter: NewsAdapter
+    private lateinit var helper: QuickAdapterHelper
+    private val TAG = "ResultActivity"
+    private var isLoading = false
 
     override val binding: ActivityResultBinding by lazy {
         ActivityResultBinding.inflate(layoutInflater)
@@ -35,6 +43,26 @@ class ResultActivity : BaseActivity<ActivityResultBinding>() {
                 }
             }
         }
+        newsAdapter = NewsAdapter()
+        helper =
+            QuickAdapterHelper.Builder(newsAdapter).setTrailingLoadStateAdapter(object : TrailingLoadStateAdapter.OnTrailingListener {
+                override fun onLoad() {
+                    LogEx.logDebug(TAG, "onLoad")
+                    requestMore()
+                }
+
+                override fun onFailRetry() {
+                    LogEx.logDebug(TAG, "onFailRetry")
+                    requestMore()
+                }
+
+                override fun isAllowLoading(): Boolean {
+                    LogEx.logDebug(TAG, "isLoading=$isLoading")
+                    return !isLoading
+                }
+            }).build()
+        binding.rvNews.adapter = helper.adapter
+        requestMore()
     }
 
     override fun initListener() {
@@ -47,5 +75,28 @@ class ResultActivity : BaseActivity<ActivityResultBinding>() {
         }
     }
 
+    fun requestMore() {
+        isLoading = true
+        helper.trailingLoadState = LoadState.None
+        val lastNewsId = newsAdapter.getLastPageNumber()
+        LogEx.logDebug(TAG, "requestMore lastNewsId=$lastNewsId")
+        NewsUtils.requestNews(pageNumber = lastNewsId, errorCallBack = {
+            isLoading = false
+            LogEx.logDebug(TAG, "errorCallBack")
+        }, beanCallBack = {
+            isLoading = false
+            binding.root.post {
+                LogEx.logDebug(TAG, "beanCallBack")
+                if (lastNewsId == null) {
+                    newsAdapter.submitList(it)
+                } else {
+                    newsAdapter.addAll(it)
+                }
+                helper.trailingLoadState = LoadState.NotLoading(false)
+            }
+
+        })
+    }
+
 
 }
\ No newline at end of file

app/src/main/java/com/base/browserwhite/ui/fragment/HomeFragment.kt

@@ -62,8 +62,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
         helper.addBeforeAdapter(0, HeaderAdapter())
 
         binding.rv.adapter = helper.adapter
-
-
         requestMore()
     }
 

app/src/main/res/layout/activity_result.xml

@@ -175,7 +175,8 @@
             android:text="Recommended news"
             android:textColor="@color/black"
             android:textSize="18sp"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_news"