From 5cbe618fe2ecdad99ea5067f1cd8c6f9f07fbd20 Mon Sep 17 00:00:00 2001 From: MTing Date: Mon, 15 Sep 2025 15:22:53 +0800 Subject: [PATCH] change log --- app/src/main/java/com/ouxuan/oxface/abgate/ABGateManager.java | 4 ++-- .../main/java/com/ouxuan/oxface/abgate/GateUnavailableDialog.java | 1 + app/src/main/java/com/ouxuan/oxface/device/GateABController.java | 6 ++++-- app/src/main/java/com/ouxuan/oxface/device/OxUDP.java | 7 ++++--- app/src/main/java/com/ouxuan/oxface/utils/LogManager.java | 1 + 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/ouxuan/oxface/abgate/ABGateManager.java b/app/src/main/java/com/ouxuan/oxface/abgate/ABGateManager.java index 455d765..363389e 100644 --- a/app/src/main/java/com/ouxuan/oxface/abgate/ABGateManager.java +++ b/app/src/main/java/com/ouxuan/oxface/abgate/ABGateManager.java @@ -144,12 +144,12 @@ public class ABGateManager { OxUDP.UDPStateListener tempListener = new OxUDP.UDPStateListener() { @Override public void onGateStateUpdate(boolean gateAState, boolean gateBState, String rawData) { - LogManager.logInfo(TAG, "收到门状态更新 - A门: " + (gateAState ? "开启" : "关闭") + + LogManager.logInfo(TAG, "收到门状态更新666 - A门: " + (gateAState ? "开启" : "关闭") + ", B门: " + (gateBState ? "开启" : "关闭")); // 逻辑：A门关闭 AND B门关闭 时才为true boolean bothGatesClosed = !gateAState && !gateBState; - LogManager.logInfo(TAG, "门状态检查结果: " + (bothGatesClosed ? "可用" : "不可用")); + LogManager.logInfo(TAG, "门状态检查结果666: " + (bothGatesClosed ? "可用" : "不可用")); gateCheckFuture.complete(bothGatesClosed); } 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 eff8b2d..a1af6b7 100644 --- a/app/src/main/java/com/ouxuan/oxface/abgate/GateUnavailableDialog.java +++ b/app/src/main/java/com/ouxuan/oxface/abgate/GateUnavailableDialog.java @@ -420,6 +420,7 @@ public class GateUnavailableDialog { OxUDP.getInstance().setStateListener(new OxUDP.UDPStateListener() { @Override public void onGateStateUpdate(boolean gateAState, boolean gateBState, String rawData) { + LogManager.logInfo(TAG, "onGateStateUpdate触发: " + gateAState+" | "+gateBState); if (aGateStateListener != null) { aGateStateListener.onAGateStateChanged(gateAState); } diff --git a/app/src/main/java/com/ouxuan/oxface/device/GateABController.java b/app/src/main/java/com/ouxuan/oxface/device/GateABController.java index feb727b..a1907da 100644 --- a/app/src/main/java/com/ouxuan/oxface/device/GateABController.java +++ b/app/src/main/java/com/ouxuan/oxface/device/GateABController.java @@ -960,7 +960,7 @@ public class GateABController { boolean shouldShowDialog = false; boolean oldShouldShow = false; boolean newShouldShow = false; - + // 检查状态是否发生变化 if (currentGateState.gateAOpen != gateAOpen || currentGateState.gateBOpen != gateBOpen || @@ -976,7 +976,9 @@ public class GateABController { currentGateState.udpConnected = udpConnected; newShouldShow = currentGateState.shouldShowUnavailableDialog(); - + + LogManager.logInfo(TAG, "updateGateState666-"+ "状态变化: " + stateChanged+ " |shouldShowDialog: " + shouldShowDialog + " |oldShouldShow: " + oldShouldShow+ " |newShouldShow: " + newShouldShow); + // 如果从正常状态变为需要显示弹窗状态，则触发弹窗 if (!oldShouldShow && newShouldShow) { shouldShowDialog = true; diff --git a/app/src/main/java/com/ouxuan/oxface/device/OxUDP.java b/app/src/main/java/com/ouxuan/oxface/device/OxUDP.java index 7171c04..bc52ed2 100644 --- a/app/src/main/java/com/ouxuan/oxface/device/OxUDP.java +++ b/app/src/main/java/com/ouxuan/oxface/device/OxUDP.java @@ -420,14 +420,14 @@ public class OxUDP { if (responseArr.length > 28) { String aStateValue = responseArr[28]; gateAState = "01".equals(aStateValue); // 01表示开启，00表示关闭 - Log.d(TAG, "A门状态值: " + aStateValue + " -> " + (gateAState ? "开启" : "关闭")); + Log.d(TAG, "A门状态值parseGateState: " + aStateValue + " -> " + (gateAState ? "开启" : "关闭")); } // 解析B门状态（第29位，数组索引29） if (responseArr.length > 29) { String bStateValue = responseArr[29]; gateBState = "01".equals(bStateValue); // 01表示开启，00表示关闭 - Log.d(TAG, "B门状态值: " + bStateValue + " -> " + (gateBState ? "开启" : "关闭")); + Log.d(TAG, "B门状态值parseGateState: " + bStateValue + " -> " + (gateBState ? "开启" : "关闭")); } // 记录完整的响应数据用于调试 @@ -442,7 +442,8 @@ public class OxUDP { // Log.d(TAG, "门禁状态 - A门: " + (gateAState ? "开启" : "关闭") + // ", B门: " + (gateBState ? "开启" : "关闭")); - + + Log.e(TAG, "parseGateState: isFirstStateUpdate:"+isFirstStateUpdate +" |lastGateAState:"+lastGateAState+" |lastGateBState:"+lastGateBState); // 检查状态是否发生变化，只有变化时才通知监听器 if (isFirstStateUpdate || gateAState != lastGateAState || gateBState != lastGateBState) { Log.i(TAG, "门禁状态变化 - A门: " + (lastGateAState ? "开启" : "关闭") + " -> " + (gateAState ? "开启" : "关闭") + diff --git a/app/src/main/java/com/ouxuan/oxface/utils/LogManager.java b/app/src/main/java/com/ouxuan/oxface/utils/LogManager.java index 00d8a0a..ef56ede 100644 --- a/app/src/main/java/com/ouxuan/oxface/utils/LogManager.java +++ b/app/src/main/java/com/ouxuan/oxface/utils/LogManager.java @@ -153,6 +153,7 @@ public class LogManager { if (instance != null) { instance.addLogEntry("WARN", tag, message, null); } + android.util.Log.w(tag,message); //切换为logcat输入日志 } /**