From 4826c35a701ed1f7a2b66c929da2e55aee88aef0 Mon Sep 17 00:00:00 2001
From: jack <1484288157@qq.com>
Date: Wed, 25 Aug 2021 11:52:59 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV5?=
 =?UTF-8?q?.2.0=E3=80=91=E6=96=B0=E7=A4=BE=E5=8C=BA3=E6=9C=9F-=E8=AE=BA?=
 =?UTF-8?q?=E5=9D=9B=E5=B1=95=E7=A4=BA-=E5=86=85=E5=AE=B9=E4=B8=BE?=
 =?UTF-8?q?=E6=8A=A5=E5=BC=B9=E7=AA=97(0825=20=E4=BA=A7=E5=93=81=E9=AA=8C?=
 =?UTF-8?q?=E6=94=B6=E9=97=AE=E9=A2=981)=20https://git.ghzs.com/pm/halo-ap?=
 =?UTF-8?q?p-issues/-/issues/1421?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gh/common/util/CommentHelper.kt  | 20 +++++++++++++++----
 .../java/com/gh/common/util/DialogUtils.java  |  2 +-
 .../gamedetail/rating/RatingReplyAdapter.kt   |  2 --
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/gh/common/util/CommentHelper.kt b/app/src/main/java/com/gh/common/util/CommentHelper.kt
index 07e2324be2..2cf66d0786 100644
--- a/app/src/main/java/com/gh/common/util/CommentHelper.kt
+++ b/app/src/main/java/com/gh/common/util/CommentHelper.kt
@@ -5,6 +5,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.widget.LinearLayout
 import android.widget.TextView
+import com.gh.common.constant.Constants
+import com.gh.common.json.json
 import com.gh.common.util.CommentUtils.copyText
 import com.gh.common.view.BugFixedPopupWindow
 import com.gh.gamecenter.CommentDetailActivity
@@ -203,7 +205,12 @@ object CommentHelper {
                                             if (error == null) {
                                                 Utils.toast(context, "投诉失败，请稍后重试")
                                             } else {
-                                                Utils.toast(context, "投诉失败，${error.message}")
+                                                if (error is HttpException) {
+                                                    ErrorHelper.handleError(
+                                                        HaloApp.getInstance().application,
+                                                        error.response().errorBody()?.string()
+                                                    )
+                                                }
                                             }
                                         }
                                     }
@@ -493,9 +500,14 @@ object CommentHelper {
         context: Context,
         reportCallback: (reportType: String) -> Unit
     ) {
-        val reportTypes = arrayListOf("垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息", "违法有害信息", "其它")
-        DialogUtils.showVideoComplaintDialog(context, reportTypes, null) { text ->
-            reportCallback.invoke(text)
+        DialogUtils.showReportReasonDialog(
+            context,
+            Constants.REPORT_LIST.toList() as ArrayList<String>
+        ) { reason, desc ->
+            val json = json {
+                "reason" to if (reason != "其他原因") reason else desc
+            }
+            reportCallback.invoke(json.toString())
         }
     }
 
diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java
index 6c53440eed..e91661de2e 100644
--- a/app/src/main/java/com/gh/common/util/DialogUtils.java
+++ b/app/src/main/java/com/gh/common/util/DialogUtils.java
@@ -2017,7 +2017,7 @@ public class DialogUtils {
     }
 
     @SuppressLint("SetTextI18n")
-    public static void showReportReasonDialog(Context context, ArrayList<String> items,ReportReasonCallBack callBack) {
+    public static void showReportReasonDialog(Context context, ArrayList<String> items, ReportReasonCallBack callBack) {
         context = checkDialogContext(context);
 
         final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
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 8bb9a65983..7c532c18cd 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
@@ -361,7 +361,6 @@ class RatingReplyAdapter(context: Context,
                                 }
                                 "投诉" -> {
                                     mContext.ifLogin("游戏详情-评分-评论详情- 投诉评论") {
-                                        OptionDialogHelper.showOptionDialog(mContext, Constants.REPORT_LIST.toList(), callback = { reportType ->
                                             DialogUtils.showReportReasonDialog(mContext,
                                                 Constants.REPORT_LIST.toList() as java.util.ArrayList<String>
                                             ) { reason, desc ->
@@ -370,7 +369,6 @@ class RatingReplyAdapter(context: Context,
                                                     mEntityList[1].comment!!.id,
                                                     replyEntity.id, if (reason != "其他原因") reason else desc)
                                             }
-                                        })
                                     }
                                 }
                                 "回复" -> {