|
@@ -12,6 +12,7 @@ import com.datarecovery.master.R;
|
|
|
import com.datarecovery.master.data.api.AtmobApi;
|
|
import com.datarecovery.master.data.api.AtmobApi;
|
|
|
import com.datarecovery.master.data.api.request.BaseRequest;
|
|
import com.datarecovery.master.data.api.request.BaseRequest;
|
|
|
import com.datarecovery.master.data.api.request.LoginRequest;
|
|
import com.datarecovery.master.data.api.request.LoginRequest;
|
|
|
|
|
+import com.datarecovery.master.data.api.request.QuickLoginRequest;
|
|
|
import com.datarecovery.master.data.api.request.SendCodeRequest;
|
|
import com.datarecovery.master.data.api.request.SendCodeRequest;
|
|
|
import com.datarecovery.master.data.api.response.LoginResponse;
|
|
import com.datarecovery.master.data.api.response.LoginResponse;
|
|
|
import com.datarecovery.master.data.api.response.UserInfoResponse;
|
|
import com.datarecovery.master.data.api.response.UserInfoResponse;
|
|
@@ -21,6 +22,8 @@ import com.datarecovery.master.utils.BoxingUtil;
|
|
|
import com.datarecovery.master.utils.RxHttpHandler;
|
|
import com.datarecovery.master.utils.RxHttpHandler;
|
|
|
import com.datarecovery.master.utils.ToastUtil;
|
|
import com.datarecovery.master.utils.ToastUtil;
|
|
|
|
|
|
|
|
|
|
+import java.util.concurrent.TimeUnit;
|
|
|
|
|
+
|
|
|
import javax.inject.Inject;
|
|
import javax.inject.Inject;
|
|
|
import javax.inject.Singleton;
|
|
import javax.inject.Singleton;
|
|
|
|
|
|
|
@@ -76,15 +79,23 @@ public class AccountRepository {
|
|
|
|
|
|
|
|
private void onLoginSuccess(String phoneNum, String token) {
|
|
private void onLoginSuccess(String phoneNum, String token) {
|
|
|
AccountRepository.token = token;
|
|
AccountRepository.token = token;
|
|
|
- this.loginPhoneNum.setValue(phoneNum);
|
|
|
|
|
|
|
+ setLoginPhoneNum(phoneNum);
|
|
|
deviceFuncRepository.refreshFuncAuths();
|
|
deviceFuncRepository.refreshFuncAuths();
|
|
|
payRepository.refreshOrderPageList();
|
|
payRepository.refreshOrderPageList();
|
|
|
- KVUtils.getDefault().putString(KEY_LOGIN_PHONE_NUM, phoneNum);
|
|
|
|
|
KVUtils.getDefault().putString(KEY_LOGIN_TOKEN, token);
|
|
KVUtils.getDefault().putString(KEY_LOGIN_TOKEN, token);
|
|
|
//查找并存储userId
|
|
//查找并存储userId
|
|
|
refreshUserInfo();
|
|
refreshUserInfo();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ private void setLoginPhoneNum(String phoneNum) {
|
|
|
|
|
+ if (TextUtils.isEmpty(phoneNum)) {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ loginPhoneNum.setValue(phoneNum);
|
|
|
|
|
+ KVUtils.getDefault().putString(KEY_LOGIN_PHONE_NUM, phoneNum);
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
|
|
|
public Single<?> requestUserCode(String phoneNum) {
|
|
public Single<?> requestUserCode(String phoneNum) {
|
|
|
long currentTime = System.currentTimeMillis();
|
|
long currentTime = System.currentTimeMillis();
|
|
@@ -114,6 +125,7 @@ public class AccountRepository {
|
|
|
@Override
|
|
@Override
|
|
|
public void onSuccess(@NonNull UserInfoResponse userInfoResponse) {
|
|
public void onSuccess(@NonNull UserInfoResponse userInfoResponse) {
|
|
|
requestUserInfoDisabled = false;
|
|
requestUserInfoDisabled = false;
|
|
|
|
|
+ setLoginPhoneNum(userInfoResponse.getPhone());
|
|
|
QiYuHelper.setUserInfo(getKeyLoginPhoneNum(), userInfoResponse.getUserId(), token);
|
|
QiYuHelper.setUserInfo(getKeyLoginPhoneNum(), userInfoResponse.getUserId(), token);
|
|
|
KVUtils.getDefault().putString(KEY_LOGIN_USER_ID, userInfoResponse.getUserId());
|
|
KVUtils.getDefault().putString(KEY_LOGIN_USER_ID, userInfoResponse.getUserId());
|
|
|
}
|
|
}
|
|
@@ -195,6 +207,14 @@ public class AccountRepository {
|
|
|
.compose(RxJavaUtil.SingleSchedule.io2Main());
|
|
.compose(RxJavaUtil.SingleSchedule.io2Main());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ public Single<LoginResponse> quickLogin(String token, String accessToken) {
|
|
|
|
|
+ return atmobApi.quickLogin(new QuickLoginRequest(token, accessToken))
|
|
|
|
|
+ .compose(RxHttpHandler.handle(false))
|
|
|
|
|
+ .retryWhen(RxJavaUtil.retryWhen(null, 3, 500, TimeUnit.MILLISECONDS))
|
|
|
|
|
+ .compose(RxJavaUtil.SingleSchedule.io2Main())
|
|
|
|
|
+ .doOnSuccess((response) -> onLoginSuccess(null, response.getToken()));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
public static String getUserId() {
|
|
public static String getUserId() {
|
|
|
return KVUtils.getDefault().getString(KEY_LOGIN_USER_ID, "");
|
|
return KVUtils.getDefault().getString(KEY_LOGIN_USER_ID, "");
|
|
|
}
|
|
}
|