diff --git a/app/build.gradle b/app/build.gradle index 3bce076..9982cd9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,6 +56,9 @@ android { exclude 'META-INF/NOTICE.txt' // 排除重复的OpenNI类 exclude 'org/openni/**' + // 排除重复的BuildConfig类 + exclude 'com/baidu/idl/main/facesdk/BuildConfig.class' + pickFirst '**/BuildConfig.class' } @@ -102,7 +105,9 @@ dependencies { implementation project(':lib-serialport') // 人脸识别库 - implementation project(':facelibrary') + implementation(project(':facelibrary')) { + exclude group: 'com.baidu.idl.main.facesdk', module: 'BuildConfig' + } implementation project(':financelibrary') // implementation project(':oxplugin_padface') diff --git a/app/src/main/java/com/ouxuan/oxface/DebugActivity.java b/app/src/main/java/com/ouxuan/oxface/DebugActivity.java index 2ed58a2..e2611bc 100644 --- a/app/src/main/java/com/ouxuan/oxface/DebugActivity.java +++ b/app/src/main/java/com/ouxuan/oxface/DebugActivity.java @@ -838,7 +838,7 @@ public class DebugActivity extends Activity { * @param message 要添加的消息 */ private void logMessage(String message) { - runOnUiThread(new Runnable() { + Runnable logRunnable = new Runnable() { @Override public void run() { String currentTime = android.text.format.DateFormat.format("HH:mm:ss", new Date()).toString(); @@ -853,7 +853,16 @@ public class DebugActivity extends Activity { } }); } - }); + }; + + // 检查是否在主线程中 + if (Looper.myLooper() == Looper.getMainLooper()) { + // 已经在主线程,直接执行 + logRunnable.run(); + } else { + // 不在主线程,切换到主线程 + runOnUiThread(logRunnable); + } } /** 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 0fe62ec..af230da 100644 --- a/app/src/main/java/com/ouxuan/oxface/abgate/GateUnavailableDialog.java +++ b/app/src/main/java/com/ouxuan/oxface/abgate/GateUnavailableDialog.java @@ -198,6 +198,7 @@ public class GateUnavailableDialog { tvGateStatus.setGravity(Gravity.CENTER); tvGateStatus.setPadding(0, 10, 0, 0); tvGateStatus.setText("门状态:A门-未知, B门-未知"); // 默认状态 + tvGateStatus.setVisibility(View.GONE); // 暂时隐藏门状态显示 // 倒计时显示(仅离场场景人数异常时显示) tvCountdown = new TextView(context); @@ -288,14 +289,8 @@ public class GateUnavailableDialog { * @param udpConnected UDP连接状态 */ private void updateGateStatusDisplay(boolean gateAOpen, boolean gateBOpen, boolean udpConnected) { - String gateAStatus = gateAOpen ? "开启" : "关闭"; - String gateBStatus = gateBOpen ? "开启" : "关闭"; - String udpStatus = udpConnected ? "正常" : "异常"; - - String statusText = "门状态:A门-" + gateAStatus + ", B门-" + gateBStatus + " | UDP-" + udpStatus; - tvGateStatus.setText(statusText); - - LogManager.logInfo(TAG, "更新门状态显示: " + statusText); + // 暂时不显示门状态,方法保留但不执行任何操作 + LogManager.logDebug(TAG, "门状态显示已暂时隐藏,跳过更新"); } /** diff --git a/facelibrary/build.gradle b/facelibrary/build.gradle index 82dc29f..bed5486 100644 --- a/facelibrary/build.gradle +++ b/facelibrary/build.gradle @@ -6,7 +6,7 @@ android { buildToolsVersion '35.0.0' publishNonDefault true buildFeatures { - buildConfig true + buildConfig false } defaultConfig { minSdkVersion 21 @@ -37,12 +37,10 @@ android { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - buildConfigField 'boolean', 'USE_AIKL', 'true' } debug { debuggable true jniDebuggable true - buildConfigField 'boolean', 'USE_AIKL', 'true' } }