From e8735db27be93088ca27c2339d58e429266a5f0f Mon Sep 17 00:00:00 2001
From: mazengfei <331023091@qq.com>
Date: Mon, 1 Jun 2026 18:10:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E4=BA=BA=E8=84=B8?=
 =?UTF-8?q?=E9=87=87=E9=9B=86=E6=97=A5=E5=BF=97=E5=8F=8A=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- LoginByFaceActivity: 新增人脸采集关键节点调试日志
- PlcSettingActivity: 添加点击提示区域关闭提示布局功能，格式化代码
- activity_plc_setting.xml: 给提示 TextView 添加 id，字体调整为 32sp

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
---
 .../activity/LoginByFaceActivity.kt           |  4 +++
 .../activity/PlcSettingActivity.kt            | 27 +++++++++++--------
 .../main/res/layout/activity_plc_setting.xml  |  4 +--
 3 files changed, 22 insertions(+), 13 deletions(-)

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 ca27479..15d3bb4 100644
--- a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
+++ b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
@@ -221,6 +221,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
     private fun isFitData(userFaceInfo: UserFaceInfo?): Boolean {
         if (userFaceInfo == null) return false
         val headBmp = userFaceInfo.headBmp
+        loadLogInfo("collectFace,isFitData:w=${headBmp?.width},height=${headBmp?.height}")
         if (headBmp == null) return false
 //        if (headBmp.width <= 200 || headBmp.height <= 200) {
 //            loadLogInfo("collectFace,isFitData:拿到人脸提取特征数据照片过小-----------")
@@ -234,9 +235,12 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
         recognizeViewModel.prepareRegister()
         recognizeViewModel.setOnRegisterFinishedCallback { facePreviewInfo, userFaceInfo ->
             registerHandler?.setCallback {
+                loadLogInfo("collectFace,registerHandler?.setCallback")
                 if (!isCollectFace || !isCollecting.get()) {
+                    loadLogInfo("collectFace,isCollectFace=${isCollectFace},isCollecting=${isCollecting.get()}")
                     return@setCallback
                 }
+                loadLogInfo("collectFace,userFaceInfo==null:${userFaceInfo==null}")
                 if (this.userFaceInfo == null && isFitData(userFaceInfo)) {
                     val headBmp = userFaceInfo.headBmp ?: run {
                         loadLogInfo("collectFace,isFitData:headBmp 为 null，跳过")
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 625f3f0..598abbe 100644
--- a/app/src/main/java/com/sw/platecabinet/activity/PlcSettingActivity.kt
+++ b/app/src/main/java/com/sw/platecabinet/activity/PlcSettingActivity.kt
@@ -79,6 +79,10 @@ class PlcSettingActivity : BaseActivity<ActivityPlcSettingBinding>() {
                 })
             }).show()
         }
+
+        binding.tvTips.clickWithDebounce {
+            binding.layoutTips.visibility = android.view.View.GONE
+        }
     }
 
     // ==================== 连接控制 ====================
@@ -204,18 +208,19 @@ class PlcSettingActivity : BaseActivity<ActivityPlcSettingBinding>() {
             PlcHelper.getInstance(this).platformUp(object : PlcCallback<String> {
                 override fun onSuccess(result: String) {
                     // 平台上升完成，继续执行返回营业
-                    PlcHelper.getInstance(this@PlcSettingActivity).backToBusiness(object : PlcCallback<String> {
-                        override fun onSuccess(result: String) {
-                            hideWaitingDialog()
-                            ToastUtils.showToast("平台复位成功")
-                            finish()
-                        }
+                    PlcHelper.getInstance(this@PlcSettingActivity)
+                        .backToBusiness(object : PlcCallback<String> {
+                            override fun onSuccess(result: String) {
+                                hideWaitingDialog()
+                                ToastUtils.showToast("平台复位成功")
+                                finish()
+                            }
 
-                        override fun onError(message: String) {
-                            hideWaitingDialog()
-                            ToastUtils.showToast("返回营业失败：$message")
-                        }
-                    })
+                            override fun onError(message: String) {
+                                hideWaitingDialog()
+                                ToastUtils.showToast("返回营业失败：$message")
+                            }
+                        })
                 }
 
                 override fun onError(message: String) {
diff --git a/app/src/main/res/layout/activity_plc_setting.xml b/app/src/main/res/layout/activity_plc_setting.xml
index b84673f..f98afc9 100644
--- a/app/src/main/res/layout/activity_plc_setting.xml
+++ b/app/src/main/res/layout/activity_plc_setting.xml
@@ -23,7 +23,7 @@
             android:src="@mipmap/img_error_tips"
             tools:ignore="ContentDescription" />
 
-        <TextView
+        <TextView android:id="@+id/tv_tips"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
@@ -31,7 +31,7 @@
             android:layout_marginBottom="144dp"
             android:text="暂无餐盘    请联系管理人员"
             android:textColor="#fff0c8b4"
-            android:textSize="20sp" />
+            android:textSize="32sp" />
     </RelativeLayout>
 
     <ScrollView