From 62f184f6ea22cd1e445a335bf48877e1f62cc16f Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Mon, 10 Jun 2019 10:03:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E9=97=AA?=
 =?UTF-8?q?=E9=80=80=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/gh/common/im/ImManager.kt     | 13 ++++++++-----
 .../java/com/gh/gamecenter/NewsDetailActivity.java  |  2 +-
 .../qa/questions/edit/QuestionEditActivity.kt       |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/gh/common/im/ImManager.kt b/app/src/main/java/com/gh/common/im/ImManager.kt
index 760225cc2d..badc7cccd3 100644
--- a/app/src/main/java/com/gh/common/im/ImManager.kt
+++ b/app/src/main/java/com/gh/common/im/ImManager.kt
@@ -5,6 +5,7 @@ import android.app.NotificationManager
 import android.content.Context
 import com.gh.base.CurrentActivityHolder
 import com.gh.common.util.SPUtils
+import com.gh.common.util.tryWithDefaultCatch
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.MainActivity
 import com.gh.gamecenter.MessageActivity
@@ -128,11 +129,13 @@ object ImManager {
     fun sendFeedbackMessage(message: String) {
         val fromToMessage = IMMessage.createTxtMessage(message)
         HaloApp.getInstance().mainExecutor.execute {
-            IMChat.getInstance().sendMessage(fromToMessage, object : ChatListener {
-                override fun onProgress(p0: Int) {}
-                override fun onSuccess() {}
-                override fun onFailed() {}
-            })
+            tryWithDefaultCatch {
+                IMChat.getInstance().sendMessage(fromToMessage, object : ChatListener {
+                    override fun onProgress(p0: Int) {}
+                    override fun onSuccess() {}
+                    override fun onFailed() {}
+                })
+            }
         }
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java
index c9b3654529..1f0a6582c1 100644
--- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java
@@ -525,7 +525,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener,
                 float Y2 = Math.abs(Y12 - Y22);
                 float R2 = (X2 * X2) + (Y2 * Y2);
                 double R12 = Math.sqrt(R2);
-                if (isSecondDown) {
+                if (adapter != null && isSecondDown) {
                     if ((R11 - R12) > scrollSize && fontsize > 1) {
                         fontsize--;
                         adapter.setFontSize(fontsize);
diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt
index 6bc2e13c83..bc45d05729 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt
@@ -258,9 +258,9 @@ class QuestionEditActivity : BaseActivity() {
     }
 
     override fun onDestroy() {
-        super.onDestroy()
         mProcessingDialog?.dismissAllowingStateLoss()
         mProcessingDialog = null
+        super.onDestroy()
     }
 
     override fun onSaveInstanceState(outState: Bundle?) {