Merge branch 'master' into page

nilupeng

2022-08-09 92f09807eeb57f0cb9a4686cde38834549b34962

 app/src/main/java/com/runt/open/mvvm/retrofit/api/LoginApiCenter.java

@@ -4,6 +4,7 @@
import com.runt.open.mvvm.data.HttpApiResult;
import com.runt.open.mvvm.data.Results;

import com.runt.open.mvvm.ui.login.UserBean;
import io.reactivex.Observable;
import retrofit2.http.Field;
import retrofit2.http.FormUrlEncoded;
@@ -22,7 +23,7 @@
     */
    @FormUrlEncoded
    @POST("login")
    Observable<Results.LoggedInUser> login(@Field(Configuration.KEY_PHONE) String phone, @Field("pass") String pass);
    Observable<HttpApiResult<UserBean>> login(@Field(Configuration.KEY_PHONE) String phone, @Field("pass") String pass);

    /**
     * 验证码登录
@@ -32,7 +33,7 @@
     */
    @FormUrlEncoded
    @POST("loginCode")
    Observable<Results.LoggedInUser> loginByCode(@Field(Configuration.KEY_PHONE) String phone, @Field(Configuration.KEY_CODE) String code);
    Observable<HttpApiResult<UserBean>> loginByCode(@Field(Configuration.KEY_PHONE) String phone, @Field(Configuration.KEY_CODE) String code);


    @FormUrlEncoded