Merge branch '2.2' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.2

Conflicts:
	app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java

app/src/main/java/com/gh/gamecenter/GameDetailActivity.java

@@ -139,14 +139,19 @@ public class GameDetailActivity extends BaseDetailActivity implements View.OnCli
             String url = "http://www.ghzhushou.com/game/" + adapter.getGameDetailEntity().getShareCode();
             showShare(url, gameEntity.getName(), gameEntity.getIcon(), null, gameEntity.getTag(), entrance, "游戏");
         } else if (v == actionbar_rl_back) {
-            DialogUtils.showWarningDialog(GameDetailActivity.this, "退出提示",
-                    "素材更新还在检测中，如果强行退出会中断所有进度，确定退出？",
-                    "取消", "强行退出", new DialogUtils.ConfiremListener() {
-                        @Override
-                        public void onConfirem() {
-                            finish();
-                        }
-                    }, null);
+            if (InitChangeSkinUtils.isChecking) {
+                DialogUtils.showWarningDialog(GameDetailActivity.this, "退出提示",
+                        "素材更新还在检测中，如果强行退出会中断所有进度，确定退出？",
+                        "取消", "强行退出", new DialogUtils.ConfiremListener() {
+                            @Override
+                            public void onConfirem() {
+                                finish();
+                            }
+                        }, null);
+            } else {
+                finish();
+            }
+
         }
     }