From c10bd35a3ce559f5286d98ca298d82b02a2fe986 Mon Sep 17 00:00:00 2001 From: js051 <59658153+js051@users.noreply.github.com> Date: Mon, 24 Aug 2026 01:54:01 +0800 Subject: [PATCH] =?UTF-8?q?chore(repo):=20=E6=BA=96=E5=82=99=200.6.1=20?= =?UTF-8?q?=E9=96=8B=E7=99=BC=E9=A0=90=E8=A6=BD=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 5 ++++ README.md | 2 +- README.zh-TW.md | 2 +- android/app/build.gradle.kts | 4 +-- bridge/open_eos_bridge/__init__.py | 2 +- bridge/pyproject.toml | 2 +- docs/releases/v0.6.1.md | 39 ++++++++++++++++++++++++++++++ ios/OpenEOSControl/project.yml | 4 +-- simulator/pyproject.toml | 2 +- 9 files changed, 53 insertions(+), 9 deletions(-) create mode 100644 docs/releases/v0.6.1.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 7853168..b1d6881 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable release-level changes to Open EOS Control are documented here. ## [Unreleased] +## [0.6.1] - 2026-08-24 + +- Fixed the Android exposure picker so ISO, shutter, aperture, and white-balance tabs no longer overlap the current value. Phone layouts now show three complete values, tablet layouts show five, and the camera-write progress indicator no longer shifts the tabs. + ## [0.6.0] - 2026-08-21 - Added Android handoff from a single camera item or a multi-selection to Serein through explicit, temporary read-only `content://` grants. Open EOS Control stages and hashes complete originals, accepts only exact-session receipt batches, and verifies imported byte lengths and SHA-256 values without modifying camera media. @@ -143,3 +147,4 @@ This preview still requires broader Canon EOS R6 Mark III physical-device valida [0.4.0]: https://github.com/js051/open-eos-control/releases/tag/v0.4.0 [0.5.0]: https://github.com/js051/open-eos-control/releases/tag/v0.5.0 [0.6.0]: https://github.com/js051/open-eos-control/releases/tag/v0.6.0 +[0.6.1]: https://github.com/js051/open-eos-control/releases/tag/v0.6.1 diff --git a/README.md b/README.md index 7dc37e0..4515d65 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ English | [Traditional Chinese](README.zh-TW.md) Open EOS Control is an unofficial, open-source Canon EOS control project. It targets Canon EOS R6 Mark III first and is structured around PC, iOS, and Android clients that share the same camera-control concepts. -The current development preview is [v0.6.0](docs/releases/v0.6.0.md). It is intended for testing and contributor feedback, not production camera workflows. +The current development preview is [v0.6.1](docs/releases/v0.6.1.md). It is intended for testing and contributor feedback, not production camera workflows. The project is not CCAPI-only. CCAPI over Wi-Fi is the most validated backend. Android also has a standards-based USB/PTP backend and capability-gated Canon EOS controls. Android and iOS can both use the executable Desktop Bridge to control a camera connected to a PC by USB through the same camera contract. The Canon USB paths are grounded in pinned libgphoto2 behavior and covered by deterministic tests, but still require a recorded physical R6 Mark III validation. The PC bridge provides a tested API and responsive control UI through either open-source `gphoto2` USB or native HTTP CCAPI. Native Swift CCAPI and Desktop Bridge clients plus an iOS 17 SwiftUI app are implemented with English/Traditional Chinese UI and iPhone Simulator coverage; physical iPhone and camera validation remains. diff --git a/README.zh-TW.md b/README.zh-TW.md index 96da154..e905c10 100644 --- a/README.zh-TW.md +++ b/README.zh-TW.md @@ -4,7 +4,7 @@ Open EOS Control 是一個非官方、開源的 Canon EOS 控制專案。第一個真機優先目標是 Canon EOS R6 Mark III，架構上讓 PC、iOS、Android 三端共用同一套相機控制概念。 -目前的開發預覽版為 [v0.6.0](docs/releases/v0.6.0.md)，用途是測試與收集貢獻者回饋，不建議用於正式拍攝流程。 +目前的開發預覽版為 [v0.6.1](docs/releases/v0.6.1.md)，用途是測試與收集貢獻者回饋，不建議用於正式拍攝流程。 這個專案不是只做 CCAPI。目前驗證最完整的是 Wi-Fi 上的 CCAPI；Android 也已有標準 USB/PTP backend 與依能力開放的 Canon EOS 控制。Android 與 iOS 現在都能透過同一套 camera contract 使用可執行的 Desktop Bridge，控制以 USB 接在電腦上的相機。Canon USB 路徑以固定版本的 libgphoto2 行為為依據並有可重現測試，但仍需留下 R6 Mark III 真機驗證紀錄。PC bridge 可透過開源 `gphoto2` USB 或原生 HTTP CCAPI 提供經測試的 API 與內建響應式控制介面。原生 Swift CCAPI／Desktop Bridge client 與 iOS 17 SwiftUI App 已實作，具英文／繁中介面及 iPhone Simulator 測試；實體 iPhone 與相機驗證仍待完成。 diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index e31e985..575ce5a 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -23,8 +23,8 @@ android { applicationId = "dev.openeos.control" minSdk = 26 targetSdk = 35 - versionCode = 17 - versionName = "0.6.0" + versionCode = 18 + versionName = "0.6.1" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/bridge/open_eos_bridge/__init__.py b/bridge/open_eos_bridge/__init__.py index 1d91584..645a6d5 100644 --- a/bridge/open_eos_bridge/__init__.py +++ b/bridge/open_eos_bridge/__init__.py @@ -1,3 +1,3 @@ """Open EOS Control desktop bridge.""" -__version__ = "0.6.0" +__version__ = "0.6.1" diff --git a/bridge/pyproject.toml b/bridge/pyproject.toml index 73383c4..8141fe9 100644 --- a/bridge/pyproject.toml +++ b/bridge/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "open-eos-control-bridge" -version = "0.6.0" +version = "0.6.1" description = "Open EOS Control desktop camera bridge" readme = "README.md" license = "Apache-2.0" diff --git a/docs/releases/v0.6.1.md b/docs/releases/v0.6.1.md new file mode 100644 index 0000000..daca9a0 --- /dev/null +++ b/docs/releases/v0.6.1.md @@ -0,0 +1,39 @@ +# Open EOS Control v0.6.1 Development Preview + +[繁體中文](#繁體中文) | [English](#english) + +## 繁體中文 + +這個 `0.6.1` 開發預覽版修正 Android 曝光參數選擇器在調整 ISO、快門、光圈與白平衡時的重疊與邊緣裁切。這是 `0.6.0` 的向下相容介面修正版。 + +### 曝光調整介面 + +- 參數頁籤與數值軌道改為固定的上下分區，不再從同一個位置堆疊標題與目前值。 +- 手機顯示完整的前一個、目前與下一個值；較寬的平板顯示五個完整值，不再於左右邊緣露出半截文字。 +- 選取框保留在目前值內，設定寫入中的進度指示器使用固定槽位，不會讓 ISO／Tv／Av／WB 頁籤左右跳動。 +- 移除重複的參數標題／目前值列，保留頁籤與中央選取值作為單一清楚的資訊來源。 + +### 驗證與限制 + +- 已以 360x800、繁中、150% 字體驗證頁籤、前後值與選取框幾何，並人工檢查輸出的畫面快照。 +- Pixel API 34 與 API 36 AVD 的完整 Android UI 矩陣、Android 單元測試、lint、APK 建置與簽章 smoke test 均已通過。 +- 本修正尚未在實體 Android 手機安裝後重新確認；它不變更 CCAPI、USB/PTP、能力偵測或相機寫入語意，也不新增任何實體相機相容性宣稱。 +- `open-eos-control-android-0.6.1-debug.apk` 沿用固定開發簽章，可覆蓋安裝 v0.1.5 之後的同簽章預覽版。本版仍是 Development Preview，不是穩定版。 + +## English + +This `0.6.1` development preview fixes overlap and edge clipping in the Android exposure picker while adjusting ISO, shutter, aperture, and white balance. It is a backward-compatible UI patch for `0.6.0`. + +### Exposure Adjustment UI + +- Parameter tabs and the value track now occupy fixed separate rows instead of stacking the title and current value at the same origin. +- Phones show complete previous, current, and next values. Wider tablets show five complete values instead of clipped fragments at both edges. +- The selection frame remains inside the current value, and camera-write progress uses a reserved slot so ISO/Tv/Av/WB tabs do not shift. +- The redundant parameter-title/current-value row is removed, leaving the selected tab and centered value as one clear source of state. + +### Validation And Limitations + +- The layout was verified at 360x800 with Traditional Chinese and 150% font scale, including geometry assertions and manual inspection of the generated visual snapshot. +- The complete Android UI matrices on Pixel API 34 and API 36 AVDs, Android unit tests, lint, APK build, and signer smoke test all passed. +- This fix has not yet been rechecked after installation on a physical Android phone. It does not change CCAPI, USB/PTP, capability discovery, or camera-write semantics, and adds no physical-camera compatibility claim. +- `open-eos-control-android-0.6.1-debug.apk` retains the stable development signer and can update matching previews from v0.1.5 onward. This remains a Development Preview, not a stable release. diff --git a/ios/OpenEOSControl/project.yml b/ios/OpenEOSControl/project.yml index 5dc405e..fc2502c 100644 --- a/ios/OpenEOSControl/project.yml +++ b/ios/OpenEOSControl/project.yml @@ -20,8 +20,8 @@ targets: INFOPLIST_FILE: App/Info.plist PRODUCT_BUNDLE_IDENTIFIER: dev.openeos.control PRODUCT_NAME: OpenEOSControl - MARKETING_VERSION: 0.6.0 - CURRENT_PROJECT_VERSION: 15 + MARKETING_VERSION: 0.6.1 + CURRENT_PROJECT_VERSION: 16 SWIFT_VERSION: 5.10 TARGETED_DEVICE_FAMILY: "1,2" ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon diff --git a/simulator/pyproject.toml b/simulator/pyproject.toml index 49fc184..1ef7995 100644 --- a/simulator/pyproject.toml +++ b/simulator/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "open-eos-control-simulator" -version = "0.6.0" +version = "0.6.1" description = "Fake Canon camera simulator for Open EOS Control" license = "Apache-2.0" requires-python = ">=3.12"