V0.4.0加入锁定二维码
This commit is contained in:
+160
-92
@@ -1,3 +1,4 @@
|
||||
mod base45;
|
||||
mod direct_ap;
|
||||
mod optical_cache;
|
||||
mod pairing;
|
||||
@@ -16,9 +17,9 @@ use std::{
|
||||
time::{Duration, Instant},
|
||||
};
|
||||
|
||||
const DEFAULT_CHUNK_SIZE: u16 = 900;
|
||||
const DEFAULT_CHUNK_SIZE: u16 = 450;
|
||||
const UI_FONT_NAME: &str = "qft-ui";
|
||||
const APP_VERSION: &str = "0.3.0-rc3";
|
||||
const APP_VERSION: &str = "0.4.0-rc2";
|
||||
|
||||
fn main() -> eframe::Result {
|
||||
let options = eframe::NativeOptions {
|
||||
@@ -50,8 +51,11 @@ struct OpticalState {
|
||||
round: u64,
|
||||
playing: bool,
|
||||
fps: f32,
|
||||
lanes: usize,
|
||||
cache_mib: usize,
|
||||
control_width: f32,
|
||||
qr_zoom: f32,
|
||||
focus_qr: bool,
|
||||
advanced_open: bool,
|
||||
last_advance: Instant,
|
||||
fps_window_started: Instant,
|
||||
displayed_in_window: u32,
|
||||
@@ -105,14 +109,17 @@ impl QftApp {
|
||||
page_index: 0,
|
||||
round: 0,
|
||||
playing: false,
|
||||
fps: 60.0,
|
||||
lanes: 4,
|
||||
cache_mib: 384,
|
||||
fps: 45.0,
|
||||
cache_mib: 256,
|
||||
control_width: 330.0,
|
||||
qr_zoom: 1.0,
|
||||
focus_qr: false,
|
||||
advanced_open: false,
|
||||
last_advance: Instant::now(),
|
||||
fps_window_started: Instant::now(),
|
||||
displayed_in_window: 0,
|
||||
actual_page_fps: 0.0,
|
||||
status: "选择文件后开始光学发送。默认 4 码/页 · 60 FPS,缓存不足时会自动停在当前页等待。".into(),
|
||||
status: "选择文件后开始光学发送。v0.4 使用单个大二维码 + QFT2/Base45 低密度 450B 数据块,优先提高 Android 有效识别率。".into(),
|
||||
},
|
||||
receive: ReceiveState {
|
||||
save_dir: None,
|
||||
@@ -209,118 +216,180 @@ impl QftApp {
|
||||
self.optical.last_advance = Instant::now();
|
||||
self.optical_advance(ctx);
|
||||
}
|
||||
// Keep the UI scheduler hot enough for a 60 Hz display without busy-spinning.
|
||||
ctx.request_repaint_after((interval / 3).max(Duration::from_millis(1)));
|
||||
}
|
||||
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
ui.heading("电脑 → Android · 光学极速模式");
|
||||
ui.heading("电脑 → Android · 单码锁定极速模式");
|
||||
ui.separator();
|
||||
ui.label("屏幕 → 摄像头 · 0 网络");
|
||||
ui.separator();
|
||||
if ui.button(if self.optical.focus_qr { "退出专注二维码" } else { "专注二维码" }).clicked() {
|
||||
self.optical.focus_qr = !self.optical.focus_qr;
|
||||
}
|
||||
});
|
||||
ui.add_space(8.0);
|
||||
|
||||
ui.group(|ui| {
|
||||
if self.optical.focus_qr {
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
if ui.button("选择文件").clicked() { self.optical_pick_file(ctx); }
|
||||
ui.label("刷新率");
|
||||
ui.add(egui::Slider::new(&mut self.optical.fps, 1.0..=60.0).suffix(" FPS").step_by(1.0));
|
||||
if ui.small_button("15").clicked() { self.optical.fps = 15.0; }
|
||||
if ui.small_button("30").clicked() { self.optical.fps = 30.0; }
|
||||
if ui.small_button("60").clicked() { self.optical.fps = 60.0; }
|
||||
if ui.small_button("极速预设").clicked() {
|
||||
self.optical.fps = 60.0;
|
||||
self.optical.lanes = 4;
|
||||
self.optical.cache_mib = 384;
|
||||
self.optical.playing = false;
|
||||
self.restart_optical_pipeline();
|
||||
let _ = self.optical_render_first(ctx);
|
||||
}
|
||||
});
|
||||
|
||||
let old_lanes = self.optical.lanes;
|
||||
let old_cache = self.optical.cache_mib;
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
ui.label("视觉并行");
|
||||
ui.radio_value(&mut self.optical.lanes, 1, "1 码/页 · 兼容");
|
||||
ui.radio_value(&mut self.optical.lanes, 4, "4 码/页 · 极速");
|
||||
ui.separator();
|
||||
ui.label("预编码缓存");
|
||||
ui.add(egui::Slider::new(&mut self.optical.cache_mib, 64..=optical_cache::MAX_MANAGED_CACHE_MIB)
|
||||
.suffix(" MiB").step_by(64.0));
|
||||
});
|
||||
ui.small(format!(
|
||||
"QFT 只允许预编码缓存使用最多 {} MiB,为进程/GPU/系统缓冲预留空间,目标整进程不超过约 {} MiB。",
|
||||
optical_cache::MAX_MANAGED_CACHE_MIB, optical_cache::HARD_PROCESS_BUDGET_MIB
|
||||
));
|
||||
if old_lanes != self.optical.lanes || old_cache != self.optical.cache_mib {
|
||||
self.optical.playing = false;
|
||||
self.restart_optical_pipeline();
|
||||
let _ = self.optical_render_first(ctx);
|
||||
}
|
||||
|
||||
let enabled = self.optical.source.is_some();
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
if ui.add_enabled(enabled, egui::Button::new(if self.optical.playing { "暂停" } else { "开始播放" })).clicked() {
|
||||
if !self.optical.playing && self.optical.prefetch.is_none() {
|
||||
self.restart_optical_pipeline();
|
||||
}
|
||||
let enabled = self.optical.source.is_some();
|
||||
if ui.add_enabled(enabled, egui::Button::new(if self.optical.playing { "暂停" } else { "播放" })).clicked() {
|
||||
if !self.optical.playing && self.optical.prefetch.is_none() { self.restart_optical_pipeline(); }
|
||||
self.optical.playing = !self.optical.playing;
|
||||
self.optical.last_advance = Instant::now();
|
||||
self.optical.fps_window_started = Instant::now();
|
||||
self.optical.displayed_in_window = 0;
|
||||
}
|
||||
if ui.add_enabled(enabled, egui::Button::new("回到第 1 页")).clicked() {
|
||||
ui.label(format!("{:.0} FPS", self.optical.fps));
|
||||
ui.add(egui::Slider::new(&mut self.optical.qr_zoom, 0.65..=1.0).text("二维码占比").show_value(false));
|
||||
ui.small("控制区已收起,尽可能把屏幕面积留给二维码");
|
||||
});
|
||||
ui.separator();
|
||||
self.optical_qr_panel(ui);
|
||||
return;
|
||||
}
|
||||
|
||||
let available = ui.available_size();
|
||||
let min_qr_width = 360.0_f32.min(available.x * 0.55);
|
||||
let max_control = (available.x - min_qr_width - 12.0).max(240.0);
|
||||
self.optical.control_width = self.optical.control_width.clamp(240.0, max_control);
|
||||
let split_height = ui.available_height().max(420.0);
|
||||
|
||||
ui.horizontal(|ui| {
|
||||
ui.allocate_ui_with_layout(
|
||||
egui::vec2(self.optical.control_width, split_height),
|
||||
egui::Layout::top_down(egui::Align::Min),
|
||||
|ui| {
|
||||
egui::ScrollArea::vertical().show(ui, |ui| {
|
||||
self.optical_controls(ui, ctx);
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
let (bar_rect, bar_response) = ui.allocate_exact_size(
|
||||
egui::vec2(8.0, split_height),
|
||||
egui::Sense::drag(),
|
||||
);
|
||||
let bar_color = if bar_response.dragged() || bar_response.hovered() {
|
||||
ui.visuals().widgets.active.bg_fill
|
||||
} else {
|
||||
ui.visuals().widgets.inactive.bg_fill
|
||||
};
|
||||
ui.painter().rect_filled(bar_rect.shrink2(egui::vec2(2.0, 0.0)), 3.0, bar_color);
|
||||
if bar_response.dragged() {
|
||||
let dx = ui.input(|i| i.pointer.delta().x);
|
||||
self.optical.control_width = (self.optical.control_width + dx).clamp(240.0, max_control);
|
||||
ctx.request_repaint();
|
||||
}
|
||||
bar_response.on_hover_text("拖动压缩/展开控制区,右侧二维码会自动放大");
|
||||
|
||||
ui.allocate_ui_with_layout(
|
||||
egui::vec2(ui.available_width(), split_height),
|
||||
egui::Layout::top_down(egui::Align::Center),
|
||||
|ui| self.optical_qr_panel(ui),
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
fn optical_controls(&mut self, ui: &mut egui::Ui, ctx: &egui::Context) {
|
||||
ui.group(|ui| {
|
||||
ui.heading("发送控制");
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
if ui.button("选择文件").clicked() { self.optical_pick_file(ctx); }
|
||||
let enabled = self.optical.source.is_some();
|
||||
if ui.add_enabled(enabled, egui::Button::new(if self.optical.playing { "暂停" } else { "开始播放" })).clicked() {
|
||||
if !self.optical.playing && self.optical.prefetch.is_none() { self.restart_optical_pipeline(); }
|
||||
self.optical.playing = !self.optical.playing;
|
||||
self.optical.last_advance = Instant::now();
|
||||
self.optical.fps_window_started = Instant::now();
|
||||
self.optical.displayed_in_window = 0;
|
||||
}
|
||||
if ui.add_enabled(enabled, egui::Button::new("回到第1帧")).clicked() {
|
||||
self.optical.playing = false;
|
||||
self.restart_optical_pipeline();
|
||||
let _ = self.optical_render_first(ctx);
|
||||
}
|
||||
});
|
||||
|
||||
ui.add_space(6.0);
|
||||
ui.label("显示刷新率");
|
||||
ui.add(egui::Slider::new(&mut self.optical.fps, 5.0..=60.0).suffix(" FPS").step_by(1.0));
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
if ui.small_button("稳定 30").clicked() { self.optical.fps = 30.0; }
|
||||
if ui.small_button("平衡 45").clicked() { self.optical.fps = 45.0; }
|
||||
if ui.small_button("最高 60").clicked() { self.optical.fps = 60.0; }
|
||||
});
|
||||
ui.small("Android 会先全屏搜索一次,然后锁定单个二维码区域进行局部高频解码;60 FPS 是显示目标,实际有效识别率由手机相机决定。");
|
||||
});
|
||||
|
||||
ui.add_space(8.0);
|
||||
ui.group(|ui| {
|
||||
ui.heading("二维码可读性");
|
||||
ui.label(format!("单码 · 每块 {} B · QFT2/Base45 · QR-L · 完整静区", DEFAULT_CHUNK_SIZE));
|
||||
ui.add(egui::Slider::new(&mut self.optical.qr_zoom, 0.65..=1.0).text("画面占比"));
|
||||
ui.small("v0.4 已彻底删除 4 码模式;QFT2 使用 Base45 让 QR 进入字母数字模式,比旧 Base64 文本更低密度。默认 450 B 数据块仍保持较低 QR 版本,让 Android 更容易稳定锁定。");
|
||||
});
|
||||
|
||||
ui.add_space(8.0);
|
||||
ui.checkbox(&mut self.optical.advanced_open, "高级设置");
|
||||
if self.optical.advanced_open {
|
||||
ui.group(|ui| {
|
||||
let old_cache = self.optical.cache_mib;
|
||||
ui.label("预编码缓存");
|
||||
ui.add(egui::Slider::new(&mut self.optical.cache_mib, 64..=optical_cache::MAX_MANAGED_CACHE_MIB)
|
||||
.suffix(" MiB").step_by(64.0));
|
||||
ui.small(format!(
|
||||
"托管缓存最多 {} MiB;整进程设计预算约 {} MiB。缓存只影响二维码预编码是否跟得上,不会把整个文件读进内存。",
|
||||
optical_cache::MAX_MANAGED_CACHE_MIB, optical_cache::HARD_PROCESS_BUDGET_MIB
|
||||
));
|
||||
if old_cache != self.optical.cache_mib {
|
||||
self.optical.playing = false;
|
||||
self.restart_optical_pipeline();
|
||||
let _ = self.optical_render_first(ctx);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
ui.add_space(8.0);
|
||||
if let Some(source) = self.optical.source.as_ref() {
|
||||
let m = &source.manifest;
|
||||
let pages = source.total_pages(self.optical.lanes);
|
||||
let logical_fps = self.optical.fps as f64 * self.optical.lanes as f64;
|
||||
let payload_rate = logical_fps * m.chunk_size as f64;
|
||||
ui.columns(3, |cols| {
|
||||
cols[0].group(|ui| {
|
||||
ui.small("传输");
|
||||
ui.heading(format!("{:.0} FPS", self.optical.fps));
|
||||
ui.label(format!("{} 码/页 · {:.0} 逻辑帧/s", self.optical.lanes, logical_fps));
|
||||
});
|
||||
cols[1].group(|ui| {
|
||||
ui.small("实测显示");
|
||||
ui.heading(format!("{:.1} 页/s", self.optical.actual_page_fps));
|
||||
ui.label(format!("理论载荷 ≈ {}/s", human_bytes(payload_rate as u64)));
|
||||
});
|
||||
cols[2].group(|ui| {
|
||||
ui.small("内存策略");
|
||||
ui.heading(format!("{} MiB", self.optical.cache_mib));
|
||||
let cap = self.optical.prefetch.as_ref().map(|p| p.capacity_pages).unwrap_or(0);
|
||||
let page_mib = self.optical.prefetch.as_ref().map(|p| p.estimated_page_mib).unwrap_or(0.0);
|
||||
ui.label(format!("预编码最多 {cap} 页 · {page_mib:.1} MiB/页 · 定位读取"));
|
||||
});
|
||||
let pages = source.total_playlist_frames().max(1);
|
||||
let payload_rate = self.optical.fps as f64 * m.chunk_size as f64;
|
||||
ui.group(|ui| {
|
||||
ui.small("实时状态");
|
||||
ui.heading(format!("{:.1} 页/s", self.optical.actual_page_fps));
|
||||
ui.label(format!("理论载荷 ≈ {}/s", human_bytes(payload_rate as u64)));
|
||||
let cap = self.optical.prefetch.as_ref().map(|p| p.capacity_pages).unwrap_or(0);
|
||||
let page_mib = self.optical.prefetch.as_ref().map(|p| p.estimated_page_mib).unwrap_or(0.0);
|
||||
ui.small(format!("预编码缓存:{} MiB · 最多 {cap} 帧 · {page_mib:.1} MiB/帧", self.optical.cache_mib));
|
||||
ui.separator();
|
||||
ui.label(format!("设备:{} → Android", m.sender_device));
|
||||
ui.label(format!("文件:{} · {}", m.file_name, human_bytes(m.file_size)));
|
||||
ui.label(format!("帧:{}/{} · 完整轮次:{}", self.optical.page_index + 1, pages, self.optical.round));
|
||||
ui.small(format!("SHA-256:{}", hex_sha256(&m.sha256)));
|
||||
});
|
||||
ui.add_space(6.0);
|
||||
ui.label(format!("传输设备:{} → Android 光学接收端", m.sender_device));
|
||||
ui.label(format!("文件:{} · {}", m.file_name, human_bytes(m.file_size)));
|
||||
ui.small(format!("源路径:{}", source.path().display()));
|
||||
ui.label(format!("数据块:{} · 当前页:{}/{} · 完整轮次:{}", m.total_chunks, self.optical.page_index + 1, pages, self.optical.round));
|
||||
ui.small(format!("SHA-256:{}", hex_sha256(&m.sha256)));
|
||||
}
|
||||
ui.add_space(6.0);
|
||||
ui.label(&self.optical.status);
|
||||
ui.separator();
|
||||
}
|
||||
|
||||
fn optical_qr_panel(&mut self, ui: &mut egui::Ui) {
|
||||
if let Some(texture) = &self.optical.texture {
|
||||
let avail = ui.available_size();
|
||||
let side = avail.x.min(avail.y).min(680.0).max(320.0);
|
||||
ui.vertical_centered(|ui| { ui.image((texture.id(), egui::vec2(side, side))); });
|
||||
let reserved = if self.optical.focus_qr { 4.0 } else { 28.0 };
|
||||
let base = avail.x.min((avail.y - reserved).max(220.0)).max(220.0);
|
||||
let side = (base * self.optical.qr_zoom).clamp(220.0, base);
|
||||
ui.vertical_centered(|ui| {
|
||||
ui.image((texture.id(), egui::vec2(side, side)));
|
||||
if !self.optical.focus_qr {
|
||||
ui.small("拖动左侧分隔条可继续放大二维码;也可点击顶部“专注二维码”占满可用区域。");
|
||||
}
|
||||
});
|
||||
} else {
|
||||
ui.vertical_centered(|ui| {
|
||||
ui.add_space(100.0);
|
||||
ui.add_space(120.0);
|
||||
ui.heading("请选择一个文件");
|
||||
ui.label("极速模式会在后台并行预编码二维码;手机仍可处于飞行模式。")
|
||||
ui.label("单个大二维码会在这里显示,Android 识别后自动锁定区域。");
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -437,7 +506,7 @@ impl QftApp {
|
||||
if let Err(e) = self.optical_render_first(ctx) {
|
||||
self.optical.status = format!("生成二维码失败:{e:#}");
|
||||
} else {
|
||||
self.optical.status = "文件已载入。默认 4 码/页 · 60 FPS;低端手机若有效 QR/s 明显偏低,可降到 30 FPS。".into();
|
||||
self.optical.status = "文件已载入。默认单个大二维码 · QFT2/Base45 450B 数据块 · 45 FPS;可按手机能力切到 30 或 60 FPS。".into();
|
||||
}
|
||||
}
|
||||
Err(e) => self.optical.status = format!("读取文件失败:{e:#}"),
|
||||
@@ -445,7 +514,7 @@ impl QftApp {
|
||||
}
|
||||
|
||||
fn optical_canvas_side(&self) -> usize {
|
||||
if self.optical.lanes == 4 { 960 } else { 760 }
|
||||
1024
|
||||
}
|
||||
|
||||
fn restart_optical_pipeline(&mut self) {
|
||||
@@ -455,7 +524,6 @@ impl QftApp {
|
||||
let Some(source) = self.optical.source.clone() else { return };
|
||||
self.optical.prefetch = Some(OpticalPrefetcher::start(
|
||||
source,
|
||||
self.optical.lanes,
|
||||
self.optical_canvas_side(),
|
||||
self.optical.cache_mib,
|
||||
));
|
||||
@@ -463,8 +531,8 @@ impl QftApp {
|
||||
|
||||
fn optical_render_first(&mut self, ctx: &egui::Context) -> anyhow::Result<()> {
|
||||
let Some(source) = self.optical.source.as_ref() else { return Ok(()) };
|
||||
let texts = source.text_page(0, self.optical.lanes)?;
|
||||
let image = qr::render_qr_grid(&texts, self.optical_canvas_side())?;
|
||||
let text = source.text_frame(0)?;
|
||||
let image = qr::render_qr_fitted(&text, self.optical_canvas_side())?;
|
||||
self.set_optical_texture(ctx, image);
|
||||
self.optical.page_index = 0;
|
||||
self.optical.round = 0;
|
||||
@@ -507,7 +575,7 @@ impl QftApp {
|
||||
self.optical.status = if self.optical.actual_page_fps + 3.0 < self.optical.fps as f64 && self.optical.actual_page_fps > 1.0 {
|
||||
"实际页面速率低于目标:可降低 FPS 或把缓存调高;文件数据仍会循环补帧。".into()
|
||||
} else {
|
||||
"正在光学发送 · 4 码模式会把一页拆成四个独立 QR 并行解码。".into()
|
||||
"正在光学发送 · 单个大二维码,Android 锁定后仅在二维码 ROI 内高频解码。".into()
|
||||
};
|
||||
}
|
||||
Err(std::sync::mpsc::TryRecvError::Empty) => {
|
||||
|
||||
Reference in New Issue
Block a user