optimize direct transfer UI and Android queue

This commit is contained in:
zhy200308
2026-08-12 14:06:03 +08:00
parent d7a29e035f
commit 8b3f5c0216
9 changed files with 260 additions and 182 deletions
+69 -80
View File
@@ -111,7 +111,6 @@ struct SendState {
status: String,
connected_device: String,
qr_focus: bool,
qr_controls_height: f32,
qr_zoom: f32,
}
@@ -241,7 +240,6 @@ impl QftApp {
status: "选择文件后生成二维码;手机扫码会自动配网并开始下载。".into(),
connected_device: "等待 Android 扫码".into(),
qr_focus: false,
qr_controls_height: 220.0,
qr_zoom: 1.0,
},
pc: PcPeerState {
@@ -574,6 +572,7 @@ impl QftApp {
}
let running = self.receive.server.is_some();
if !running {
ui.group(|ui| {
ui.heading("1 · 保存位置");
ui.horizontal_wrapped(|ui| {
@@ -629,17 +628,16 @@ impl QftApp {
});
ui.label(&self.receive.status);
});
}
if self.receive.server.is_some() {
ui.add_space(10.0);
let listen_port = self.receive.server.as_ref()
.map(|server| server.port)
.unwrap_or(receiver::PREFERRED_PORT);
ui.columns(2, |cols| {
cols[0].group(|ui| {
ui.heading("手机扫码 · QFTPAIR2");
// Direct AP 的虚拟网卡最容易被防火墙拦住,把检测结果放在
// 二维码旁边——用户在这里停留最久,也正是在这一步失败的。
let listen_port = self.receive.server.as_ref().map(|s| s.port).unwrap_or(receiver::PREFERRED_PORT);
self.firewall_panel(ui, listen_port);
ui.add_space(8.0);
if let Some(texture) = &self.receive.pair_texture {
let qr_zoom = self.receive.qr_zoom;
ui.vertical_centered(|ui| {
@@ -670,7 +668,12 @@ impl QftApp {
}
});
cols[1].group(|ui| {
ui.heading("接收状态 · Parallel v2");
ui.horizontal_wrapped(|ui| {
ui.heading("接收状态 · Parallel v2");
if ui.button("停止接收").clicked() {
self.stop_receiver();
}
});
ui.label(format!("电脑:{}", self.local_device));
ui.label(format!("手机:{}", self.receive.connected_device));
ui.separator();
@@ -688,6 +691,8 @@ impl QftApp {
ui.label(format!("最近保存:{}", self.receive.last_saved));
if !self.receive.last_sha256.is_empty() { ui.small(format!("SHA-256:{}", self.receive.last_sha256)); }
});
cols[1].add_space(8.0);
self.firewall_panel(&mut cols[1], listen_port);
});
}
}
@@ -783,51 +788,19 @@ impl QftApp {
}
fn pc_to_phone_resizable_qr_ui(&mut self, ui: &mut egui::Ui, ctx: &egui::Context) {
const DIVIDER_HEIGHT: f32 = 10.0;
let available_height = ui.available_height();
let min_controls_height = 150.0;
let min_qr_height = 260.0_f32.min((available_height * 0.55).max(180.0));
let max_controls_height = (available_height - min_qr_height - DIVIDER_HEIGHT)
.max(min_controls_height);
self.send.qr_controls_height = self
.send
.qr_controls_height
.clamp(min_controls_height, max_controls_height);
ui.allocate_ui_with_layout(
egui::vec2(ui.available_width(), self.send.qr_controls_height),
egui::Layout::top_down(egui::Align::Min),
|ui| {
egui::ScrollArea::vertical().show(ui, |ui| {
self.pc_to_phone_running_controls(ui);
});
},
);
let (divider_rect, divider_response) = ui.allocate_exact_size(
egui::vec2(ui.available_width(), DIVIDER_HEIGHT),
egui::Sense::drag(),
);
let divider_response = divider_response.on_hover_cursor(egui::CursorIcon::ResizeVertical);
let divider_color = if divider_response.dragged() || divider_response.hovered() {
ui.visuals().widgets.active.bg_fill
let _ = ctx;
if ui.available_width() >= 820.0 {
ui.columns(2, |cols| {
self.pc_to_phone_qr_panel(&mut cols[0], false);
egui::ScrollArea::vertical()
.auto_shrink([false, false])
.show(&mut cols[1], |ui| self.pc_to_phone_running_controls(ui));
});
} else {
ui.visuals().widgets.inactive.bg_fill
};
ui.painter().rect_filled(
divider_rect.shrink2(egui::vec2(0.0, 3.0)),
3.0,
divider_color,
);
if divider_response.dragged() {
let delta_y = ui.input(|input| input.pointer.delta().y);
self.send.qr_controls_height = (self.send.qr_controls_height + delta_y)
.clamp(min_controls_height, max_controls_height);
ctx.request_repaint();
self.pc_to_phone_qr_panel(ui, false);
ui.add_space(8.0);
self.pc_to_phone_running_controls(ui);
}
divider_response.on_hover_text("上下拖动,调整控制区和二维码区域的高度");
self.pc_to_phone_qr_panel(ui, false);
}
fn pc_to_phone_running_controls(&mut self, ui: &mut egui::Ui) {
@@ -869,7 +842,7 @@ impl QftApp {
ui.label(format!("文件:{} · {}", file.display(), human_bytes(self.send.file_size)));
}
ui.label(&self.send.status);
ui.small("拖动下方分隔条可为二维码腾出更多高度;也可切换到“专注二维码”。");
ui.small("二维码与控制区已并排显示;需要更大画面时可手动切换“专注二维码”。");
});
}
@@ -949,28 +922,18 @@ impl QftApp {
return;
}
ui.columns(2, |cols| {
cols[0].group(|ui| {
ui.heading("手机扫码 · QFTSEND2");
if let Some(texture) = &self.send.pair_texture {
let available = ui.available_size();
let max_side = available.x.min((available.y - 42.0).max(1.0));
let side = (max_side * self.send.qr_zoom).max(1.0).min(max_side);
let side = snap_to_physical(side, ui.ctx().pixels_per_point());
ui.vertical_centered(|ui| {
ui.image((texture.id(), egui::vec2(side, side)));
});
}
ui.set_min_height(panel_height);
});
cols[1].group(|ui| {
ui.heading("发送状态");
ui.label(format!("电脑:{}", self.local_device));
ui.label(format!("手机:{}", self.send.connected_device));
ui.label(self.send.file.as_ref().map(|file| format!("文件:{}", file.display())).unwrap_or_default());
ui.small("二维码只在本次直传会话有效;停止直传后立即失效。");
ui.set_min_height(panel_height);
});
ui.group(|ui| {
ui.heading("手机扫码 · QFTSEND2");
if let Some(texture) = &self.send.pair_texture {
let available = ui.available_size();
let max_side = available.x.min((available.y - 42.0).max(1.0));
let side = (max_side * self.send.qr_zoom).max(1.0).min(max_side);
let side = snap_to_physical(side, ui.ctx().pixels_per_point());
ui.vertical_centered(|ui| {
ui.image((texture.id(), egui::vec2(side, side)));
});
}
ui.small("二维码只在本次直传会话有效;停止直传后立即失效。");
});
}
@@ -1143,9 +1106,9 @@ impl QftApp {
self.receive.direct_ap = direct_ap;
self.receive.events = Some(rx);
self.receive.pair_texture = Some(ctx.load_texture("qft-pair-code", image, TextureOptions::NEAREST));
// 扫码是启动后的唯一下一步,默认把窗口让给大二维码;用户仍可退出
// 专注模式查看防火墙、地址和接收状态。
self.receive.focus_qr = true;
// 保持普通布局,让用户同时看到二维码、连接状态和防火墙诊断;只有
// 用户主动点击“专注二维码”时才隐藏其余信息。
self.receive.focus_qr = false;
self.receive.session_token = token;
self.receive.connected_device = "等待 Android 扫码".into();
self.receive.current_file = "—".into();
@@ -1236,9 +1199,8 @@ impl QftApp {
self.send.direct_ap = direct_ap;
self.send.events = Some(rx);
self.send.pair_texture = Some(ctx.load_texture("qft-send-code", image, TextureOptions::NEAREST));
// QFTSEND2 往往还带文件名、大小和 SHA-256,比接收码更密;生成后
// 直接放大显示,避免控制区把模块压到手机相机的识别下限附近。
self.send.qr_focus = true;
// 启动后保持二维码与状态并排;专注模式由用户手动进入。
self.send.qr_focus = false;
self.send.session_token = token;
self.send.connected_device = "等待 Android 扫码".into();
self.send.status = if self.send.use_direct_ap {
@@ -2201,6 +2163,33 @@ mod font_tests {
);
}
#[test]
fn running_send_qr_starts_beside_controls_without_forced_focus() {
let app = QftApp::bare(String::new());
assert!(!app.send.qr_focus, "扫码直传不应默认进入专注二维码");
assert!(!app.receive.focus_qr, "扫码接收不应默认进入专注二维码");
let positions = rendered_text_positions(|ui| {
let context = ui.ctx().clone();
let mut app = QftApp::bare(String::new());
app.pc_to_phone_resizable_qr_ui(ui, &context);
});
let qr_y = positions
.iter()
.find(|(text, _)| text.contains("手机扫码 · QFTSEND2"))
.map(|(_, y)| *y)
.expect("应绘制二维码面板");
let controls_y = positions
.iter()
.find(|(text, _)| text.contains("直传控制"))
.map(|(_, y)| *y)
.expect("应绘制控制面板");
assert!(
(qr_y - controls_y).abs() <= 8.0,
"二维码和控制区应从同一行开始,实际 qr={qr_y}, controls={controls_y}"
);
}
/// 接收页运行态(非专注模式)同样必须有防火墙入口。
#[test]
fn receive_running_page_renders_the_firewall_panel() {