fix direct connection startup and drag stability

This commit is contained in:
zhy200308
2026-08-12 14:28:49 +08:00
parent 8b3f5c0216
commit 1c5e015285
9 changed files with 164 additions and 59 deletions
+1 -1
View File
@@ -2587,7 +2587,7 @@ checksum = "d55d956fa96f5ec02be2e13af0e20391a5aa83d6a074e3ad368959d0fab299ea"
[[package]]
name = "qft-desktop"
version = "0.4.15"
version = "0.4.16"
dependencies = [
"anyhow",
"base64",
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "qft-desktop"
version = "0.4.15"
version = "0.4.16"
edition = "2024"
rust-version = "1.95"
+1 -1
View File
@@ -157,7 +157,7 @@ impl DirectAp {
if std::time::Instant::now() >= deadline {
bail!("Wi-Fi Direct AP 或连接监听器启动超时。请确认无线网卡支持 Wi-Fi Direct,并关闭 Windows 移动热点后重试。")
}
std::thread::sleep(std::time::Duration::from_millis(80));
std::thread::sleep(std::time::Duration::from_millis(25));
};
let _ = publisher.RemoveStatusChanged(status_token);
+37 -7
View File
@@ -681,11 +681,12 @@ impl QftApp {
let fraction = if self.receive.total == 0 { 0.0 } else { self.receive.received as f32 / self.receive.total as f32 };
ui.add(egui::ProgressBar::new(fraction.clamp(0.0, 1.0)).show_percentage());
ui.label(format!("已接收:{} / {}", human_bytes(self.receive.received), human_bytes(self.receive.total)));
if self.receive.rate_bps > 1.0 {
let eta = if self.receive.total > self.receive.received {
(self.receive.total - self.receive.received) as f64 / self.receive.rate_bps
} else { 0.0 };
ui.label(format!("速度:{}/s · 预计剩余:{}", human_bytes(self.receive.rate_bps as u64), human_duration(eta)));
if let Some(label) = receive_rate_text(
self.receive.received,
self.receive.total,
self.receive.rate_bps,
) {
ui.label(label);
}
ui.separator();
ui.label(format!("最近保存:{}", self.receive.last_saved));
@@ -1070,7 +1071,6 @@ impl QftApp {
// 先创建专用网络,再绑定 0.0.0.0。虽然 Windows 理论上会把既有的
// INADDR_ANY socket 应用于后出现的网卡,但实机上 WFP/新网络配置文件
// 初始化存在竞态;服务后绑定可消除这一不必要的不确定性。
if direct_ap.is_some() { std::thread::sleep(Duration::from_millis(500)); }
let server = match ReceiverServer::start(save_dir, token.clone(), tx) {
Ok(v) => v,
Err(e) => {
@@ -1164,7 +1164,6 @@ impl QftApp {
}
} else { None };
if direct_ap.is_some() { std::thread::sleep(Duration::from_millis(500)); }
let server = match SenderServer::start(file, token.clone(), tx) {
Ok(v) => v,
Err(e) => {
@@ -1594,6 +1593,14 @@ impl QftApp {
fn ensure_direct_firewall_ready(&mut self) -> Result<(), String> {
self.pc.firewall_probe = None;
self.pc.firewall_probing = false;
// The exact executable and fixed-port rules were already verified in
// this process. Avoid starting another PowerShell (typically 1–2 s)
// every time the user starts the next Direct session; “重新检测” remains
// available if rules are changed externally while QFT is open.
if matches!(self.pc.firewall, firewall::FirewallStatus::Allowed) {
self.pc.firewall_note = "当前程序路径和直传端口已确认放行".into();
return Ok(());
}
let mut status = firewall::status();
if matches!(status, firewall::FirewallStatus::Allowed) {
self.pc.firewall = status;
@@ -1934,6 +1941,19 @@ fn human_duration(seconds: f64) -> String {
if minutes > 0 { format!("{minutes} 分 {secs} 秒") } else { format!("{secs} 秒") }
}
fn receive_rate_text(received: u64, total: u64, rate_bps: f64) -> Option<String> {
if rate_bps <= 1.0 {
return None;
}
let rate = human_bytes(rate_bps as u64);
if total > received {
let eta = (total - received) as f64 / rate_bps;
Some(format!("速度:{rate}/s · 预计剩余:{}", human_duration(eta)))
} else {
Some(format!("平均速度:{rate}/s"))
}
}
/// 把逻辑点尺寸吸附到物理像素整数上。
///
/// 二维码纹理用 NEAREST 采样:绘制尺寸若落在半个物理像素上,
@@ -2042,6 +2062,16 @@ fn human_bytes(v: u64) -> String {
mod font_tests {
use super::*;
#[test]
fn completed_receive_rate_never_shows_an_eta() {
let running = receive_rate_text(900, 1_000, 100.0).unwrap();
assert!(running.contains("预计剩余"));
let completed = receive_rate_text(1_000, 1_000, 100.0).unwrap();
assert_eq!(completed, "平均速度:100 B/s");
assert!(!completed.contains("预计剩余"));
}
#[test]
fn detects_ttc_collections_not_just_ttf() {
// 旧实现只看扩展名,把 macOS/Linux 清一色的 .ttc 全拒了