|
|
@@ -79,8 +79,7 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>(),
|
|
|
* 用户登录
|
|
|
*/
|
|
|
private fun loginMsg() {
|
|
|
- viewModel.loginMsg(
|
|
|
- binding.username.text.toString().trim(),
|
|
|
+ viewModel.loginMsg(binding.username.text.toString().trim(),
|
|
|
binding.password.text.toString().trim(),
|
|
|
fail = {
|
|
|
it.toast()
|
|
|
@@ -136,12 +135,12 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>(),
|
|
|
}
|
|
|
//保存是否第一次登陆(0第一次登陆)
|
|
|
if (TextUtils.isEmpty(it.firstLogin).not()) {
|
|
|
+ User.saveShowWelcomeMessage(TextUtils.equals("0", it.firstLogin))
|
|
|
User.saveFirstLogin(it.firstLogin)
|
|
|
}
|
|
|
startInitService()
|
|
|
ARouter.getInstance().build(RouterUrlCommon.home)
|
|
|
- .withTransition(R.anim.leftin, R.anim.leftout)
|
|
|
- .navigation(mContext)
|
|
|
+ .withTransition(R.anim.leftin, R.anim.leftout).navigation(mContext)
|
|
|
finish()
|
|
|
}
|
|
|
}
|
|
|
@@ -156,6 +155,7 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>(),
|
|
|
v.startAnimation(getScaleAnimation())
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
MotionEvent.ACTION_UP -> {
|
|
|
v.startAnimation(getEndAnimation())
|
|
|
if (v.id == R.id.login) {
|
|
|
@@ -168,6 +168,7 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>(),
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
MotionEvent.ACTION_CANCEL -> {
|
|
|
if (v.id == R.id.login || v.id == R.id.tvCode) {
|
|
|
v.startAnimation(getEndAnimation())
|