From 831b0b0be2d9029770a613313a90910d7d3d03a0 Mon Sep 17 00:00:00 2001 From: MTing Date: Thu, 18 Sep 2025 13:52:19 +0800 Subject: [PATCH] test 17 fix --- app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java | 7 +++++-- .../main/java/com/ouxuan/oxface/abgate/GateUnavailableDialog.java | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java b/app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java index 1a9f5be..e374fd2 100644 --- a/app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java +++ b/app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java @@ -751,7 +751,9 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi currentState.gateAOpen, currentState.gateBOpen, currentState.udpConnected); - LogManager.logInfo(TAG, "已更新门禁不可用弹窗内容: " + reason); + + pauseCamera(); + LogManager.logInfo(TAG, " pauseCamera 已更新门禁不可用弹窗内容: " + reason); } else { LogManager.logInfo(TAG, "根据业务规则,不显示门禁不可用弹窗"); } @@ -2883,7 +2885,8 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi if (pauseRequestCount > 0) { pauseRequestCount--; } - + + pauseRequestCount = 0; //恢复摄像头 // 只有当所有暂停请求都结束时才恢复 if (pauseRequestCount <= 0) { isCameraPausedByDialog = false; diff --git a/app/src/main/java/com/ouxuan/oxface/abgate/GateUnavailableDialog.java b/app/src/main/java/com/ouxuan/oxface/abgate/GateUnavailableDialog.java index a507688..231e510 100644 --- a/app/src/main/java/com/ouxuan/oxface/abgate/GateUnavailableDialog.java +++ b/app/src/main/java/com/ouxuan/oxface/abgate/GateUnavailableDialog.java @@ -739,7 +739,11 @@ public class GateUnavailableDialog { // 通知监听器弹窗隐藏,可以恢复摄像头和操作 if (dialogListener != null) { + LogManager.logInfo(TAG, "通知监听器弹窗隐藏,准备恢复摄像头预览"); dialogListener.onDialogHide(); + LogManager.logInfo(TAG, "已通知监听器弹窗隐藏"); + } else { + LogManager.logWarning(TAG, "dialogListener为空,无法通知恢复摄像头预览"); } // 如果是人数异常弹窗关闭,需要重置状态并恢复正常的门禁监控