diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt index 859932280e..77c8986ea2 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt @@ -287,26 +287,24 @@ class DescAdapter(context: Context, viewHolder.binding.containerPaddingBottom = itemData.paddingBottom viewHolder.binding.executePendingBindings() - if (viewHolder.binding.recyclerview.adapter == null) { - val commentsAdapter = viewHolder.binding.recyclerview.adapter as DescCommentsAdapter? - ?: DescCommentsAdapter(mContext, mViewModel, mEntrance, gameName) - viewHolder.binding.recyclerview.background = ContextCompat.getDrawable(mContext, R.drawable.background_shape_white_radius_5) - viewHolder.binding.recyclerview.isNestedScrollingEnabled = false - viewHolder.binding.recyclerview.adapter = commentsAdapter - viewHolder.binding.recyclerview.layoutManager = LinearLayoutManager(mContext) - val itemDecoration = HorizontalDividerItemDecoration.Builder(mContext) - .size(DisplayUtils.dip2px(0.5f)) - .margin(DisplayUtils.dip2px(16f)) - .color(ContextCompat.getColor(mContext, R.color.text_f5f5f5)).build() - viewHolder.binding.recyclerview.addItemDecoration(itemDecoration) - viewHolder.binding.tvAll.setOnClickListener { - EventBus.getDefault().post(EBReuse(GameDetailFragment.SKIP_RATING)) - MtaHelper.onEvent("游戏详情_新", "玩家评论_点击全部", gameName) - MtaHelper.onEvent("游戏详情_新", "玩家评论_更多按钮", gameName) - } - commentsAdapter.comments = comments!! - commentsAdapter.notifyDataSetChanged() + val commentsAdapter = viewHolder.binding.recyclerview.adapter as DescCommentsAdapter? + ?: DescCommentsAdapter(mContext, mViewModel, mEntrance, gameName) + viewHolder.binding.recyclerview.background = ContextCompat.getDrawable(mContext, R.drawable.background_shape_white_radius_5) + viewHolder.binding.recyclerview.isNestedScrollingEnabled = false + viewHolder.binding.recyclerview.adapter = commentsAdapter + viewHolder.binding.recyclerview.layoutManager = LinearLayoutManager(mContext) + val itemDecoration = HorizontalDividerItemDecoration.Builder(mContext) + .size(DisplayUtils.dip2px(0.5f)) + .margin(DisplayUtils.dip2px(16f)) + .color(ContextCompat.getColor(mContext, R.color.text_f5f5f5)).build() + viewHolder.binding.recyclerview.addItemDecoration(itemDecoration) + viewHolder.binding.tvAll.setOnClickListener { + EventBus.getDefault().post(EBReuse(GameDetailFragment.SKIP_RATING)) + MtaHelper.onEvent("游戏详情_新", "玩家评论_点击全部", gameName) + MtaHelper.onEvent("游戏详情_新", "玩家评论_更多按钮", gameName) } + commentsAdapter.comments = comments!! + commentsAdapter.notifyDataSetChanged() } //绑定其他相关版本 diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt index 900db2ee42..cccfed644a 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt @@ -188,6 +188,7 @@ class RatingCommentItemViewHolder(val binding: RatingCommentItemBinding) : BaseR more.setOnClickListener { if (path == "游戏详情:评分") MtaHelper.onEvent("游戏详情_新", "评论Tab_更多按钮", game?.name) + if (path == "折叠评论") MtaHelper.onEvent("折叠评论", "点击更多", game?.name) showMorePopWindow(it, commentData.user.id == UserManager.getInstance().userId) { text -> when (text) { "复制" -> { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt index 0e0bcf2aa0..35dfc64914 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt @@ -68,7 +68,7 @@ class RatingReplyActivity : ListActivity { override fun onData(dataPosition: Int): RatingComment? { if (dataPosition >= mEntityList.size) return null - return mEntityList[dataPosition].comment + val comment = mEntityList[dataPosition].comment + if (requestCode == RatingFragment.RATING_PATCH_REQUEST) { + comment?.ignore = viewModel.game?.ignoreComment ?: false + } + return comment } override fun onNotify(dataPosition: Int) {