Merge branch 'master' into page

nilupeng

2022-08-09 92f09807eeb57f0cb9a4686cde38834549b34962

 app/src/main/java/com/runt/open/mvvm/ui/login/LoginViewModel.java

@@ -1,18 +1,18 @@
package com.runt.open.mvvm.ui.login;

import androidx.lifecycle.MutableLiveData;

import com.runt.open.mvvm.base.activities.BaseActivity;
import com.runt.open.mvvm.base.model.BaseViewModel;
import com.runt.open.mvvm.data.HttpApiResult;
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 io.reactivex.Observable;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import io.reactivex.Observable;

/**
 * Created by Administrator on 2021/11/15 0015.
@@ -25,21 +25,28 @@
        loginApi = RetrofitUtils.getInstance().getRetrofit(LoginApiCenter.class);
    }

    MutableLiveData<Results.LoggedInUser> loginResult = new MutableLiveData<>();
    MutableLiveData<Results.StringApiResult> verifyResult = new MutableLiveData<>();
    MutableLiveData<UserBean> loginResult = new MutableLiveData<>();
    MutableLiveData<Integer> 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() {
    HttpObserver<UserBean> logginObserver;

    @Override
    public void onCreate(BaseActivity activity) {
        super.onCreate(activity);
        logginObserver = new HttpObserver<UserBean>(mActivity){
            @Override
            protected void onSuccess(UserBean data) {
                loginResult.setValue(data);
            }
        };
    }

    public MutableLiveData<UserBean> getLoginResult() {
        return loginResult;
    }

    public MutableLiveData<Results.StringApiResult> getVerifyResult() {
    public MutableLiveData<Integer> getVerifyResult() {
        return verifyResult;
    }

@@ -50,7 +57,7 @@
     */
    public void login(String username, String password) {
        // can be launched in a separate asynchronous job
        final Observable<Results.LoggedInUser> userObservable = loginApi.login(username, password);
        final Observable<HttpApiResult<UserBean>> userObservable = loginApi.login(username, password);
        httpObserverOnLoading(userObservable,logginObserver);
    }

@@ -119,10 +126,16 @@
     */
    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>(){
        httpObserverOnLoading(loginApi.getVerifyCode(url, phone, randomString(phone, time), time), new HttpObserver<Results.SmsResult>(){
            @Override
            protected void onSuccess(Results.StringApiResult data) {
                verifyResult.setValue(data);
            protected void onSuccess(Results.SmsResult data) {
                verifyResult.setValue(0);
            }

            @Override
            protected void onFailed(HttpApiResult httpResult) {
                super.onFailed(httpResult);
                verifyResult.setValue(-1);
            }
        });
    }