From e326611c8228afe5ffaf7df03dac18a4c4ae556b Mon Sep 17 00:00:00 2001 From: zhy Date: Tue, 11 Aug 2026 10:53:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=200.4.6=20=E5=B0=81=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ IMPLEMENTATION_STATUS.md | 2 +- README.md | 4 ++-- TEST_REPORT.md | 10 +++++----- TEST_RESULTS.txt | 2 +- VERIFY_WINDOWS_HOST.ps1 | 2 +- android/app/build.gradle.kts | 4 ++-- .../app/src/main/java/com/qft/optical/MainActivity.kt | 2 +- docs/PROTOCOL.md | 4 ++-- ios/QFT.xcodeproj/project.pbxproj | 8 ++++---- ios/README.md | 2 +- ios/tools/generate_xcodeproj.py | 4 ++-- windows/Cargo.lock | 2 +- windows/Cargo.toml | 2 +- windows/src/main.rs | 2 +- 15 files changed, 27 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 8dff8e0..2eece7f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ # Rust /target **/target +windows/target-*/ +**/__pycache__/ # Android .gradle/ **/build/ diff --git a/IMPLEMENTATION_STATUS.md b/IMPLEMENTATION_STATUS.md index 377b42a..8da303d 100644 --- a/IMPLEMENTATION_STATUS.md +++ b/IMPLEMENTATION_STATUS.md @@ -1,4 +1,4 @@ -# QFT v0.4.0-rc2 implementation status +# QFT v0.4.6 implementation status ## Windows → Android optical diff --git a/README.md b/README.md index 709043a..ed3de76 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# QFT · 超速二维码文件传输 v0.4.0-rc2 +# QFT · 超速二维码文件传输 v0.4.6 Windows + Android 双向候选版。v0.4 的核心目标不是继续堆“4 码理论吞吐”,而是解决 Android 端实际识别慢的问题:**删除 2×2/4 通道,改成一个大二维码 + 动态 ROI 锁定 + 高频局部解码**。 @@ -7,7 +7,7 @@ Windows + Android 双向候选版。v0.4 的核心目标不是继续堆“4 码 - **Windows → Android:纯光学**。文件数据只经过 Windows 屏幕 → Android 摄像头;Wi‑Fi、蓝牙、局域网和互联网都不参与文件数据传输。 - **Android → Windows:扫码本地直连**。Windows 选择保存目录并启动 QFT Direct/LAN 接收服务;Android 扫码、配网、自动发现电脑,然后并行分块上传,不经过外网。 -> rc2 已完成协议、图像合成解码、ROI、并行上传、UDP 发现、内存预算和关键 Kotlin 源码测试。当前生成环境没有真实 Windows 显示器、Android 相机或 Wi‑Fi Direct 适配器,因此物理 30/45/60 FPS 和真实扫码配网仍需在你的设备上跑 `VERIFY_WINDOWS_HOST.ps1` 后做最终验收;详见 `TEST_REPORT.md`。 +> v0.4.6 已完成协议、图像合成解码、ROI、并行上传、UDP 发现、内存预算和关键 Kotlin 源码测试。当前生成环境没有真实 Windows 显示器、Android 相机或 Wi‑Fi Direct 适配器,因此物理 30/45/60 FPS 和真实扫码配网仍需在你的设备上跑 `VERIFY_WINDOWS_HOST.ps1` 后做最终验收;详见 `TEST_REPORT.md`。 ## v0.4 光学链路改动 diff --git a/TEST_REPORT.md b/TEST_REPORT.md index 6965d51..e68bb21 100644 --- a/TEST_REPORT.md +++ b/TEST_REPORT.md @@ -1,4 +1,4 @@ -# QFT v0.4.0-rc2 test report +# QFT v0.4.6 test report Date: 2026-08-10 @@ -6,7 +6,7 @@ This report separates **tests actually executed in the current environment** fro ## What this RC changes -The rc2 optical path is deliberately simpler than v0.3: +The v0.4.6 optical path is deliberately simpler than v0.3: - 2×2 / 4-channel QR removed; - one large QR only; @@ -152,7 +152,7 @@ The guard models the Windows single-QR 1024×1024 RGBA pre-render queue: This is a design-budget check, not an OS-enforced RSS hard cap. GPU/runtime allocators can add platform-specific memory. -## Important implementation decisions validated during rc2 +## Important implementation decisions validated during v0.4.6 ### QFT2 uses Result.text, not ZXing rawBytes @@ -160,7 +160,7 @@ The active path is Base45 text. Android reconstructs the QFT binary frame from ` ### Duplicate camera hits are not duplicate assembler work -At 45/60 display FPS, a camera can observe the same displayed QR in multiple exposures. rc2 still counts every successful decode in diagnostics, but only a changed QFT2 text fingerprint is delivered to `SessionAssembler`. +At 45/60 display FPS, a camera can observe the same displayed QR in multiple exposures. v0.4.6 still counts every successful decode in diagnostics, but only a changed QFT2 text fingerprint is delivered to `SessionAssembler`. ### AF/AE does not run on a fixed periodic timer @@ -170,7 +170,7 @@ The scanner performs initial focus/metering, then re-meters after first lock or The current generation environment does not contain the Windows MSVC Rust toolchain, Android SDK, a physical Android camera, a Windows display or a Windows Wi-Fi Direct adapter. Therefore the following are **not claimed as passed here**: -1. Windows `cargo check/test/build --release` for rc2. +1. Windows `cargo check/test/build --release` for v0.4.6. 2. Android Gradle `:app:testDebugUnitTest :app:assembleDebug` against the real Android SDK. 3. Actual 30/45/60 displayed FPS → CameraX/ZXing effective new-frame throughput. 4. Lock acquisition/reacquisition timing on Android 7 and different phone camera pipelines. diff --git a/TEST_RESULTS.txt b/TEST_RESULTS.txt index 786d41c..4160df5 100644 --- a/TEST_RESULTS.txt +++ b/TEST_RESULTS.txt @@ -1,4 +1,4 @@ -QFT v0.4.0-rc2 test results +QFT v0.4.6 test results UTC 2026-08-10T08:45:56Z == protocol_selftest.py == diff --git a/VERIFY_WINDOWS_HOST.ps1 b/VERIFY_WINDOWS_HOST.ps1 index e186c3a..8bf063f 100644 --- a/VERIFY_WINDOWS_HOST.ps1 +++ b/VERIFY_WINDOWS_HOST.ps1 @@ -1,7 +1,7 @@ $ErrorActionPreference = 'Stop' $Root = Split-Path -Parent $MyInvocation.MyCommand.Path -Write-Host "== QFT v0.4.0-rc2 Windows host verification ==" -ForegroundColor Cyan +Write-Host "== QFT v0.4.6 Windows host verification ==" -ForegroundColor Cyan if (Get-Command python -ErrorAction SilentlyContinue) { Write-Host "[1/4] Core protocol/selftests" diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 44310cd..578cdc6 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -12,8 +12,8 @@ android { applicationId = "com.qft.optical" minSdk = 24 targetSdk = 35 - versionCode = 17 - versionName = "0.4.0-rc9" + versionCode = 18 + versionName = "0.4.6" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } 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 fea790a..36dc59d 100644 --- a/android/app/src/main/java/com/qft/optical/MainActivity.kt +++ b/android/app/src/main/java/com/qft/optical/MainActivity.kt @@ -193,7 +193,7 @@ class MainActivity : ComponentActivity() { ) { showReceivedFiles() }) root.addView(space(22)) root.addView(text("本机设备:$receiverDeviceLabel", 13f, MUTED)) - root.addView(text("QFT v0.4.0-rc2 · Android 7+ 到最新", 12f, MUTED)) + root.addView(text("QFT v0.4.6 · Android 7+ 到最新", 12f, MUTED)) setContentView(ScrollView(this).apply { setBackgroundColor(BG); addView(root) }) } diff --git a/docs/PROTOCOL.md b/docs/PROTOCOL.md index 64d6873..f09e201 100644 --- a/docs/PROTOCOL.md +++ b/docs/PROTOCOL.md @@ -1,4 +1,4 @@ -# QFT protocol notes — v0.4.0-rc2 +# QFT protocol notes — v0.4.6 ## 1. Windows → Android optical: QFT2 @@ -36,7 +36,7 @@ senderLen 2 u16 BE senderDevice N UTF-8 ``` -### Optical parameters in rc2 +### Optical parameters in v0.4.6 - one QR per display frame; - DATA payload: **450 B**; diff --git a/ios/QFT.xcodeproj/project.pbxproj b/ios/QFT.xcodeproj/project.pbxproj index 174384c..49fbf82 100644 --- a/ios/QFT.xcodeproj/project.pbxproj +++ b/ios/QFT.xcodeproj/project.pbxproj @@ -194,7 +194,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 46; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = QFT/Info.plist; @@ -203,7 +203,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 0.1.0; + MARKETING_VERSION = 0.4.6; PRODUCT_BUNDLE_IDENTIFIER = com.qft.transfer; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = NO; @@ -272,7 +272,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 46; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = QFT/Info.plist; @@ -281,7 +281,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 0.1.0; + MARKETING_VERSION = 0.4.6; PRODUCT_BUNDLE_IDENTIFIER = com.qft.transfer; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = NO; diff --git a/ios/README.md b/ios/README.md index 25a389e..82c26b4 100644 --- a/ios/README.md +++ b/ios/README.md @@ -1,4 +1,4 @@ -# QFT iOS 客户端 v0.1.0 +# QFT iOS 客户端 v0.4.6 三种传输方式: diff --git a/ios/tools/generate_xcodeproj.py b/ios/tools/generate_xcodeproj.py index fcf2d60..353194e 100644 --- a/ios/tools/generate_xcodeproj.py +++ b/ios/tools/generate_xcodeproj.py @@ -19,7 +19,7 @@ IOS_ROOT = os.path.dirname(HERE) APP_NAME = "QFT" BUNDLE_ID = "com.qft.transfer" DEPLOYMENT_TARGET = "17.0" -MARKETING_VERSION = "0.1.0" +MARKETING_VERSION = "0.4.6" SOURCES = [ "QFT/App/QFTApp.swift", @@ -280,7 +280,7 @@ def generate(): "ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon", "ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor", "CODE_SIGN_STYLE = Automatic", - "CURRENT_PROJECT_VERSION = 1", + "CURRENT_PROJECT_VERSION = 46", "ENABLE_PREVIEWS = YES", "GENERATE_INFOPLIST_FILE = NO", "INFOPLIST_FILE = QFT/Info.plist", diff --git a/windows/Cargo.lock b/windows/Cargo.lock index c201535..d94d455 100644 --- a/windows/Cargo.lock +++ b/windows/Cargo.lock @@ -2587,7 +2587,7 @@ checksum = "d55d956fa96f5ec02be2e13af0e20391a5aa83d6a074e3ad368959d0fab299ea" [[package]] name = "qft-windows" -version = "0.4.0-rc6" +version = "0.4.6" dependencies = [ "anyhow", "base64", diff --git a/windows/Cargo.toml b/windows/Cargo.toml index dcda5a1..829baec 100644 --- a/windows/Cargo.toml +++ b/windows/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "qft-windows" -version = "0.4.0-rc6" +version = "0.4.6" edition = "2024" rust-version = "1.95" diff --git a/windows/src/main.rs b/windows/src/main.rs index 1c350fa..3eab712 100644 --- a/windows/src/main.rs +++ b/windows/src/main.rs @@ -23,7 +23,7 @@ use std::{ // a nominally larger page that is only decoded 10~18 times per second. const DEFAULT_CHUNK_SIZE: u16 = 320; const UI_FONT_NAME: &str = "qft-ui"; -const APP_VERSION: &str = "0.4.0-rc6"; +const APP_VERSION: &str = "0.4.6"; fn main() -> eframe::Result { let options = eframe::NativeOptions {