Commit 2b1c9aa34738b39775a8010db0d7ad194732ff2e
1 parent
2181568b
Exists in
yxb_dev
and in
2 other branches
no message
Showing
2 changed files
with
5 additions
and
2 deletions
Show diff stats
app/src/main/java/com/shunzhi/parent/model/loginandregister/LoginAndRegisterModel.java
@@ -52,8 +52,10 @@ public class LoginAndRegisterModel extends BaseModel implements LoginAndRegiste | @@ -52,8 +52,10 @@ public class LoginAndRegisterModel extends BaseModel implements LoginAndRegiste | ||
52 | @Override | 52 | @Override |
53 | public Observable<NIMLoginResultBean> nimLoginResult(String account, String token) { | 53 | public Observable<NIMLoginResultBean> nimLoginResult(String account, String token) { |
54 | return MessageManager.getInstance().login(account, token); | 54 | return MessageManager.getInstance().login(account, token); |
55 | + } | ||
56 | + | ||
55 | public Observable<JsonObject> reSetpass(String adminName, String idCode, String password) { | 57 | public Observable<JsonObject> reSetpass(String adminName, String idCode, String password) { |
56 | - return RetrofitCreateHelper.getInstance().createApi(LoginRegisterApi.class,LoginRegisterApi.url).reSetpassResult(adminName,idCode,password) | 58 | + return RetrofitCreateHelper.getInstance().createApi(LoginRegisterApi.class, LoginRegisterApi.url).reSetpassResult(adminName, idCode, password) |
57 | .compose(RxHelper.<JsonObject>rxSchedulerHelper()); | 59 | .compose(RxHelper.<JsonObject>rxSchedulerHelper()); |
58 | } | 60 | } |
59 | 61 |
app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
@@ -25,9 +25,10 @@ public class WebViewActivity extends BaseCompatActivity { | @@ -25,9 +25,10 @@ public class WebViewActivity extends BaseCompatActivity { | ||
25 | 25 | ||
26 | private ProgressBar pvWeb; | 26 | private ProgressBar pvWeb; |
27 | 27 | ||
28 | - public static void getInstance(Context context,String url) { | 28 | + public static void getInstance(Context context,String url,int type) { |
29 | Intent intent = new Intent(context, WebViewActivity.class); | 29 | Intent intent = new Intent(context, WebViewActivity.class); |
30 | intent.putExtra("url", url); | 30 | intent.putExtra("url", url); |
31 | + intent.putExtra("type",type); | ||
31 | context.startActivity(intent); | 32 | context.startActivity(intent); |
32 | } | 33 | } |
33 | 34 |