Browse Source

test 17 fix

devab
MTing 4 weeks ago
parent
commit
831b0b0be2
  1. 7
      app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java
  2. 4
      app/src/main/java/com/ouxuan/oxface/abgate/GateUnavailableDialog.java

7
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;

4
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为空,无法通知恢复摄像头预览");
}
// 如果是人数异常弹窗关闭需要重置状态并恢复正常的门禁监控

Loading…
Cancel
Save