操作密码

2026-05-22 15:51:13 +08:00
parent d066886b66
commit edbe5629fd
28 changed files with 942 additions and 190 deletions
--- a/app/src/main/java/com/example/defenseapplication/personal/OperationPasswordActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/personal/OperationPasswordActivity.kt
@@ -1,6 +1,8 @@
 package com.example.defenseapplication.personal

 import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.blankj.utilcode.util.SPUtils
@@ -36,45 +38,49 @@ class OperationPasswordActivity : AppCompatActivity() {
                true -> {
                    binding.etPassword.isEnabled = true
                    binding.etConfirmPassword.isEnabled = true
-                    binding.btnConfirmReset.isEnabled = true
                    Toast.makeText(this, getString(R.string.operation_password_enabled), Toast.LENGTH_SHORT).show()
                }
                false -> {
                    binding.etPassword.isEnabled = false
                    binding.etConfirmPassword.isEnabled = false
-                    binding.btnConfirmReset.isEnabled = false
                    SPUtils.getInstance().remove("operation_password")
                    Toast.makeText(this, getString(R.string.operation_password_disabled), Toast.LENGTH_SHORT).show()
                }
            }
        }

-        binding.btnConfirmReset.setOnClickListener {
-            val password = binding.etPassword.text.toString()
-            val confirmPassword = binding.etConfirmPassword.text.toString()
+        binding.etPassword.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}

-            if (password.isEmpty()) {
-                Toast.makeText(this, getString(R.string.password_cannot_empty), Toast.LENGTH_SHORT).show()
-                return@setOnClickListener
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+
+            override fun afterTextChanged(s: Editable?) {
+                autoValidatePassword()
            }
+        })

-            if (password.length != 6) {
-                Toast.makeText(this, getString(R.string.password_must_be_6_digits), Toast.LENGTH_SHORT).show()
-                return@setOnClickListener
+        binding.etConfirmPassword.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+
+            override fun afterTextChanged(s: Editable?) {
+                autoValidatePassword()
            }
+        })
+    }

-            if (confirmPassword.isEmpty()) {
-                Toast.makeText(this, getString(R.string.please_confirm_password), Toast.LENGTH_SHORT).show()
-                return@setOnClickListener
-            }
+    private fun autoValidatePassword() {
+        val password = binding.etPassword.text.toString()
+        val confirmPassword = binding.etConfirmPassword.text.toString()

-            if (password != confirmPassword) {
+        if (password.length == 6 && confirmPassword.length == 6) {
+            if (password == confirmPassword) {
+                SPUtils.getInstance().put("operation_password", password)
+                Toast.makeText(this, getString(R.string.operation_success), Toast.LENGTH_SHORT).show()
+            } else {
                Toast.makeText(this, getString(R.string.password_mismatch), Toast.LENGTH_SHORT).show()
-                return@setOnClickListener
            }
-
-            SPUtils.getInstance().put("operation_password", password)
-            Toast.makeText(this, getString(R.string.operation_success), Toast.LENGTH_SHORT).show()
        }
    }
 }
--- a/app/src/main/java/com/example/defenseapplication/personal/PasswordManagementActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/personal/PasswordManagementActivity.kt
@@ -5,10 +5,14 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.example.defenseapplication.R
+import com.example.defenseapplication.bean.VerifyOptionPasswordRequest
 import com.example.defenseapplication.databinding.PasswordManagementActivityBinding
-import com.example.defenseapplication.view.PasswordInputDialog
-import com.blankj.utilcode.util.SPUtils
+import com.example.defenseapplication.utils.RetrofitNetwork
 import com.gyf.immersionbar.ImmersionBar
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 //密码管理
 class PasswordManagementActivity : AppCompatActivity() {

@@ -45,18 +49,26 @@ class PasswordManagementActivity : AppCompatActivity() {
    private fun showPasswordDialog() {
        passwordDialog = PasswordInputDialog(this).apply {
            setOnConfirmListener { inputPassword ->
-                val savedPassword = SPUtils.getInstance().getString("operation_password", "111111")
-                if (savedPassword.isEmpty()) {
-                    Toast.makeText(this@PasswordManagementActivity, getString(R.string.operation_password_not_set), Toast.LENGTH_SHORT).show()
-                    dismiss()
-                    return@setOnConfirmListener
-                }
-                if (inputPassword == savedPassword) {
-                    startActivity(Intent(this@PasswordManagementActivity, OperationPasswordActivity::class.java))
-                    dismiss()
-                } else {
-                    showError(getString(R.string.password_error))
-                    clearPassword()
+                CoroutineScope(Dispatchers.IO).launch {
+                    try {
+                        val response = RetrofitNetwork.getNetworkService().verifyOptionPassword(VerifyOptionPasswordRequest(inputPassword))
+                        withContext(Dispatchers.Main) {
+                            if (response.code == 200) {
+                                startActivity(Intent(this@PasswordManagementActivity, OperationPasswordActivity::class.java))
+                                dismiss()
+                            } else {
+                                Toast.makeText(this@PasswordManagementActivity, response.msg ?: "校验失败", Toast.LENGTH_SHORT).show()
+                                showError(getString(R.string.password_error))
+                                clearPassword()
+                            }
+                        }
+                    } catch (e: Exception) {
+                        withContext(Dispatchers.Main) {
+                            Toast.makeText(this@PasswordManagementActivity, "网络请求失败", Toast.LENGTH_SHORT).show()
+                            showError(getString(R.string.password_error))
+                            clearPassword()
+                        }
+                    }
                }
            }
            setOnDismissListener {
--- a/app/src/main/java/com/example/defenseapplication/personal/PersonalProfileActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/personal/PersonalProfileActivity.kt
@@ -2,12 +2,14 @@ package com.example.defenseapplication.personal

 import android.os.Build
 import android.os.Bundle
+import android.util.Log
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import android.widget.Toast
 import com.bumptech.glide.Glide
+import com.bumptech.glide.request.RequestOptions
 import com.example.defenseapplication.R
 import com.example.defenseapplication.bean.UpdateUserInfo
 import com.example.defenseapplication.bean.UserInfoBean
@@ -45,27 +47,18 @@ class PersonalProfileActivity : AppCompatActivity() {
        }

        userInfo?.let { info ->
-            info.avatar?.let { avatarUrl ->
-                Glide.with(this)
-                    .load(avatarUrl)
-                    .circleCrop()
-                    .into(binding.ivAvatar)
-            } ?: run {
-                Glide.with(this)
-                    .load(R.drawable.img)
-                    .circleCrop()
-                    .into(binding.ivAvatar)
-            }
+            Log.d("头像", "头像 URL = ${info.avatar}")
+            val requestOptions = RequestOptions()
+                .placeholder(R.drawable.img)   // 加载中显示
+                .error(R.drawable.img)         // 失败时显示

-            binding.tvNickname.text = info.nickName ?: getString(R.string.nickname_default)
-            binding.tvPhone.text = info.phonenumber ?: "13589898989"
-        } ?: run {
            Glide.with(this)
-                .load(R.drawable.img)
+                .load(info.avatar)             // 如果 avatar 为 null，Glide 会直接回调 error
+                .apply(requestOptions)
                .circleCrop()
                .into(binding.ivAvatar)
-            binding.tvNickname.text = getString(R.string.nickname_default)
-            binding.tvPhone.text = "13589898989"
+            binding.tvNickname.text = info.nickName ?: getString(R.string.nickname_default)
+            binding.tvPhone.text = info.phonenumber ?: ""
        }

        binding.itemNickname.setOnClickListener {