From 9054b529a2fe29a54d543698494bc702db4a696d Mon Sep 17 00:00:00 2001
From: Administrator <123>
Date: Thu, 04 Nov 2021 02:40:04 +0000
Subject: [PATCH] 框架调整
---
app/src/main/java/com/duqing/missions/ui/login/view/LoginActivity.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/com/duqing/missions/ui/login/view/LoginActivity.java b/app/src/main/java/com/duqing/missions/ui/login/view/LoginActivity.java
index 551e4c9..7d5c6d8 100644
--- a/app/src/main/java/com/duqing/missions/ui/login/view/LoginActivity.java
+++ b/app/src/main/java/com/duqing/missions/ui/login/view/LoginActivity.java
@@ -16,26 +16,23 @@
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProvider;
import com.duqing.missions.R;
import com.duqing.missions.base.activities.BaseTitleBarActivity;
import com.duqing.missions.databinding.ActivityLoginBinding;
-public class LoginActivity extends BaseTitleBarActivity<ActivityLoginBinding> {
+public class LoginActivity extends BaseTitleBarActivity<ActivityLoginBinding,LoginViewModel> {
- private LoginViewModel loginViewModel;
@Override
public void initViews() {
- loginViewModel = new ViewModelProvider(this, new LoginViewModelFactory()).get(LoginViewModel.class);
final EditText phoneEdit = binding.editPhone;
final EditText passwordEditText = binding.editPassword;
final Button loginButton = binding.login;
- loginViewModel.getLoginFormState().observe(this, new Observer<LoginFormState>() {
+ viewModel.getLoginFormState().observe(this, new Observer<LoginFormState>() {
@Override
public void onChanged(@Nullable LoginFormState loginFormState) {
if (loginFormState == null) {
@@ -51,7 +48,7 @@
}
});
- loginViewModel.getLoginResult().observe(this, new Observer<LoginResult>() {
+ viewModel.getLoginResult().observe(this, new Observer<LoginResult>() {
@Override
public void onChanged(@Nullable LoginResult loginResult) {
if (loginResult == null) {
@@ -103,7 +100,7 @@
@Override
public void afterTextChanged(Editable s) {
- loginViewModel.loginDataChanged(phoneEdit.getText().toString(),
+ viewModel.loginDataChanged(phoneEdit.getText().toString(),
passwordEditText.getText().toString());
}
};
@@ -114,7 +111,7 @@
@Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
if (actionId == EditorInfo.IME_ACTION_DONE) {
- loginViewModel.login(phoneEdit.getText().toString(),
+ viewModel.login(phoneEdit.getText().toString(),
passwordEditText.getText().toString());
}
return false;
@@ -124,7 +121,7 @@
loginButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- loginViewModel.login(phoneEdit.getText().toString(),
+ viewModel.login(phoneEdit.getText().toString(),
passwordEditText.getText().toString());
}
});
--
Gitblit v1.9.1