From d2eab14cefff137debf3ae17d19ddaa1ab434ab8 Mon Sep 17 00:00:00 2001
From: gedoor <gekunfei@live.com>
Date: Tue, 13 Apr 2021 17:13:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Drss=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/rss/article/RssSortActivity.kt     | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/rss/article/RssSortActivity.kt b/app/src/main/java/io/legado/app/ui/rss/article/RssSortActivity.kt
index 3ebe5e74e..8b30ede65 100644
--- a/app/src/main/java/io/legado/app/ui/rss/article/RssSortActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/rss/article/RssSortActivity.kt
@@ -20,7 +20,7 @@ class RssSortActivity : VMBaseActivity<ActivityRssArtivlesBinding, RssSortViewMo
 
     override val viewModel: RssSortViewModel
             by viewModels()
-    private val fragments = linkedMapOf<String, RssArticlesFragment>()
+    private var sorts = linkedMapOf<String, String>()
     private lateinit var adapter: TabFragmentPageAdapter
     private val upSourceResult = registerForActivityResult(
         ActivityResultContracts.StartActivityForResult()
@@ -40,7 +40,7 @@ class RssSortActivity : VMBaseActivity<ActivityRssArtivlesBinding, RssSortViewMo
         adapter = TabFragmentPageAdapter()
         binding.viewPager.adapter = adapter
         TabLayoutMediator(binding.tabLayout, binding.viewPager) { tab, position ->
-            tab.text = fragments.keys.elementAt(position)
+            tab.text = sorts.keys.elementAt(position)
         }.attach()
         viewModel.titleLiveData.observe(this, {
             binding.titleBar.title = it
@@ -77,11 +77,10 @@ class RssSortActivity : VMBaseActivity<ActivityRssArtivlesBinding, RssSortViewMo
     }
 
     private fun upFragments() {
-        fragments.clear()
-        viewModel.rssSource?.sortUrls()?.forEach {
-            fragments[it.key] = RssArticlesFragment.create(it.key, it.value)
+        viewModel.rssSource?.sortUrls()?.let {
+            sorts = it
         }
-        if (fragments.size == 1) {
+        if (sorts.size == 1) {
             binding.tabLayout.gone()
         } else {
             binding.tabLayout.visible()
@@ -92,11 +91,18 @@ class RssSortActivity : VMBaseActivity<ActivityRssArtivlesBinding, RssSortViewMo
     private inner class TabFragmentPageAdapter : FragmentStateAdapter(this) {
 
         override fun getItemCount(): Int {
-            return fragments.size
+            return sorts.size
+        }
+
+        override fun getItemId(position: Int): Long {
+            return position + (viewModel.rssSource?.articleStyle ?: 0).toLong() * 100
         }
 
         override fun createFragment(position: Int): Fragment {
-            return fragments.values.elementAt(position)
+            return RssArticlesFragment.create(
+                sorts.keys.elementAt(position),
+                sorts.values.elementAt(position)
+            )
         }
     }