Merge branch '3.0' of gitlab.ghzhushou.com:halo/assistant-android into 3.0

# Conflicts:
#	app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java
#	app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java
#	app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java

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

@@ -167,7 +167,8 @@ public class SettingActivity extends BaseActivity implements OnClickListener {
             R.id.setting_rl_cache,
             R.id.setting_cv_font_size,
             R.id.setting_rl_concerngame,
-            R.id.setting_rl_about
+            R.id.setting_rl_about,
+            R.id.setting_logout_rl
     })
     @Override
     public void onClick(final View v) {
@@ -217,6 +218,16 @@ public class SettingActivity extends BaseActivity implements OnClickListener {
                 break;
             case R.id.setting_rl_concerngame:
                 mSettingConcerngameSb.performClick();
+                break;
+            case R.id.setting_logout_rl:
+                DialogUtils.showAlertDialog(this, "注销登录", "退出账号即会回到游客状态，很多功能将无法使用（例如评论、客服消息），确定退出吗？",
+                        "确定退出", "取消", new DialogUtils.ConfirmListener() {
+                            @Override
+                            public void onConfirm() {
+                                finish();
+                            }
+                        }, null);
+                break;
             default:
                 break;
         }