diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index b88be45..4e279ff 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -6,6 +6,8 @@ + + diff --git a/android/app/src/main/java/com/qft/optical/MainActivity.kt b/android/app/src/main/java/com/qft/optical/MainActivity.kt index 9dcac05..2d8dc0f 100644 --- a/android/app/src/main/java/com/qft/optical/MainActivity.kt +++ b/android/app/src/main/java/com/qft/optical/MainActivity.kt @@ -151,6 +151,7 @@ class MainActivity : ComponentActivity() { stopCamera() scannerMode = ScannerMode.NONE pairConsumed.set(false) + wifiConnector.releaseHighPerfLock() wifiConnector.release() pendingPair = null connectedNetwork = null @@ -855,6 +856,10 @@ class MainActivity : ComponentActivity() { downloadRunning = true transferAbortReason = null + // 传输期间阻止 Wi-Fi 进入省电休眠。Android 默认会在包间隙让 + // Wi-Fi 芯片休眠,对持续大流量传输会明显压低吞吐。 + wifiConnector.acquireHighPerfLock() + val linkAtStart = wifiConnector.describeLink() transferExecutor.execute { // 「传输 / 校验 / 保存」三个阶段各自的速率含义完全不同,混在一起 // 平均出来的数字毫无意义。逐段记账,结束后一并列出—— @@ -922,6 +927,8 @@ class MainActivity : ComponentActivity() { append("\n合计 ").append(humanDuration(totalMillis / 1000.0)).append(" · ") append(humanBytes((saved.size * 1000.0 / totalMillis).toLong())).append("/s") } + // 带上链路协商速率:判断"慢"是软件问题还是链路上限的唯一依据 + append("\n").append(linkAtStart) } runOnUiThread { bar.progress = 1000 @@ -937,6 +944,8 @@ class MainActivity : ComponentActivity() { } } finally { downloadRunning = false + // 无论成功失败都要释放,否则 Wi-Fi 会一直停留在高功耗模式 + wifiConnector.releaseHighPerfLock() } } } @@ -1073,6 +1082,7 @@ class MainActivity : ComponentActivity() { } val files = selectedFiles.toList() sendButton?.isEnabled = false + wifiConnector.acquireHighPerfLock() transferExecutor.execute { try { files.forEachIndexed { index, file -> @@ -1114,6 +1124,8 @@ class MainActivity : ComponentActivity() { sendStatusText?.text = "传输失败:${e.message}" sendButton?.isEnabled = true } + } finally { + wifiConnector.releaseHighPerfLock() } } } diff --git a/android/app/src/main/java/com/qft/optical/WifiConnector.kt b/android/app/src/main/java/com/qft/optical/WifiConnector.kt index 64b97d2..dff7e85 100644 --- a/android/app/src/main/java/com/qft/optical/WifiConnector.kt +++ b/android/app/src/main/java/com/qft/optical/WifiConnector.kt @@ -316,6 +316,59 @@ class WifiConnector(context: Context) { private fun hasIpv4(props: LinkProperties?): Boolean = props?.linkAddresses?.any { it.address is Inet4Address } == true + /** + * 传输期间持有的 Wi-Fi 高性能锁。 + * + * Android 默认会让 Wi-Fi 芯片在包间隙进入省电休眠,代价是额外的唤醒 + * 延迟。对于持续大流量传输,这会明显压低吞吐——这是 Android 上最常见 + * 也最容易被忽略的一项限速。锁只在传输期间持有,结束立即释放。 + */ + private var transferLock: WifiManager.WifiLock? = null + + @Suppress("DEPRECATION") + fun acquireHighPerfLock() { + if (transferLock != null) return + val mode = if (Build.VERSION.SDK_INT >= 29) { + WifiManager.WIFI_MODE_FULL_LOW_LATENCY + } else { + WifiManager.WIFI_MODE_FULL_HIGH_PERF + } + transferLock = try { + wifiManager.createWifiLock(mode, "qft:transfer").apply { + setReferenceCounted(false) + acquire() + } + } catch (e: Exception) { + Log.w(TAG, "无法获取 Wi-Fi 高性能锁:${e.message}") + null + } + } + + fun releaseHighPerfLock() { + try { transferLock?.takeIf { it.isHeld }?.release() } catch (_: Exception) {} + transferLock = null + } + + /** + * 当前 Wi-Fi 链路的协商速率与信号强度。 + * + * 判断"传输慢"到底是软件问题还是链路本身的上限,这两个数字是唯一 + * 依据:协商 866 Mbps 却只跑到 136 Mbps 说明有优化空间; + * 协商本来就只有 150 Mbps 就已经接近满速,改代码也没用。 + */ + @Suppress("DEPRECATION", "MissingPermission") + fun describeLink(): String = try { + val info = wifiManager.connectionInfo + if (info == null || info.linkSpeed <= 0) { + "链路信息不可用" + } else { + val band = if (Build.VERSION.SDK_INT >= 21 && info.frequency >= 4900) "5GHz" else "2.4GHz" + "链路 ${info.linkSpeed} Mbps · $band · 信号 ${info.rssi} dBm" + } + } catch (e: Exception) { + "链路信息读取失败:${e.message}" + } + /** * 当前网络的自述:本机地址/掩码、网关、SSID。 *