退出登录逻辑优化

app/src/main/java/com/mango/moshen/home/dialog/AnchorGradeDialog.kt

@@ -28,8 +28,8 @@ class AnchorGradeDialog : BaseDialog<DialogAnchorGradeBinding>() {
         fun newInstance(): AnchorGradeDialog {
             StatisticManager.Instance()
                 .onEvent(
-                    StatisticsProtocol.EVENT_GRADE_PROFIT_POP_SHOW,
+                    StatisticsProtocol.EVENT_GRADE_PROFIT_POP_CLICK,
-                    "主播评级入口曝光"
+                    "主播评级入口点击"
                 )
             return AnchorGradeDialog()
         }

app/src/main/java/com/mango/moshen/home/fragment/MeFragment.kt

@@ -221,8 +221,8 @@ class MeFragment : BaseFragment(), View.OnClickListener {
             it?.let {
                 StatisticManager.Instance()
                     .onEvent(
-                        StatisticsProtocol.EVENT_GRADE_PROFIT_POP_CLICK,
+                        StatisticsProtocol.EVENT_GRADE_PROFIT_POP_SHOW,
-                        "主播评级入口点击"
+                        "主播评级入口曝光"
                     )
                 mBinding.tvAnchorGrade.isVisible = true
                 anchorDrawableResIds[it.grade.toUpperCase(Locale.getDefault())]?.let { resId ->

app/src/main/java/com/mango/moshen/ui/setting/SettingActivity.java

@@ -10,10 +10,14 @@ import android.view.View;
 
 import androidx.databinding.DataBindingUtil;
 
-import com.netease.nim.uikit.StatusBarUtil;
+import com.mango.core.UriProvider;
-import com.tencent.bugly.beta.Beta;
+import com.mango.core.auth.AuthModel;
-import com.tongdaxing.erban.upgrade.AppUpgradeHelper;
+import com.mango.core.auth.event.LogoutEvent;
-import com.trello.rxlifecycle3.android.ActivityEvent;
+import com.mango.core.user.UserModel;
+import com.mango.core.user.bean.UserInfo;
+import com.mango.core.utils.SharedPreferenceUtils;
+import com.mango.core.withdraw.WithdrawModel;
+import com.mango.core.withdraw.bean.WithdrawInfo;
 import com.mango.moshen.R;
 import com.mango.moshen.UIHelper;
 import com.mango.moshen.application.XChatApplication;
@@ -23,21 +27,15 @@ import com.mango.moshen.databinding.ActivitySettingBinding;
 import com.mango.moshen.ui.im.avtivity.BlackListManageActivity;
 import com.mango.moshen.ui.login.BindPhoneActivity;
 import com.mango.moshen.ui.login.ShowBindPhoneActivity;
-import com.mango.moshen.ui.login.helper.LogoutHelper;
 import com.mango.moshen.ui.user.AboutActivity;
 import com.mango.moshen.ui.webview.CommonWebViewActivity;
 import com.mango.moshen.ui.withdraw.BinderAlipayActivity;
-import com.mango.core.UriProvider;
-import com.mango.core.auth.AuthModel;
-import com.mango.core.auth.event.LogoutEvent;
-import com.mango.core.user.UserModel;
-import com.mango.core.user.bean.UserInfo;
-import com.mango.core.utils.SharedPreferenceUtils;
-import com.mango.core.withdraw.WithdrawModel;
-import com.mango.core.withdraw.bean.WithdrawInfo;
 import com.mango.xchat_android_library.utils.SingleToastUtil;
 import com.mango.xchat_android_library.utils.config.BasicConfig;
 import com.mango.xchat_android_library.utils.file.JXFileUtils;
+import com.netease.nim.uikit.StatusBarUtil;
+import com.tongdaxing.erban.upgrade.AppUpgradeHelper;
+import com.trello.rxlifecycle3.android.ActivityEvent;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -196,8 +194,11 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
                 }
                 break;
             case R.id.btn_login_out://退出登录
-                LogoutHelper.logout();
+                AuthModel.get().logout()
-                finish();
+                        .compose(bindToLifecycle())
+                        .doOnSuccess(s -> finish())
+                        .doOnError(throwable -> SingleToastUtil.showToast(throwable.getMessage()))
+                        .subscribe();
                 break;
 
             case R.id.tv_community_norms: