diff --git a/app/src/main/java/com/shunzhi/parent/AppConfig.java b/app/src/main/java/com/shunzhi/parent/AppConfig.java index bd67d09..c6b04be 100644 --- a/app/src/main/java/com/shunzhi/parent/AppConfig.java +++ b/app/src/main/java/com/shunzhi/parent/AppConfig.java @@ -40,18 +40,18 @@ public class AppConfig { public static String APP_IS_START = "app_is_start"; //测试 -// public static String BASE_URL="http://60.190.202.57:1000/"; -// public static String BASE_URL_ORDER="http://60.190.202.57:8101/"; -// public static String BASE_URL_FILE="http://60.190.202.57:8196"; -// public static String BASE_URL_VOTE = "http://60.190.202.57:8812/"; + public static String BASE_URL="http://60.190.202.57:1000/"; + public static String BASE_URL_ORDER="http://60.190.202.57:8101/"; + public static String BASE_URL_FILE="http://60.190.202.57:8196"; + public static String BASE_URL_VOTE = "http://60.190.202.57:8812/"; //正式 - public static String BASE_URL = "http://campus.myjxt.com/"; - public static String BASE_URL_ORDER = "http://parent.myjxt.com/"; - public static String BASE_URL_FILE = "http://manage.myjxt.com"; -// public static String BASE_URL_VOTE = "www.sxspy.net/"; - public static String BASE_URL_VOTE = "http://www.sxspy.net/"; +// public static String BASE_URL = "http://campus.myjxt.com/"; +// public static String BASE_URL_ORDER = "http://parent.myjxt.com/"; +// public static String BASE_URL_FILE = "http://manage.myjxt.com"; +//// public static String BASE_URL_VOTE = "www.sxspy.net/"; +// public static String BASE_URL_VOTE = "http://www.sxspy.net/"; //默认日志保存的路径 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 5b1b19b..96b40d9 100644 --- a/app/src/main/java/com/shunzhi/parent/api/LoginRegisterApi.java +++ b/app/src/main/java/com/shunzhi/parent/api/LoginRegisterApi.java @@ -47,4 +47,6 @@ public interface LoginRegisterApi { @POST("/api/ParentHelper/GetParentInfo") Observable getUserInfo(@Field("mobile") String mobile, @Field("school_id") int school_id, @Field("captcha") String captcha); + @GET("api/ParentHelper/ParentJudge") + Observable getParentJudge(String mobile); } 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 809721e..270dca1 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 @@ -26,6 +26,8 @@ public interface LoginAndRegisterContract { public abstract void nimLogin(String account,String password); public abstract void reSetpassResult(String adminName,String idCode,String password); + + public abstract void isParentJudge(String mobile,String pwd); } interface ILoginModel extends IBaseModel{ @@ -40,6 +42,8 @@ public interface LoginAndRegisterContract { Observable nimLoginResult(String account, String token); Observable reSetpass(String adminName,String idCode,String password); + + Observable getParentJudge(String mobile); } 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 6639de2..6b6049f 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 @@ -59,4 +59,10 @@ public class LoginAndRegisterModel extends BaseModel implements LoginAndRegiste .compose(RxHelper.rxSchedulerHelper()); } + @Override + public Observable getParentJudge(String mobile) { + return RetrofitCreateHelper.getInstance().createApi(LoginRegisterApi.class, LoginRegisterApi.url).getParentJudge(mobile) + .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 084e7f6..21df449 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 @@ -75,7 +75,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre if (responseBody == null) return; try { JSONObject json = new JSONObject(responseBody.string()); - ToastUtils.showToast(json.optString("message")+"json="+json); + ToastUtils.showToast(json.optString("message") + "json=" + json); if (TextUtils.isEmpty(json.optString("error"))) { mIView.showerror(json.optString("message")); return; @@ -107,7 +107,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre //TODO 注册成功返回 AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, adminName); AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_PWD, password); - mIView.getUserInfo(1,""); + mIView.getUserInfo(1, ""); } }, new Consumer() { @Override @@ -170,7 +170,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre if (currentBean.getStudentClass() != null && currentBean.getStudentClass().size() > 0) { // Log.e("qqqq--==","qqqqq"); - AppConfig.getAppConfig(mIView.getBindActivity()).set(AppConfig.ISBINDING,"1"); + AppConfig.getAppConfig(mIView.getBindActivity()).set(AppConfig.ISBINDING, "1"); } String account = currentBean.getUserid(); @@ -212,9 +212,9 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre // Log.d("77777","NIMLoginResultBean="+bean); if (bean.isSuccess()) { AppConfig.ISLOGIN = true; - mIView.getUserInfo(0,""); - }else { - mIView.getUserInfo(-1,"通讯登录失败:"+bean.getResultCode()); + mIView.getUserInfo(0, ""); + } else { + mIView.getUserInfo(-1, "通讯登录失败:" + bean.getResultCode()); } } })); @@ -225,18 +225,39 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre @Override public void accept(JsonObject jsonObject) throws Exception { AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, adminName); - mIView.getUserInfo(2,""); + mIView.getUserInfo(2, ""); } }, new Consumer() { @Override public void accept(Throwable throwable) throws Exception { - mIView.getUserInfo(-1,throwable.getMessage()); + mIView.getUserInfo(-1, throwable.getMessage()); // OkHttpExceptionUtil.handOkHttpException((HttpException) throwable); } })); } + @Override + public void isParentJudge(final String mobile, final String pwd) { + + mRxManager.register(mIModel.getParentJudge(mobile).subscribe(new Consumer() { + @Override + public void accept(JsonObject jsonObject) throws Exception { + if (jsonObject.get("data").getAsBoolean()) { + loginResult(mobile, pwd); + } else { + ToastUtils.showToast("账号不存在，请先注册账号"); + } + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + + } + })); + + } + @Override public LoginAndRegisterContract.ILoginModel getModel() { 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 5c33704..91fad29 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 @@ -195,7 +195,8 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment