From ffe64e2f4b0a561e834168a7154988ae09e64a68 Mon Sep 17 00:00:00 2001 From: 姚旭斌 <15805828761@163.com> Date: Tue, 13 Mar 2018 11:11:32 +0800 Subject: [PATCH] no message --- app/src/main/java/com/shunzhi/parent/api/LoginRegisterApi.java | 8 +++++--- app/src/main/java/com/shunzhi/parent/bean/CurrentBean.java | 3 +++ app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java | 3 ++- app/src/main/java/com/shunzhi/parent/model/loginandregister/LoginAndRegisterModel.java | 7 +++++++ app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java | 2 +- app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java | 3 --- app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java | 4 ++++ app/src/main/res/drawable/rudiobtn_unclick.xml | 2 +- app/src/main/res/layout/fragment_login_and_regist.xml | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 9 files changed, 90 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/shunzhi/parent/api/LoginRegisterApi.java b/app/src/main/java/com/shunzhi/parent/api/LoginRegisterApi.java index f17f3c6..dddb2d9 100644 --- a/app/src/main/java/com/shunzhi/parent/api/LoginRegisterApi.java +++ b/app/src/main/java/com/shunzhi/parent/api/LoginRegisterApi.java @@ -1,12 +1,14 @@ package com.shunzhi.parent.api; import com.google.gson.JsonObject; +import com.shunzhi.parent.bean.CurrentBean; import io.reactivex.Observable; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; import retrofit2.http.GET; import retrofit2.http.POST; +import retrofit2.http.Query; /** * Created by Administrator on 2018/3/7 0007. @@ -32,10 +34,10 @@ public interface LoginRegisterApi { @GET("api/Account/ChangePhoneCaptcha") Observable getidCodeResult( - @Field("mobile") String username); + @Query("mobile") String username); @FormUrlEncoded - @POST("api/Account/CurrentInfo") - Observable getUserInfo(@Field("grant_type") String grant_type); + @POST("/api/ParentHelper/GetParentInfo") + Observable getUserInfo(); } diff --git a/app/src/main/java/com/shunzhi/parent/bean/CurrentBean.java b/app/src/main/java/com/shunzhi/parent/bean/CurrentBean.java index aecd6e7..bca1933 100644 --- a/app/src/main/java/com/shunzhi/parent/bean/CurrentBean.java +++ b/app/src/main/java/com/shunzhi/parent/bean/CurrentBean.java @@ -5,4 +5,7 @@ package com.shunzhi.parent.bean; */ public class CurrentBean { + + + } diff --git a/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java b/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java index 9778b68..cad58bc 100644 --- a/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java +++ b/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java @@ -4,6 +4,7 @@ import com.google.gson.JsonObject; import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.IBaseFragment; import com.share.mvpsdk.base.IBaseModel; +import com.shunzhi.parent.bean.CurrentBean; import io.reactivex.Observable; @@ -31,7 +32,7 @@ public interface LoginAndRegisterContract { Observable getidCodeResult(String phoneNumber); //获取登录用户信息 -// Observable getUserInfo(); + Observable getUserInfo(); } interface ILoginView extends IBaseFragment { diff --git a/app/src/main/java/com/shunzhi/parent/model/loginandregister/LoginAndRegisterModel.java b/app/src/main/java/com/shunzhi/parent/model/loginandregister/LoginAndRegisterModel.java index e5ecbeb..972ad5d 100644 --- a/app/src/main/java/com/shunzhi/parent/model/loginandregister/LoginAndRegisterModel.java +++ b/app/src/main/java/com/shunzhi/parent/model/loginandregister/LoginAndRegisterModel.java @@ -5,6 +5,7 @@ import com.share.mvpsdk.base.BaseModel; import com.share.mvpsdk.helper.RetrofitCreateHelper; import com.share.mvpsdk.helper.RxHelper; import com.shunzhi.parent.api.LoginRegisterApi; +import com.shunzhi.parent.bean.CurrentBean; import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract; import io.reactivex.Observable; @@ -40,4 +41,10 @@ public class LoginAndRegisterModel extends BaseModel implements LoginAndRegiste .compose(RxHelper.rxSchedulerHelper()); } + @Override + public Observable getUserInfo() { + return RetrofitCreateHelper.getInstance().createApi(LoginRegisterApi.class,LoginRegisterApi.url).getUserInfo() + .compose(RxHelper.rxSchedulerHelper()); + } + } diff --git a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java index 0d26ce2..2b5e709 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java @@ -105,7 +105,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre @Override public void accept(JsonObject jsonObject) throws Exception { //TODO 获取验证码返回 - Log.e("111", jsonObject.toString()); + ToastUtils.showToast("已发送短信，请注意查收"); } }, new Consumer() { @Override diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java index 5a2b305..0ecf5c6 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java @@ -3,10 +3,7 @@ package com.shunzhi.parent.ui.fragment; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.widget.ImageView; import com.bumptech.glide.Glide; diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java index 8fde954..b2d41a9 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java @@ -150,14 +150,18 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_login_and_regist.xml b/app/src/main/res/layout/fragment_login_and_regist.xml index fda6857..018680a 100644 --- a/app/src/main/res/layout/fragment_login_and_regist.xml +++ b/app/src/main/res/layout/fragment_login_and_regist.xml @@ -137,13 +137,52 @@ android:background="@color/bottomline" /> + + + + + + + + + + + + + + + + + + + + + -- libgit2 0.21.0