From 239209dbf2308d911b61c150b0726e5a2eb815b8 Mon Sep 17 00:00:00 2001 From: lyr <15622190878@163.com> Date: Fri, 25 Jun 2021 16:05:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV5.0.0-?= =?UTF-8?q?=E6=96=B0=E7=A4=BE=E5=8C=BA=E5=B1=95=E7=A4=BA=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=880623=20=E4=BA=A7=E5=93=81=E6=B5=8B=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20=E7=AC=AC1=E3=80=812=E3=80=814=E7=82=B9=EF=BC=89htt?= =?UTF-8?q?ps://git.ghzs.com/pm/halo-app-issues/-/issues/1253#note=5F10547?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../forum/detail/ForumArticleAskListFragment.kt | 8 ++++++-- .../forum/detail/ForumArticleAskListViewModel.kt | 6 +++--- .../com/gh/gamecenter/forum/home/ForumActivityAdapter.kt | 4 ++-- .../gh/gamecenter/forum/home/ForumArticleListFragment.kt | 8 ++++++-- .../gh/gamecenter/forum/home/ForumArticleListViewModel.kt | 4 ++-- .../java/com/gh/gamecenter/forum/home/ForumFragment.kt | 5 +++++ .../java/com/gh/gamecenter/forum/home/HotForumsAdapter.kt | 6 +++--- app/src/main/res/layout/forum_activity_item.xml | 6 ++++-- 8 files changed, 31 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt index 2bb22e299b..e6877c3dc3 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt @@ -101,8 +101,10 @@ class ForumArticleAskListFragment : ListFragment() + var videoList = arrayListOf() override fun provideDataObservable(page: Int): Observable> { return when (mPath) { @@ -37,10 +37,10 @@ class ForumArticleAskListViewModel(application: Application, val bbsId: String = override fun mergeResultLiveData() { mResultLiveData.addSource(mListLiveData) { list -> - videoList = list.map { + videoList = ArrayList(list.map { if (mPath == "视频") it.type = "video" it.transformForumVideoEntity() - } + }) mResultLiveData.postValue(list) } diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt index 8769eac174..958593ac24 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt @@ -74,8 +74,8 @@ class ForumActivityAdapter(context: Context, // 奖励发放中 currentTime > activityEntity.awardTime.start && currentTime < activityEntity.awardTime.end -> { - status = "发放中" - statusTv.text = "发放中" + status = "奖励发放中" + statusTv.text = "奖励发放中" statusTv.setTextColor(R.color.theme_font.toColor()) statusTv.setBackgroundResource(R.drawable.bg_forum_activity_status_blue) val startTime = TimeUtils.getFormatTime(activityEntity.awardTime.start, "yyyy.MM.dd") diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt index f43a47089d..86052ed44e 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt @@ -138,8 +138,10 @@ class ForumArticleListFragment : LazyListFragment() var recordStatusForums = arrayListOf() var sort: String = "time.comment"//排序 time.edit 最新发布 time.comment 最新回复 - var videoList = listOf() + var videoList = arrayListOf() init { setOverLimitSize(0) @@ -40,7 +40,7 @@ class ForumArticleListViewModel(application: Application) : ListViewModel - videoList = list.map { it.transformForumVideoEntity() } + videoList = ArrayList(list.map { it.transformForumVideoEntity() }) mResultLiveData.postValue(list) } diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumFragment.kt index caa4ea87a6..caeb6208cb 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumFragment.kt @@ -217,6 +217,11 @@ class ForumFragment: LazyFragment() { } } + val entityList = (hotForumRv.adapter as? HotForumsAdapter)?.list ?: return + val findEntity = entityList.find { it.id == forumFollowChange.forumEntity.id } ?: return + val index = entityList.indexOfFirst { it.id == forumFollowChange.forumEntity.id } + findEntity.me.isFollowForum = forumFollowChange.isFollow + hotForumRv.adapter?.notifyItemChanged(index) } } diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/HotForumsAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/home/HotForumsAdapter.kt index a2c94e9b0d..0cb92e7185 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/HotForumsAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/HotForumsAdapter.kt @@ -16,11 +16,11 @@ import org.greenrobot.eventbus.EventBus class HotForumsAdapter(context: Context, private val entrance: String, private val mViewModel: ForumViewModel?, - private var mList: List) + var list: List) : BaseRecyclerAdapter(context) { - override fun getItemCount() = mList.size + override fun getItemCount() = list.size override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = HotForumViewHolder(DataBindingUtil.inflate(mLayoutInflater, R.layout.hot_forum_item, parent, false)) @@ -28,7 +28,7 @@ class HotForumsAdapter(context: Context, override fun onBindViewHolder(holder: HotForumViewHolder, position: Int) { holder.binding.run { - val forumEntity = mList[position] + val forumEntity = list[position] entity = forumEntity executePendingBindings() diff --git a/app/src/main/res/layout/forum_activity_item.xml b/app/src/main/res/layout/forum_activity_item.xml index a6ab5b468a..4908eceb5d 100644 --- a/app/src/main/res/layout/forum_activity_item.xml +++ b/app/src/main/res/layout/forum_activity_item.xml @@ -56,14 +56,16 @@ From c2d853d709a3fb4ddbeabb51209c0c3be6f3b7f1 Mon Sep 17 00:00:00 2001 From: lyr <15622190878@163.com> Date: Fri, 25 Jun 2021 16:47:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.0.0=E3=80=91=E6=8F=90=E9=97=AE=E5=B8=96=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=9C=80=E6=B1=82=EF=BC=88V5.0.0-=E6=96=B0=E7=A4=BE?= =?UTF-8?q?=E5=8C=BA=E6=8F=90=E9=97=AE=E5=B8=96=E7=9B=B8=E5=85=B3=E9=9C=80?= =?UTF-8?q?=E6=B1=82-UI=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E6=B1=87?= =?UTF-8?q?=E6=80=BB=20=E7=AC=AC1=E7=82=B9=EF=BC=89https://git.ghzs.com/pm?= =?UTF-8?q?/halo-app-issues/-/issues/1251#note=5F105291?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt index 4749abe6c2..3837b3b58b 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt @@ -174,10 +174,8 @@ class ForumArticleAskItemViewHolder(val binding: CommunityAnswerItemBinding) : B } else { if (entity.questions.answerCount > 0) { commentCount.text = entity.questions.answerCount.toString() - commentCount.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(itemView.context, R.drawable.community_question_answer_count), null, null, null) } else { commentCount.text = "我来回答" - commentCount.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(itemView.context, R.drawable.community_question_answer_edit), null, null, null) } voteCount.text = "邀请回答" voteIcon.setImageDrawable(ContextCompat.getDrawable(itemView.context, R.drawable.community_invite_follow))