From 2b1c9aa34738b39775a8010db0d7ad194732ff2e Mon Sep 17 00:00:00 2001 From: 陶汉栋 <2821744554@qq.com> Date: Mon, 19 Mar 2018 13:07:51 +0800 Subject: [PATCH] no message --- app/src/main/java/com/shunzhi/parent/model/loginandregister/LoginAndRegisterModel.java | 4 +++- app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) 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 2535cb7..6639de2 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 @@ -52,8 +52,10 @@ public class LoginAndRegisterModel extends BaseModel implements LoginAndRegiste @Override public Observable nimLoginResult(String account, String token) { return MessageManager.getInstance().login(account, token); + } + public Observable reSetpass(String adminName, String idCode, String password) { - return RetrofitCreateHelper.getInstance().createApi(LoginRegisterApi.class,LoginRegisterApi.url).reSetpassResult(adminName,idCode,password) + return RetrofitCreateHelper.getInstance().createApi(LoginRegisterApi.class, LoginRegisterApi.url).reSetpassResult(adminName, idCode, password) .compose(RxHelper.rxSchedulerHelper()); } diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java index fcedbf5..37eb20e 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java @@ -25,9 +25,10 @@ public class WebViewActivity extends BaseCompatActivity { private ProgressBar pvWeb; - public static void getInstance(Context context,String url) { + public static void getInstance(Context context,String url,int type) { Intent intent = new Intent(context, WebViewActivity.class); intent.putExtra("url", url); + intent.putExtra("type",type); context.startActivity(intent); } -- libgit2 0.21.0