|
|
@@ -29,25 +29,30 @@ public class LoginPresenter extends BasePresenter<ILoginView> {
|
|
|
.observeOn(AndroidSchedulers.mainThread())
|
|
|
.subscribe(new BaseObserver<BeiUser>() {
|
|
|
@Override
|
|
|
- public void onSuccess(int code, BeiUser result) {
|
|
|
+ public void onSuccess(int code, BeiUser userInfo) {
|
|
|
if (getView() == null) {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
+ if (userInfo == null) {
|
|
|
+ getView().onLoginResult(null, EdenError.COMMON);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
// 老用户直接登录
|
|
|
- long existTime = System.currentTimeMillis() - result.registerTimeMillis;
|
|
|
+ long existTime = System.currentTimeMillis() - userInfo.registerTimeMillis;
|
|
|
boolean isOldUser = Math.abs(existTime) > (24 * 60 * 60 * 1000);
|
|
|
- if (isOldUser) {
|
|
|
- getView().onLoginResult(result, EdenError.SUCCESS);
|
|
|
+ if (isOldUser || userInfo.vip) {
|
|
|
+ getView().onLoginResult(userInfo, EdenError.SUCCESS);
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- if (TextUtils.equals(result.email, ConstantString.NAME_ADMIN)) {
|
|
|
- getView().onLoginResult(result, EdenError.SUCCESS);
|
|
|
+ if (TextUtils.equals(userInfo.email, ConstantString.NAME_ADMIN)) {
|
|
|
+ getView().onLoginResult(userInfo, EdenError.SUCCESS);
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- getRegionInfo(result);
|
|
|
+ getRegionInfo(userInfo);
|
|
|
}
|
|
|
|
|
|
@Override
|