From e80f1b4fd9e55f495df179c84b2c585add33c2dd Mon Sep 17 00:00:00 2001 From: 姚旭斌 <15805828761@163.com> Date: Tue, 20 Mar 2018 13:59:31 +0800 Subject: [PATCH] no message --- app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java | 2 +- app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java | 1 + app/src/main/java/com/shunzhi/parent/contract/mine/MyChildContract.java | 2 +- app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java | 4 ++++ app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java | 53 +++++++++++++++++++++++++++++++++++++++++++++-------- app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java | 23 ++++++++++++++++------- app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java | 2 +- app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java | 2 +- app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java | 6 +++--- app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java | 44 +++++++++++++++++++++++++++++++++++--------- app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java | 6 ++++++ app/src/main/res/drawable/rudiobtn_unclick.xml | 2 +- app/src/main/res/layout/activity_webview.xml | 14 ++++++++------ app/src/main/res/layout/fragment_login_and_regist.xml | 1 + 14 files changed, 124 insertions(+), 38 deletions(-) diff --git a/app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java b/app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java index bb8be66..751fa1d 100644 --- a/app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java +++ b/app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java @@ -33,7 +33,7 @@ public class ChildAdapter extends BaseRecyclerViewAdapter { @Override public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.activity_web_view, null); + View view = LayoutInflater.from(context).inflate(R.layout.item_childlist, null); return new MyViewHolder(view); } 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 b1bc18d..d9ff489 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 @@ -45,6 +45,7 @@ public interface LoginAndRegisterContract { //更新用户信息 void getUserInfo(int type); + void showerror(String error); } diff --git a/app/src/main/java/com/shunzhi/parent/contract/mine/MyChildContract.java b/app/src/main/java/com/shunzhi/parent/contract/mine/MyChildContract.java index 9912039..00985b1 100644 --- a/app/src/main/java/com/shunzhi/parent/contract/mine/MyChildContract.java +++ b/app/src/main/java/com/shunzhi/parent/contract/mine/MyChildContract.java @@ -41,7 +41,7 @@ public interface MyChildContract { interface IMyChildView extends IBaseActivity { void updateChildList(CurrentBean currentBean); - void addChildSuccess(); + void addChildSuccess(String account,String password); void showClass(Listlist); void showError(String error); diff --git a/app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java b/app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java index 4c418b6..c27ad65 100644 --- a/app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java +++ b/app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java @@ -37,6 +37,10 @@ public class ConsultOneModel extends BaseModel implements ConsultOneContract.ICo .getConsultContent(areaName,channel,toFirstPage,pageIndex).compose(RxHelper.rxSchedulerHelper()); } + @Override + public Observable getInformationTopic(String keyword, String areaName, String channel, String toFirstPage, int pageIndex) { + return null; + } } 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 4e8d6db..3b7e7d8 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 @@ -17,11 +17,15 @@ import com.shunzhi.parent.model.loginandregister.LoginAndRegisterModel; import com.shunzhi.parent.ui.fragment.loginandregistfragment.LoginAndRegistFragment; import com.shunzhi.parent.util.Utils; +import org.json.JSONObject; + import java.util.regex.Matcher; import java.util.regex.Pattern; import io.reactivex.functions.Consumer; +import okhttp3.ResponseBody; import retrofit2.HttpException; +import retrofit2.Response; import timber.log.Timber; /** @@ -35,7 +39,8 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre @Override public void loginResult(final String loginName, final String loginPwd) { if (!isMate(loginName, REGEX_MOBILE)) { - ToastUtils.showToast("请输入正确的手机号！！"); + + mIView.showerror("请输入正确的手机号！！"); return; } @@ -64,9 +69,21 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre }, new Consumer() { @Override public void accept(Throwable throwable) throws Exception { - if (null != throwable) - OkHttpExceptionUtil.handOkHttpException((HttpException) throwable); -// ToastUtils.showToast(throwable.getMessage()); + Response response = ((HttpException)throwable).response(); + if (response==null)return; + ResponseBody responseBody = response.errorBody(); + if (responseBody==null)return; + try { + JSONObject json = new JSONObject(responseBody.string()); +// ToastUtils.showToast(json.optString("message")+"json="+json); + if(TextUtils.isEmpty(json.optString("error"))){ + mIView.showerror(json.optString("message")); + return; + } + mIView.showerror(json.optString("error")); + } catch (Exception e1) { + e1.printStackTrace(); + } } })); @@ -95,8 +112,17 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre }, new Consumer() { @Override public void accept(Throwable throwable) throws Exception { - LoginAndRegistFragment.progressDialog.dismiss(); - OkHttpExceptionUtil.handOkHttpException((HttpException) throwable); + Response response = ((HttpException)throwable).response(); + if (response==null)return; + ResponseBody responseBody = response.errorBody(); + if (responseBody==null)return; + try { + JSONObject json = new JSONObject(responseBody.string()); +// ToastUtils.showToast(json.optString("message")+"json="+json); + mIView.showerror(json.optString("message")); + } catch (Exception e1) { + e1.printStackTrace(); + } } })); @@ -160,8 +186,19 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre }, new Consumer() { @Override public void accept(Throwable throwable) throws Exception { - LoginAndRegistFragment.progressDialog.dismiss(); - OkHttpExceptionUtil.handOkHttpException((HttpException) throwable); + Response response = ((HttpException)throwable).response(); + if (response==null)return; + ResponseBody responseBody = response.errorBody(); + if (responseBody==null)return; + try { + JSONObject json = new JSONObject(responseBody.string()); +// ToastUtils.showToast(json.optString("message")+"json="+json); + mIView.showerror(json.optString("message")); + } catch (Exception e1) { + e1.printStackTrace(); + } + +// OkHttpExceptionUtil.handOkHttpException((HttpException) throwable); } })); } diff --git a/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java index 611efb6..1ea2442 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java @@ -1,5 +1,7 @@ package com.shunzhi.parent.presenter.mine; +import android.util.Log; + import com.google.gson.JsonObject; import com.share.mvpsdk.utils.OkHttpExceptionUtil; import com.share.mvpsdk.utils.ToastUtils; @@ -47,14 +49,14 @@ public class MyChildPresenter extends MyChildContract.MyChildPresenter { }, new Consumer() { @Override public void accept(Throwable throwable) throws Exception { - Response response = ((HttpException)throwable).response(); - if (response==null)return; + Response response = ((HttpException) throwable).response(); + if (response == null) return; ResponseBody responseBody = response.errorBody(); - if (responseBody==null)return; + if (responseBody == null) return; try { JSONObject json = new JSONObject(responseBody.string()); mIView.showError(json.optString("message")); - } catch (Exception e1) { + } catch (Exception e1) { e1.printStackTrace(); } @@ -64,12 +66,19 @@ public class MyChildPresenter extends MyChildContract.MyChildPresenter { } @Override - public void addChild( int sex , String studentName,int parentId, boolean mobileFlag, boolean cooperateFlag, int schoolId, int classId, int studentId, String studentUserId) { - mRxManager.register(mIModel.addChildResult(sex,studentName,parentId, mobileFlag, cooperateFlag, schoolId, classId, studentId, studentUserId).subscribe(new Consumer() { + public void addChild(int sex, String studentName, int parentId, boolean mobileFlag, boolean cooperateFlag, int schoolId, int classId, int studentId, String studentUserId) { + mRxManager.register(mIModel.addChildResult(sex, studentName, parentId, mobileFlag, cooperateFlag, schoolId, classId, studentId, studentUserId).subscribe(new Consumer() { @Override public void accept(JsonObject jsonObject) throws Exception { ToastUtils.showToast("绑定孩子成功"); - mIView.addChildSuccess(); + Log.e("asdasda", jsonObject.get("data").toString()); + if (jsonObject.get("data").toString().equals("null")) { + mIView.addChildSuccess("", ""); + } else { + JsonObject data = jsonObject.getAsJsonObject("data"); + mIView.addChildSuccess(data.get("account").getAsString(), data.get("password").getAsString()); + } + } }, new Consumer() { @Override diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java index e96a5b3..fba3045 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java @@ -146,7 +146,7 @@ public class MyChildActivity extends BaseMVPCompatActivity - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_webview.xml b/app/src/main/res/layout/activity_webview.xml index 108f072..7bf3987 100644 --- a/app/src/main/res/layout/activity_webview.xml +++ b/app/src/main/res/layout/activity_webview.xml @@ -12,12 +12,14 @@ > + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center" + android:paddingLeft="@dimen/size_dp_15" + android:src="@drawable/back" + android:paddingRight="@dimen/size_dp_15" + android:textColor="@color/textColor" + android:textSize="@dimen/textSize16" />