From 92f09807eeb57f0cb9a4686cde38834549b34962 Mon Sep 17 00:00:00 2001
From: nilupeng <qingingrunt2010@qq.com>
Date: Tue, 09 Aug 2022 11:00:15 +0000
Subject: [PATCH] Merge branch 'master' into page
---
app/src/main/java/com/runt/open/mvvm/ui/login/RegisterLoginActivity.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/app/src/main/java/com/runt/open/mvvm/ui/login/RegisterLoginActivity.java b/app/src/main/java/com/runt/open/mvvm/ui/login/RegisterLoginActivity.java
index 9fff38f..eb3eb99 100644
--- a/app/src/main/java/com/runt/open/mvvm/ui/login/RegisterLoginActivity.java
+++ b/app/src/main/java/com/runt/open/mvvm/ui/login/RegisterLoginActivity.java
@@ -34,6 +34,7 @@
mBinding.txtLogin.setOnClickListener(onclick);
mBinding.txtRegister.setOnClickListener(onclick);
mBinding.txtPrivacy.setOnClickListener(onclick);
+ mBinding.button.setOnClickListener(onclick);
mBinding.editPhone.setText(getStringProjectPrefrence(Configuration.KEY_USERNAME));
mViewModel.getVerifyResult().observe(this, result -> {
if(result == 0){
@@ -45,20 +46,16 @@
}
});
mViewModel.getLoginResult().observe(this, loggedInUser -> {
- if(loggedInUser.code == 200){
- putBooleanProjectPrefrence(Configuration.IS_LOGIN,true);
- putStringProjectPrefrence(Configuration.KEY_USERNAME, mBinding.editPhone.getText().toString());
+ putBooleanProjectPrefrence(Configuration.IS_LOGIN,true);
+ putStringProjectPrefrence(Configuration.KEY_USERNAME, mBinding.editPhone.getText().toString());
- UserBean user = new Gson().fromJson(new Gson().toJson(loggedInUser.data) ,UserBean.class);
- UserBean.setUser(user);
- putStringProjectPrefrence(Configuration.KEY_TOKEN, user.getToken());
- MyLog.i("registerlogin",user.toString());
- showToast(R.string.login_success);
- setResult(RESULT_CODE_SUCESS);
- finish();
- }else{
- showToast(loggedInUser.msg);
- }
+ UserBean user = new Gson().fromJson(new Gson().toJson(loggedInUser) ,UserBean.class);
+ UserBean.setUser(user);
+ putStringProjectPrefrence(Configuration.KEY_TOKEN, user.getToken());
+ MyLog.i("registerlogin",user.toString());
+ showToast(R.string.login_success);
+ setResult(RESULT_CODE_SUCESS);
+ finish();
});
}
--
Gitblit v1.9.1