From 462d583986e4739f7a75227b3fde4da587502ba5 Mon Sep 17 00:00:00 2001
From: Administrator <123>
Date: Fri, 05 Nov 2021 03:20:39 +0000
Subject: [PATCH] 主页 动态UI adapter  null视图问题修改 分页框架 include问题

---
 app/src/main/java/com/duqing/missions/ui/login/view/LoginActivity.java |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 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 d10b2eb..f1356e0 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,25 @@
 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.BaseTitleBarActivity;
+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 +50,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 +102,7 @@
 
             @Override
             public void afterTextChanged(Editable s) {
-                loginViewModel.loginDataChanged(phoneEdit.getText().toString(),
+                viewModel.loginDataChanged(phoneEdit.getText().toString(),
                         passwordEditText.getText().toString());
             }
         };
@@ -114,7 +113,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 +123,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