From afff3446c43ba8880b2c0ea0ba92ea9f2890ebdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com>
Date: Wed, 16 Sep 2020 14:23:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=86=E9=A2=91=E6=B5=81?=
 =?UTF-8?q?=E8=AF=84=E8=AE=BA=E6=8A=95=E8=AF=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gh/common/util/CommentHelper.kt  |  8 +-------
 .../java/com/gh/common/util/DialogUtils.java  | 20 +++++++++++++++++--
 2 files changed, 19 insertions(+), 9 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 9ac4273872..e1c9af7356 100644
--- a/app/src/main/java/com/gh/common/util/CommentHelper.kt
+++ b/app/src/main/java/com/gh/common/util/CommentHelper.kt
@@ -361,13 +361,7 @@ object CommentHelper {
             }
         } else {
             DialogUtils.showVideoComplaintDialog(context, reportTypes, null) { text ->
-                val jsonObject = JSONObject()
-                try {
-                    jsonObject.put("reason", text)
-                    reportCallback.invoke(jsonObject.toString())
-                } catch (e: JSONException) {
-                    e.printStackTrace()
-                }
+                reportCallback.invoke(text)
             }
         }
     }
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 d94ee3ed90..bd186bf3c2 100644
--- a/app/src/main/java/com/gh/common/util/DialogUtils.java
+++ b/app/src/main/java/com/gh/common/util/DialogUtils.java
@@ -61,6 +61,9 @@ import com.lightgame.utils.AppManager;
 import com.lightgame.utils.Util_System_Keyboard;
 import com.lightgame.utils.Utils;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -1684,7 +1687,13 @@ public class DialogUtils {
                     otherComplaintContainer.setVisibility(View.VISIBLE);
                 } else {
                     dialog.cancel();
-                    callback.onClicked(reportTv.getText().toString());
+                    JSONObject jsonObject = new JSONObject();
+                    try {
+                        jsonObject.put("reason", reportTv.getText().toString());
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
+                    callback.onClicked(jsonObject.toString());
                 }
             });
         }
@@ -1700,7 +1709,14 @@ public class DialogUtils {
                 return;
             }
             dialog.cancel();
-            callback.onClicked(complaintCommentEt.getText().toString());
+            JSONObject jsonObject = new JSONObject();
+            try {
+                jsonObject.put("reason", "其它");
+                jsonObject.put("description", complaintCommentEt.getText().toString());
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+            callback.onClicked(jsonObject.toString());
         });
 
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);