From 2886e7d4a3eadac818fa1887dc71405f7fc0b95e Mon Sep 17 00:00:00 2001
From: mazengfei <331023091@qq.com>
Date: Fri, 3 Apr 2026 10:41:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=AD=89=E5=BE=85?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E4=BA=A4=E4=BA=92=E3=80=81=E4=BA=BA=E8=84=B8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=B7=E6=96=B0=E5=8F=8A=E7=9B=B8=E6=9C=BA?=
 =?UTF-8?q?=E6=9A=82=E5=81=9C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- BaseActivity: 等待对话框允许点击外部区域关闭
- LoginByFaceActivity: 恢复暂停相机时的预览帧处理
- PlcSettingActivity: 人脸数据更新成功后刷新人脸列表

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt  | 1 +
 .../java/com/sw/platecabinet/activity/LoginByFaceActivity.kt    | 2 +-
 .../java/com/sw/platecabinet/activity/PlcSettingActivity.kt     | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt
index 6f6d081..8d8b192 100644
--- a/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt
+++ b/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt
@@ -256,6 +256,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
             mDialogWaiting = CustomLoadingDialog(this, view, R.style.MyDialog)
             mDialogWaiting!!.show()
             mDialogWaiting!!.setCancelable(true)
+            mDialogWaiting!!.setCanceledOnTouchOutside(true)
         }
     }
 
diff --git a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
index cbb745a..1946dbe 100644
--- a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
+++ b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
@@ -799,7 +799,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
 
     private fun pauseCamera() {
         isRecognition = false
-//        recognizeViewModel.onPreviewFrame(emptyFrame, true)
+        recognizeViewModel.onPreviewFrame(emptyFrame, true)
     }
 
 //    private fun judgeRecognizeState(): Boolean {
diff --git a/app/src/main/java/com/sw/platecabinet/activity/PlcSettingActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/PlcSettingActivity.kt
index 4b78118..0478878 100644
--- a/app/src/main/java/com/sw/platecabinet/activity/PlcSettingActivity.kt
+++ b/app/src/main/java/com/sw/platecabinet/activity/PlcSettingActivity.kt
@@ -32,6 +32,7 @@ class PlcSettingActivity : BaseActivity<ActivityPlcSettingBinding>() {
         }
     }
 
+
     override fun inflateViewBinding(): ActivityPlcSettingBinding {
         return ActivityPlcSettingBinding.inflate(layoutInflater)
     }
@@ -58,6 +59,7 @@ class PlcSettingActivity : BaseActivity<ActivityPlcSettingBinding>() {
                 userViewModel.getUserFaceCache(pageNo = 1, callback = { state, errMsg ->
                     hideWaitingDialog()
                     if (state) {
+                        recognizeViewModel.refreshFaceList()
                         ToastUtils.showToast("人脸数据已更新")
                     } else {
                         ToastUtils.showToast(errMsg)