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 + ) { 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 items,ReportReasonCallBack callBack) { + public static void showReportReasonDialog(Context context, ArrayList 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 ) { reason, desc -> @@ -370,7 +369,6 @@ class RatingReplyAdapter(context: Context, mEntityList[1].comment!!.id, replyEntity.id, if (reason != "其他原因") reason else desc) } - }) } } "回复" -> {