From 18b2a894226b139652adc91e20a2d1e5580c7f7e Mon Sep 17 00:00:00 2001
From: nilupeng <qingingrunt2010@qq.com>
Date: Tue, 09 Aug 2022 04:07:20 +0000
Subject: [PATCH] 合并优化
---
app/src/main/java/com/runt/open/mvvm/ui/login/LoginViewModel.java | 146 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 140 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/com/runt/open/mvvm/ui/login/LoginViewModel.java b/app/src/main/java/com/runt/open/mvvm/ui/login/LoginViewModel.java
index 866420b..b83f332 100644
--- a/app/src/main/java/com/runt/open/mvvm/ui/login/LoginViewModel.java
+++ b/app/src/main/java/com/runt/open/mvvm/ui/login/LoginViewModel.java
@@ -3,9 +3,14 @@
import androidx.lifecycle.MutableLiveData;
import com.runt.open.mvvm.base.model.BaseViewModel;
+import com.runt.open.mvvm.data.Results;
import com.runt.open.mvvm.retrofit.api.LoginApiCenter;
import com.runt.open.mvvm.retrofit.observable.HttpObserver;
import com.runt.open.mvvm.retrofit.utils.RetrofitUtils;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
import io.reactivex.Observable;
@@ -14,17 +19,146 @@
*/
public class LoginViewModel extends BaseViewModel {
- MutableLiveData<LoggedInUser> loginResult = new MutableLiveData<>();
+ LoginApiCenter loginApi;
- public MutableLiveData<LoggedInUser> getLoginResult() {
+ public LoginViewModel() {
+ loginApi = RetrofitUtils.getInstance().getRetrofit(LoginApiCenter.class);
+ }
+
+ MutableLiveData<Results.LoggedInUser> loginResult = new MutableLiveData<>();
+ MutableLiveData<Results.StringApiResult> verifyResult = new MutableLiveData<>();
+ MutableLiveData<Results.StringApiResult> resetResult = new MutableLiveData<>();
+ MutableLiveData<Results.StringApiResult> registerResult = new MutableLiveData<>();
+ HttpObserver<Results.LoggedInUser> logginObserver = new HttpObserver<Results.LoggedInUser>(){
+ @Override
+ protected void onSuccess(Results.LoggedInUser data) {
+ loginResult.setValue(data);
+ }
+ };
+ public MutableLiveData<Results.LoggedInUser> getLoginResult() {
return loginResult;
}
- public void login(String username, String password) {
- // can be launched in a separate asynchronous job
- final Observable<LoggedInUser> userObservable = RetrofitUtils.getInstance().getRetrofit(LoginApiCenter.class).login(username, password);
- httpObserverOn(userObservable,new HttpObserver<LoggedInUser>(loginResult){});
+ public MutableLiveData<Results.StringApiResult> getVerifyResult() {
+ return verifyResult;
}
+ /**
+ * 密码登录
+ * @param username
+ * @param password
+ */
+ public void login(String username, String password) {
+ // can be launched in a separate asynchronous job
+ final Observable<Results.LoggedInUser> userObservable = loginApi.login(username, password);
+ httpObserverOnLoading(userObservable,logginObserver);
+ }
+ /**
+ * 验证码登录
+ * @param phone
+ * @param code
+ */
+ public void loginByCode(String phone,String code){
+ httpObserverOnLoading(loginApi.loginByCode(phone,code),logginObserver);
+ }
+
+ /**
+ * 重置密码
+ * @param phone
+ * @param sms
+ * @param pass
+ */
+ public void resetPwd(String phone,String sms,String pass){
+ httpObserverOnLoading(loginApi.resetLoginPwd(phone, sms, pass),logginObserver);
+ }
+
+ /**
+ * 注册
+ * @param phone
+ * @param sms
+ * @param pass
+ */
+ public void register(String phone,String sms,String pass){
+ httpObserverOnLoading(loginApi.register(phone, sms, pass), new HttpObserver<Results.StringApiResult>(){
+ @Override
+ protected void onSuccess(Results.StringApiResult data) {
+ resetResult.setValue(data);
+ }
+ });
+ }
+
+ /**
+ * 注册密码
+ * @param phone
+ */
+ public void getRegisterSMS(String phone){
+ getVerifyCode("getRegisterSMS",phone);
+ }
+
+ /**
+ * 忘记密码
+ * @param phone
+ */
+ public void getForgetSMS(String phone){
+ getVerifyCode("getForgetSMS",phone);
+ }
+
+ /**
+ * 登录验证码
+ * @param phone
+ */
+ public void getLoginSMS(String phone){
+ getVerifyCode("getLoginSMS",phone);
+ }
+
+ /**
+ * 获取验证码
+ * @param url 验证码地址
+ * @param phone 手机号
+ */
+ public void getVerifyCode(String url,String phone){
+ String time = new Date().getTime()+"";
+ httpObserverOnLoading(loginApi.getVerifyCode(url, phone, randomString(phone, time), time), new HttpObserver<Results.StringApiResult>(){
+ @Override
+ protected void onSuccess(Results.StringApiResult data) {
+ verifyResult.setValue(data);
+ }
+ });
+ }
+
+ /**
+ * 随机字符串
+ * @param phone
+ * @param time
+ * @return
+ */
+ private String randomString(String phone,String time){
+ int p = (int) Math.round(phone.length()/6.0);
+ int t = time.length()/6;
+ List<String> list = new ArrayList<String>();
+ for(int i = 0 ; i < 6 ; i ++){
+ String str = "";
+ if(i*p>phone.length()){
+ str = phone.substring((i-1)*p);
+ }else if((i+1)*p>phone.length()){
+ str = phone.substring(i*p);
+ }else{
+ str = phone.substring(i*p,(i+1)*p);
+ }
+ String num = ((Integer.parseInt(str)*Long.parseLong(time))+"") ;
+ list.add(num);
+ }
+ //return sb.toString();
+ return plusSingle2(list);
+ }
+
+ private String plusSingle2(List<String> list){
+ StringBuilder sb = new StringBuilder();
+ for(int i = 0 ; i < list.size() ; i ++){
+ sb.append(list.get(i).substring(list.get(i).length()-2<0?0:list.get(i).length()-2));
+ }
+ return sb.toString();
+
+ }
}
--
Gitblit v1.9.1