退出登录逻辑优化

app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogManager.java

@@ -5,7 +5,6 @@ import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.graphics.drawable.AnimationDrawable;
 import android.os.Build;
 import android.text.SpannableString;
 import android.text.TextUtils;

app/src/main/java/com/yizhuan/erban/ui/login/helper/LogoutHelper.java

@@ -30,7 +30,6 @@ public class LogoutHelper {
 
     public static void logout() {
         AuthModel.get().logout().subscribe();
-        PreferencesUtils.setFristQQ(true);
     }
 
     public static void dealWithLoginError(BaseActivity activity,Throwable e){

app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.java

@@ -59,12 +59,6 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
 
     }
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-    }
-
     @SuppressLint("CheckResult")
     @Override
     protected void onResume() {
@@ -108,8 +102,8 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
                 ModifyPwdActivity.start(this, ModifyPwdActivity.PAY_PWD);
                 break;
             case R.id.btn_login_out://退出登录
+                getDialogManager().showProgressDialog(this);
                 LogoutHelper.logout();
-                finish();
                 break;
 
             case R.id.tv_community_norms:
@@ -191,8 +185,15 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onLogoutEvent(LogoutEvent event) {
+        getDialogManager().dismissDialog();
         finish();
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        getDialogManager().dismissDialog();
+        EventBus.getDefault().unregister(this);
+    }
 
 }

core/src/main/java/com/yizhuan/xchat_android_core/PreferencesUtils.java

@@ -21,7 +21,6 @@ public class PreferencesUtils {
 
     private static final String KEY_TICKET_INFO = "TicketInfo";
     private static final String KEY_FRIST_SEED_GOLD = "FristSendGold";
-    private static final String KEY_FRIST_QQ = "FristQQ";
     private static final String KEY_FRIST_USER = "FristUser";
     private static final String KEY_LOGIN_INFO = "LoginInfo";
     private static final String KEY_ACCOUNT_INFO = "AccountInfo";
@@ -79,14 +78,6 @@ public class PreferencesUtils {
         SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).putBoolean(KEY_FRIST_SEED_GOLD, isOpen);
     }
 
-    public static boolean readFristQQ() {
-        return SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).getBoolean(KEY_FRIST_QQ, true);
-    }
-
-    public static void setFristQQ(boolean isOpen) {
-        SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).putBoolean(KEY_FRIST_QQ, isOpen);
-    }
-
     public static boolean readFristUser() {
         return SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).getBoolean(KEY_FRIST_USER, true);
     }

core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java

@@ -200,6 +200,15 @@ public class AuthModel extends BaseModel implements IAuthModel {
         return "";
     }
 
+    /**
+     * 判断是否已登录
+     * @return
+     */
+     @Override
+    public boolean isLogin() {
+        return currentAccountInfo != null && !TextUtils.isEmpty(currentAccountInfo.getAccess_token());
+    }
+
     /**
      * 自动登录
      *

core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java

@@ -24,6 +24,11 @@ public interface IAuthModel extends IModel{
      */
     String getTicket();
 
+    /**
+     * 判断是否已登录
+     */
+    boolean isLogin();
+
     /**
      * 自动登录
      * @return