From 738074ec00a76a39cd523ec67de283838260079d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com>
Date: Thu, 30 Jul 2020 18:09:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV4.1.0-?=
 =?UTF-8?q?=E6=B8=B8=E6=88=8F=E8=AF=84=E8=AE=BA=E5=8A=9F=E8=83=BD=E5=BC=BA?=
 =?UTF-8?q?=E5=8C=9620200730=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=20https:/?=
 =?UTF-8?q?/gitlab.ghzs.com/pm/halo-app-issues/-/issues/925?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gamecenter/gamedetail/desc/DescAdapter.kt | 36 +++++++++----------
 .../rating/RatingCommentItemViewHolder.kt     |  1 +
 .../gamedetail/rating/RatingReplyActivity.kt  |  2 +-
 .../gamedetail/rating/RatingReplyAdapter.kt   | 12 ++++---
 4 files changed, 27 insertions(+), 24 deletions(-)

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<RatingReplyEntity, RatingReplyViewModel
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (requestCode == RatingFragment.RATING_PATCH_REQUEST && resultCode == Activity.RESULT_OK) {
-            mAdapter?.handleSyncData(data)
+            mAdapter?.handleSyncData(requestCode, data)
         }
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt
index 18b1603083..6e3b691dd9 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt
@@ -452,7 +452,7 @@ class RatingReplyAdapter(context: Context,
                     Picasso.with(mContext).load(Uri.parse(it)).priority(Picasso.Priority.HIGH).get()
                 }.subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe ({
+                .subscribe({
                     val bitmapDrawable = BitmapDrawable(mContext.resources, it)
                     bitmapDrawable.setBounds(0, 0, DensityUtil.dip2px(16F), DensityUtil.dip2px(16F))
                     replyNameSpannable.setSpan(CenterImageSpan(bitmapDrawable), startIndex, endIndex, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
@@ -471,16 +471,20 @@ class RatingReplyAdapter(context: Context,
                     }, startIndex, endIndex, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
                     userName.movementMethod = CustomLinkMovementMethod.getInstance()
                     userName.text = replyNameSpannable
-                },{
+                }, {
                     it.printStackTrace()
                 })
     }
 
-    fun handleSyncData(intent: Intent?) {
+    fun handleSyncData(requestCode: Int, intent: Intent?) {
         SyncDataBetweenPageHelper.resultHandle(intent, object : OnSyncCallBack<RatingComment> {
             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) {