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 6b43337b1..a7648b578 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 @@ -219,20 +219,9 @@ public class AuthModel extends BaseModel implements IAuthModel { if (currentAccountInfo == null || TextUtils.isEmpty(currentAccountInfo.getAccess_token())) { return Single.error(new Throwable(""));//没有账号信息 } - return requestTicket().flatMap(ticketResult -> { - if (!ticketResult.isSuccess()) { - return Single.error(new Throwable(ticketResult.getMessage())); - } - ticketInfo = ticketResult.getData(); - DemoCache.saveTicketInfo(ticketInfo); - return Single.just(ResUtil.getString(R.string.xchat_android_core_auth_authmodel_01)); - }) + return imLogin(currentAccountInfo) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .flatMap((Function>) s -> { - Log.i("IMLogin", "apply"); - return imLogin(currentAccountInfo); - }) .doOnSuccess(s -> { EventBus.getDefault().post(new LoginEvent()); });