diff --git a/app/src/main/java/com/gh/common/util/DeviceUtils.java b/app/src/main/java/com/gh/common/util/DeviceUtils.java
index e7ac107db4..1b657a5a35 100644
--- a/app/src/main/java/com/gh/common/util/DeviceUtils.java
+++ b/app/src/main/java/com/gh/common/util/DeviceUtils.java
@@ -218,11 +218,9 @@ public class DeviceUtils {
 
 
     // get sim
+    @Deprecated
     public static String getSim(Context context) {
         String imsi = getTelephonySubscriberId(context);
-        if (imsi == null) {
-            return "";
-        }
         if (imsi.startsWith("46000") || imsi.startsWith("46002") || imsi.startsWith("46007")) {
             return "中国移动";
         }
@@ -235,7 +233,7 @@ public class DeviceUtils {
         return "";
     }
 
-    @Nullable
+    @Deprecated
     public static String getTelephonySubscriberId(Context context) {
         return "";
     }
diff --git a/app/src/main/java/com/gh/common/util/PackageUtils.java b/app/src/main/java/com/gh/common/util/PackageUtils.java
index a1aabf7050..b04a71c2f2 100644
--- a/app/src/main/java/com/gh/common/util/PackageUtils.java
+++ b/app/src/main/java/com/gh/common/util/PackageUtils.java
@@ -15,6 +15,7 @@ import android.os.Bundle;
 import android.os.PowerManager;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.android.apksig.ApkVerifier;
@@ -226,6 +227,7 @@ public class PackageUtils {
      * String[1] 为接口风格的公钥字符串
      * 请自行根据需要取用
      */
+    @NonNull
     public static String[] getApkSignatureByPackageName(Context context, String packageName) {
         try {
             PackageInfo packageInfo = context.getApplicationContext().getPackageManager()
@@ -334,7 +336,7 @@ public class PackageUtils {
      * 解析签名
      */
     private static String[] parseSignature(byte[] signature) {
-        String[] ret = null;
+        String[] ret;
         try {
             CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
             X509Certificate cert = (X509Certificate) certFactory.generateCertificate(
@@ -344,6 +346,7 @@ public class PackageUtils {
                 ret[1] = "DSAPublicKey{" + ApkSigningBlockUtilsLite.toHex(cert.getPublicKey().getEncoded()) + "}";
             }
         } catch (CertificateException e) {
+            ret = new String[]{null, null};
             e.printStackTrace();
         }
         return ret;
@@ -842,6 +845,9 @@ public class PackageUtils {
             process.waitFor();
         } catch (Exception e) {
             e.printStackTrace();
+            if (e instanceof InterruptedException) {
+                Thread.currentThread().interrupt();
+            }
         } finally {
             if (bufferedReader != null)
                 try {
diff --git a/app/src/main/java/com/gh/common/view/RichEditor.java b/app/src/main/java/com/gh/common/view/RichEditor.java
index 808f386ad5..6fcfd38220 100644
--- a/app/src/main/java/com/gh/common/view/RichEditor.java
+++ b/app/src/main/java/com/gh/common/view/RichEditor.java
@@ -133,11 +133,7 @@ public class RichEditor extends WebView {
 
         int widthPixels = getResources().getDisplayMetrics().widthPixels - DisplayUtils.dip2px(40);
         mThumbnailImageWidth = widthPixels / 3;
-        if (NetworkUtils.isWifiConnected(getContext())) {
-            mDefaultImageWidth = widthPixels * 2;
-        } else {
-            mDefaultImageWidth = widthPixels * 2;
-        }
+        mDefaultImageWidth = widthPixels * 2;
     }
 
     @SuppressLint({"SetJavaScriptEnabled", "AddJavascriptInterface"})
diff --git a/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt b/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt
index f49b5b388a..28730f92a3 100644
--- a/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt
@@ -164,7 +164,6 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
             val position = mViewPager.currentItem
             val `object`: Any? = mViewPager.findViewWithTag(position)
             if (`object` != null) {
-                mProgressHint.width = mProgressHint.width
                 val view = `object` as RelativeLayout
                 val imageView: BigImageView = view.findViewById(R.id.viewimage_iv_show)
                 val url = mUrlList!![position]
diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java
index 1ee51f5f03..2e4e7cbd16 100644
--- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java
@@ -179,7 +179,7 @@ public class NewsDetailActivity extends ToolBarActivity implements OnClickListen
      */
     public static void startNewsDetailActivity(Context context, NewsEntity newsEntity, String entrance) {
         MtaHelper.onEvent("详情页面", "文章详情", newsEntity != null ? newsEntity.getTitle() : "");
-        if (!TextUtils.isEmpty(newsEntity.getLink())) {
+        if (newsEntity != null && !TextUtils.isEmpty(newsEntity.getLink())) {
             context.startActivity(WebActivity.getIntentByNews(context, newsEntity, entrance));
         } else {
             Intent intent = new Intent(context, NewsDetailActivity.class);
@@ -196,7 +196,7 @@ public class NewsDetailActivity extends ToolBarActivity implements OnClickListen
      */
     public static void startNewsDetailByCollection(Context context, NewsEntity newsEntity, String entrance) {
         MtaHelper.onEvent("详情页面", "文章详情", newsEntity != null ? newsEntity.getTitle() : "");
-        if (!TextUtils.isEmpty(newsEntity.getLink())) {
+        if (newsEntity != null && !TextUtils.isEmpty(newsEntity.getLink())) {
             Intent intent = WebActivity.getIntentByNews(context, newsEntity, entrance);
             context.startActivity(intent);
         } else {
diff --git a/app/src/main/java/com/gh/gamecenter/baselist/LazyListFragment.java b/app/src/main/java/com/gh/gamecenter/baselist/LazyListFragment.java
index 79b286811b..235121a99e 100644
--- a/app/src/main/java/com/gh/gamecenter/baselist/LazyListFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/baselist/LazyListFragment.java
@@ -66,7 +66,7 @@ public abstract class LazyListFragment<T, VM extends BaseListViewModel /* 该泛
 
     protected VM provideListViewModel() {
         Class<VM> viewModelClass = getViewModelClass();
-        if (!NormalListViewModel.class.getName().equals(viewModelClass.getName())) {
+        if (!NormalListViewModel.class.isAssignableFrom(viewModelClass)) {
             return ViewModelProviders.of(this).get(viewModelClass);
         } else {
             NormalListViewModel.Factory factory = new NormalListViewModel.Factory(HaloApp.getInstance().getApplication(), this);
diff --git a/app/src/main/java/com/gh/gamecenter/baselist/ListActivity.java b/app/src/main/java/com/gh/gamecenter/baselist/ListActivity.java
index ebab9ec2cc..4e13969592 100644
--- a/app/src/main/java/com/gh/gamecenter/baselist/ListActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/baselist/ListActivity.java
@@ -61,7 +61,7 @@ public abstract class ListActivity<T, VM extends BaseListViewModel /* 该泛型
 
     protected VM provideListViewModel() {
         Class<VM> viewModelClass = getViewModelClass();
-        if (!NormalListViewModel.class.getName().equals(viewModelClass.getName())) {
+        if (!NormalListViewModel.class.isAssignableFrom(viewModelClass)) {
             return ViewModelProviders.of(this).get(viewModelClass);
         } else {
             NormalListViewModel.Factory factory = new NormalListViewModel.Factory(HaloApp.getInstance().getApplication(), this);
diff --git a/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java b/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java
index 8bb30e0383..a7d2aa7dc0 100644
--- a/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java
@@ -72,7 +72,7 @@ public abstract class ListFragment<T, VM extends BaseListViewModel /* 该泛型
 
     protected VM provideListViewModel() {
         Class<VM> viewModelClass = getViewModelClass();
-        if (!NormalListViewModel.class.getName().equals(viewModelClass.getName())) {
+        if (!NormalListViewModel.class.isAssignableFrom(viewModelClass)) {
             return ViewModelProviders.of(this).get(viewModelClass);
         } else {
             NormalListViewModel.Factory factory = new NormalListViewModel.Factory(HaloApp.getInstance().getApplication(), this);
diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailRefreshFooter.java b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailRefreshFooter.java
index bbe4985796..e7fc037dbf 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailRefreshFooter.java
+++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailRefreshFooter.java
@@ -110,7 +110,7 @@ public class AnswerDetailRefreshFooter extends InternalClassics<AnswerDetailRefr
     @Override
     public int onFinish(@NonNull RefreshLayout layout, boolean success) {
         if (!mNoMoreData) {
-            mTitleText.setText(success ? "" : "");
+            mTitleText.setText("");
             return super.onFinish(layout, success);
         }
         return 0;
diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailRefreshHeader.java b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailRefreshHeader.java
index 05ce2e860f..ff34293a79 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailRefreshHeader.java
+++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailRefreshHeader.java
@@ -2,8 +2,10 @@ package com.gh.gamecenter.qa.answer.detail;
 
 import android.content.Context;
 import android.content.res.TypedArray;
+
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
+
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.View;
@@ -107,11 +109,7 @@ public class AnswerDetailRefreshHeader extends InternalClassics<AnswerDetailRefr
 
     @Override
     public int onFinish(@NonNull RefreshLayout layout, boolean success) {
-        if (success) {
-            mTitleText.setText("");
-        } else {
-            mTitleText.setText("");
-        }
+        mTitleText.setText("");
         return super.onFinish(layout, success);//延迟500毫秒之后再弹回
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt
index d58f08db81..5788576727 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt
@@ -66,7 +66,7 @@ abstract class BaseCommentAdapter(
         if (oldItem?.footer != null) return false
 
         return oldItem?.commentTop?.vote == newItem?.commentTop?.vote
-                && oldItem?.commentTop?.me?.isVoted == oldItem?.commentTop?.me?.isVoted
+                && oldItem?.commentTop?.me?.isVoted == newItem?.commentTop?.me?.isVoted
                 && oldItem?.commentNormal?.vote == newItem?.commentNormal?.vote
                 && oldItem?.commentNormal?.reply == newItem?.commentNormal?.reply
                 && oldItem?.commentNormal?.me?.isCommentVoted == newItem?.commentNormal?.me?.isCommentVoted
diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/ObservableUtil.java b/app/src/main/java/com/gh/gamecenter/retrofit/ObservableUtil.java
index 423e1525f1..d74b82cfef 100644
--- a/app/src/main/java/com/gh/gamecenter/retrofit/ObservableUtil.java
+++ b/app/src/main/java/com/gh/gamecenter/retrofit/ObservableUtil.java
@@ -51,6 +51,9 @@ public class ObservableUtil {
                     emitter.onNext(t);
                 } catch (Throwable e) {
                     e.printStackTrace();
+                    if (e instanceof InterruptedException) {
+                        Thread.currentThread().interrupt();
+                    }
                 }
                 emitter.onComplete();
             }