From 8ad2556fc77e949af4b8830b5815834b16e1c7a2 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Fri, 11 Nov 2022 20:02:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/common/widget/dialog/DialogManager.java | 1 - .../erban/ui/login/helper/LogoutHelper.java | 1 - .../yizhuan/erban/ui/setting/SettingActivity.java | 15 ++++++++------- .../xchat_android_core/PreferencesUtils.java | 9 --------- .../xchat_android_core/auth/AuthModel.java | 9 +++++++++ .../xchat_android_core/auth/IAuthModel.java | 5 +++++ 6 files changed, 22 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogManager.java b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogManager.java index 410654a31..fe304eabc 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogManager.java +++ b/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; diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/helper/LogoutHelper.java b/app/src/main/java/com/yizhuan/erban/ui/login/helper/LogoutHelper.java index fa3f3c808..644849adb 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/helper/LogoutHelper.java +++ b/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){ diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.java b/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.java index 88bc66a0a..6a95d9b9c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.java +++ b/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); + } } diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/PreferencesUtils.java b/core/src/main/java/com/yizhuan/xchat_android_core/PreferencesUtils.java index 8fca9cf56..6acacd483 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/PreferencesUtils.java +++ b/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); } diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java index 75804c6b1..1547c20b7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java +++ b/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()); + } + /** * 自动登录 * diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java index c4e1afd77..b0c2b9f1c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java +++ b/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