完善了功能

app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt

@@ -1,19 +1,12 @@
 package com.sw.platecabinet.activity
 
 import android.content.Intent
-import androidx.activity.viewModels
-import androidx.lifecycle.lifecycleScope
 import com.sw.plate.utils.ToastUtils
-import com.sw.plate.utils.arcface.face.Test
 import com.sw.platecabinet.databinding.ActivityLoginByPwdBinding
 import com.sw.platecabinet.databinding.ItemTitleTimeBinding
-import com.sw.platecabinet.viewmodel.UserViewModel
-import kotlinx.coroutines.flow.drop
-import kotlinx.coroutines.launch
-import timber.log.Timber
+import com.sw.platecabinet.utils.KeyboardUtils
 
 class LoginByPwdActivity : BaseActivity<ActivityLoginByPwdBinding>() {
-    private val viewModel by viewModels<UserViewModel>()
 
     override fun inflateViewBinding(): ActivityLoginByPwdBinding {
         return ActivityLoginByPwdBinding.inflate(layoutInflater)
@@ -24,41 +17,27 @@ class LoginByPwdActivity : BaseActivity<ActivityLoginByPwdBinding>() {
     }
 
     override fun initialize() {
+        binding.etPhone.setOnFocusChangeListener { v, hasFocus ->
+            if (hasFocus) KeyboardUtils.showKeyboard(v)
+        }
         binding.btnLogin.setOnClickListener {
             val phone = binding.etPhone.text.toString()
             val pwd = binding.etPwd.text.toString()
             if (phone.isEmpty() || pwd.isEmpty()) {
                 ToastUtils.showToast("手机或校验码不能为空")
-                val test = Test()
-                for (i in 1..1000) {
-                    test.test1()
-                }
-
                 return@setOnClickListener
             }
             viewModel.loginWithPwd(phone = phone, password = pwd)
+            KeyboardUtils.hideKeyboard(this)
         }
         binding.tvFaceRec.setOnClickListener {
             val intent = Intent(this, LoginByFaceActivity::class.java)
             startActivity(intent)
-//            handleScanKeyInfo(binding.etPwd.text.toString())
         }
     }
 
-    override fun registerDataChange() {
-        super.registerDataChange()
-        lifecycleScope.launch {
-            viewModel.currentUserInfo
-                .drop(1)
-                .collect {
-                    Timber.d("currentUserInfo it = $it")
-                    if (it != null) {
-//                    ToastUtils.showToast("登录成功")
-                        MainActivity.start(context, pageType = PageType.PLATE_OPEN)
-                        finish()
-                    }
-                }
-        }
+    override fun onResume() {
+        super.onResume()
+        viewModel.resetUserInfo()
     }
-
 }