[Fix]: 修复用户收藏显示错误

xiaoyvyv · Dec 12, 2023 · a98e8e8 · a98e8e8
1 parent a003847
commit a98e8e8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/app/src/main/java/com/xiaoyv/bangumi/ui/discover/group/detail/GroupDetailAdapter.kt b/app/src/main/java/com/xiaoyv/bangumi/ui/discover/group/detail/GroupDetailAdapter.kt
@@ -1,5 +1,6 @@
 package com.xiaoyv.bangumi.ui.discover.group.detail
 
+import androidx.core.view.isVisible
 import com.xiaoyv.bangumi.databinding.ActivityGroupDetailItemBinding
 import com.xiaoyv.common.config.bean.SampleAvatar
 import com.xiaoyv.common.helper.callback.IdDiffItemCallback
@@ -16,6 +17,8 @@ class GroupDetailAdapter : BaseQuickDiffBindingAdapter<SampleAvatar,
     override fun BaseQuickBindingHolder<ActivityGroupDetailItemBinding>.converted(item: SampleAvatar) {
         binding.ivAvatar.loadImageAnimate(item.image)
         binding.tvTip.text = item.title
+
+        binding.tvCount.isVisible = item.desc.isNotBlank()
         binding.tvCount.text = buildString {
             append("成员：")
             append(item.desc)

diff --git a/app/src/main/java/com/xiaoyv/bangumi/ui/profile/ProfileAdapter.kt b/app/src/main/java/com/xiaoyv/bangumi/ui/profile/ProfileAdapter.kt
@@ -37,7 +37,8 @@ class ProfileAdapter(fragmentManager: FragmentManager, lifecycle: Lifecycle) :
         val type = profileTab.type
         return when (type) {
             ProfileType.TYPE_COLLECTION -> SaveListFragment.newInstance(
-                userId = UserHelper.currentUser.id.orEmpty()
+                userId = UserHelper.currentUser.id.orEmpty(),
+                isMine = true
             )
 
             ProfileType.TYPE_TIMELINE -> TimelinePageFragment.newInstance(

diff --git a/app/src/main/java/com/xiaoyv/bangumi/ui/profile/page/save/SaveListFragment.kt b/app/src/main/java/com/xiaoyv/bangumi/ui/profile/page/save/SaveListFragment.kt
@@ -58,6 +58,7 @@ class SaveListFragment : BaseViewModelFragment<FragmentSaveListBinding, SaveList
 
     override fun initArgumentsData(arguments: Bundle) {
         viewModel.userId = arguments.getString(NavKey.KEY_STRING).orEmpty()
+        viewModel.isMine = arguments.getBoolean(NavKey.KEY_BOOLEAN, false)
     }
 
     override fun initView() {
@@ -124,20 +125,25 @@ class SaveListFragment : BaseViewModelFragment<FragmentSaveListBinding, SaveList
             }
         }
 
-        UserHelper.observe(this) {
-            if (it.isEmpty) {
-                viewModel.clearList()
-            } else {
-                viewModel.userId = it.id.orEmpty()
-                viewModel.refresh()
+        if (viewModel.isMine) {
+            UserHelper.observe(this) {
+                if (it.isEmpty) {
+                    viewModel.clearList()
+                } else {
+                    viewModel.userId = it.id.orEmpty()
+                    viewModel.refresh()
+                }
             }
         }
     }
 
     companion object {
-        fun newInstance(userId: String): SaveListFragment {
+        fun newInstance(userId: String, isMine: Boolean = false): SaveListFragment {
             return SaveListFragment().apply {
-                arguments = bundleOf(NavKey.KEY_STRING to userId)
+                arguments = bundleOf(
+                    NavKey.KEY_STRING to userId,
+                    NavKey.KEY_BOOLEAN to isMine
+                )
             }
         }
     }

diff --git a/app/src/main/java/com/xiaoyv/bangumi/ui/profile/page/save/SaveListViewModel.kt b/app/src/main/java/com/xiaoyv/bangumi/ui/profile/page/save/SaveListViewModel.kt
@@ -25,6 +25,7 @@ class SaveListViewModel : BaseViewModel() {
 
     internal var listType = InterestCollectType.TYPE_WISH
     internal var userId = ""
+    internal var isMine = false
 
     /**
      * 搜索条件