From 7671e0b4e192ffbbcdf871badc68cb3a9ec1a08b Mon Sep 17 00:00:00 2001 From: lyr Date: Mon, 30 May 2022 15:58:09 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8Bv5?= =?UTF-8?q?.10.0=E3=80=91=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96=E6=B1=87?= =?UTF-8?q?=E6=80=BB5=E6=9C=88=E7=AC=AC3=E5=91=A8=20(15)=20https://git.sha?= =?UTF-8?q?nqu.cc/pm/halo-app-issues/-/issues/1858#note=5F150514?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qa/answer/MyAnswerViewHolder.kt | 23 ------ .../gamecenter/qa/myqa/MyAnswerAdapter.java | 29 +++++-- .../gamecenter/qa/myqa/MyAnswerFragment.java | 1 + .../res/layout/community_my_answer_item.xml | 80 ------------------- 4 files changed, 22 insertions(+), 111 deletions(-) delete mode 100644 app/src/main/java/com/gh/gamecenter/qa/answer/MyAnswerViewHolder.kt delete mode 100644 app/src/main/res/layout/community_my_answer_item.xml diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/MyAnswerViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/MyAnswerViewHolder.kt deleted file mode 100644 index 7acddcc767..0000000000 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/MyAnswerViewHolder.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.gh.gamecenter.qa.answer - -import com.gh.gamecenter.databinding.CommunityMyAnswerItemBinding -import com.gh.gamecenter.qa.entity.AnswerEntity -import com.gh.gamecenter.qa.entity.ArticleEntity - -class MyAnswerViewHolder(val binding: CommunityMyAnswerItemBinding) : BaseAnswerOrArticleItemViewHolder(binding.root) { - - fun bindItem(entity: AnswerEntity, entrance: String) { - bindCommendAndVote(entity, entrance) - binding.title.text = entity.questions.title - binding.content.text = entity.brief - binding.forumNameTv.text = if (!entity.communityName.isNullOrEmpty()) entity.communityName else entity.bbs.name - } - - fun bindItem(entity: ArticleEntity, entrance: String) { - bindCommendAndVote(entity, entrance) - val data = entity.transformAnswerEntity() - binding.title.text = data.questions.title - binding.content.text = data.brief - binding.forumNameTv.text = if (!data.communityName.isNullOrEmpty()) data.communityName else data.bbs.name - } -} \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerAdapter.java index 5d5a017df3..3111549a1b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerAdapter.java @@ -12,8 +12,9 @@ import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.baselist.ListAdapter; -import com.gh.gamecenter.databinding.CommunityMyAnswerItemBinding; -import com.gh.gamecenter.qa.answer.MyAnswerViewHolder; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.databinding.CommunityAnswerItemBinding; +import com.gh.gamecenter.forum.home.ForumArticleAskItemViewHolder; import com.gh.gamecenter.qa.entity.AnswerEntity; import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity; @@ -50,8 +51,8 @@ class MyAnswerAdapter extends ListAdapter implements ISyncAdapterH view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false); return new FooterViewHolder(view, mListClickListener); case ItemViewType.ITEM_BODY: - view = mLayoutInflater.inflate(R.layout.community_my_answer_item, parent, false); - return new MyAnswerViewHolder(CommunityMyAnswerItemBinding.bind(view)); + view = mLayoutInflater.inflate(R.layout.community_answer_item, parent, false); + return new ForumArticleAskItemViewHolder(CommunityAnswerItemBinding.bind(view)); default: return null; } @@ -61,11 +62,23 @@ class MyAnswerAdapter extends ListAdapter implements ISyncAdapterH public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { switch (getItemViewType(position)) { case ItemViewType.ITEM_BODY: - MyAnswerViewHolder answerViewHolder = ((MyAnswerViewHolder) holder); + ForumArticleAskItemViewHolder answerViewHolder = ((ForumArticleAskItemViewHolder) holder); AnswerEntity entity = mEntityList.get(position); - answerViewHolder.bindItem(entity, mEntrance); - CommunityMyAnswerItemBinding binding = answerViewHolder.getBinding(); - binding.imageContainer.bindData(entity, mEntrance, ""); + + answerViewHolder.bindForumAnswerItem(entity, mEntrance, "", position); + + CommunityAnswerItemBinding binding = answerViewHolder.getBinding(); + binding.userIcon.setVisibility(View.GONE); + binding.userName.setVisibility(View.GONE); + binding.userBadgeIcon.setVisibility(View.GONE); + binding.userBadgeName.setVisibility(View.GONE); + binding.concernBtn.setVisibility(View.GONE); + binding.timeContainer.setVisibility(View.GONE); + binding.userIcon.setVisibility(View.GONE); + ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) binding.questionTitle.getLayoutParams(); + params.topMargin = DisplayUtils.dip2px(20F); + binding.questionTitle.setLayoutParams(params); + holder.itemView.setOnClickListener(v -> { mContext.startActivity(NewQuestionDetailActivity.getCommentIntent(mContext, entity.getQuestions().getId(), entity.getId() != null ? entity.getId() : "", mEntrance, "我的光环-我的问答-我的回答")); diff --git a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerFragment.java b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerFragment.java index cb2a2a2579..2f8f52ffb0 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerFragment.java @@ -15,6 +15,7 @@ import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.view.CustomDividerItemDecoration; import com.gh.gamecenter.manager.UserManager; import com.gh.gamecenter.qa.entity.AnswerEntity; +import com.gh.gamecenter.qa.entity.ArticleEntity; import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.HaloApp; import com.lightgame.utils.Utils; diff --git a/app/src/main/res/layout/community_my_answer_item.xml b/app/src/main/res/layout/community_my_answer_item.xml deleted file mode 100644 index 7ea390df87..0000000000 --- a/app/src/main/res/layout/community_my_answer_item.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - -