diff --git a/README.md b/README.md index 5701cac..1f71bd1 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ ## 1.22.3 DJI 相机曲线与 HSL 吸管 +正式版 1.22.3(140)已完成签名公证、1106项原生检查、FCP界面核对及安装包下载验证。[发行包](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.3-dji-hsl-20261116) · [验证与恢复](开发交接.md)。 + HSL 新增“吸管”:点取画面颜色后自动进入对应八色调整项,暖肤色优先进入橙色;中性色/取消保留当前选择,调色值不变。主模块、独立层与控制面板均可用。 一级调色与独立 CST 的输入/工作/输出曲线菜单新增御 4 Pro D-Log、Pocket 4 D-Log、Pocket 4P D-Log 和 D-Log 2。D-Log 手选搭配 DJI D-Gamut,D-Log 2 搭配 DJI D-Gamut 2;仍保持曲线与色域独立。御4Pro的D-Log M素材使用相应D-Log M处理。[模式依据及ID映射](research/DJICameraCurves.md)。 diff --git a/RECOVERY.md b/RECOVERY.md index 126943a..e07d648 100644 --- a/RECOVERY.md +++ b/RECOVERY.md @@ -1,10 +1,14 @@ # 2026-11-16 DJI 曲线与 HSL 吸管 1.22.3(140) -当前正式安装 `/Library/Plug-Ins/FxPlug/大鱼调色.app` 为140,签名/票据/Gatekeeper、唯一PluginKit路径与实际进程已核验。APP公证 `0eb8ca58-2330-4f72-abd0-81249731cbb3` Accepted,1106项原生检查与FCP12.4图标、紧凑按钮、色域分组选择检查通过;139的实际蓝/肤色取样由用户确认,140相同取色核心未重测物理点击。[安装](verification/Delivery1.22.3.json) · [宿主范围](verification/HostDJIHSL1.22.3.json)。正式包 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.22.3.pkg`,44,582,272字节,SHA-256 `cd7e2c8a9891aa0c653a4d777064deb6afeea3a94fe5b55866765bea96c61fa7`。Developer ID Installer签名、公证 `a7c1ab03-002e-40ad-a570-bc6b68f50501` Accepted、票据与Gatekeeper通过,20项展开验包通过;未再次执行系统安装器。[验包](verification/Package1.22.3.json)。接下来提交并核验发行标签,上传Release并完整下载校验。 最终发行标签待创建。 +当前唯一正式安装 `/Library/Plug-Ins/FxPlug/大鱼调色.app` 为140,签名/票据/Gatekeeper、实际进程与两轮PluginKit固定路径核验通过。APP公证 `0eb8ca58-2330-4f72-abd0-81249731cbb3` Accepted;1106项原生检查及FCP12.4图标、紧凑按钮和色域分组选择通过。139的蓝/肤色实点由用户确认,140取色核心相同,不另宣称140物理点击重测。[安装](verification/Delivery1.22.3.json) · [宿主范围](verification/HostDJIHSL1.22.3.json)。 -私有远程 `https://dayu.media/git/dayu/dayu-color.git`,main;实际编译 `876c5f127072aeff3fc7719690bab95417438d2a` 已推送。恢复Git认证后克隆并 `git switch --detach 876c5f127072aeff3fc7719690bab95417438d2a`。独立HTTPS检出核对1015个跟踪文件中的403个构建输入匹配,工程字典仅排序差异,无LFS/子模块,Git完整性通过;未在检出中重编。[候选恢复](verification/RecoveryCandidate140.json)。 +远程 `https://dayu.media/git/dayu/dayu-color.git`,main;实际编译 `876c5f127072aeff3fc7719690bab95417438d2a`。最终标签 `v1.22.3-dji-hsl-20261116` → `b37f6b530b00abf19d43513a6bfdd44ed52082e8` 已推送回读。恢复Git认证后克隆,可 `git switch --detach 876c5f127072aeff3fc7719690bab95417438d2a` 恢复编译源码,或检出最终标签恢复对应的验包记录。独立HTTPS检出核对1027个跟踪文件、403个构建输入匹配,工程字典仅排序差异,Git完整性通过,无LFS/子模块;未在检出中重编,临时检出清理。[恢复核验](verification/Recovery1.22.3.json)。 -Xcode27.2、FxPlug4.3.5、Metal组件、Apple Silicon、macOS14.6+及锁定ColorManagement依赖;指定当前Xcode的DEVELOPER_DIR和MacOSX.sdk。使用 `tools/deliver.py` 正式签名、公证、安装及宿主核验,再用 `Packaging/build_pkg.py` 制包,最后 `Packaging/publish_release.py` 发布及完整下载校验。主ID `com.dayu.color`,服务 `com.dayu.color.XPC`,团队B3W25FX5H5。证书私钥、公证profile和账号凭据独立恢复;用户媒体/LUT不由源码Git恢复。[当前交接](开发交接.md)。下文为历史已完成发行。 +PKG公证 `a7c1ab03-002e-40ad-a570-bc6b68f50501` Accepted;Installer签名、票据、Gatekeeper与20项展开验包通过。正式包 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.22.3.pkg`,44,582,272字节,SHA-256 `cd7e2c8a9891aa0c653a4d777064deb6afeea3a94fe5b55866765bea96c61fa7`。本轮未再次执行PKG系统安装器,引用已完成的正式APP安装与宿主检查。[验包](verification/Package1.22.3.json)。[Release 448](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.3-dji-hsl-20261116) 附件77已发布;发布前与发布后的完整下载均匹配44,582,272字节和上述SHA-256。[首次发布](verification/ReleaseInitialPublish1.22.3.json) · [发布后下载核验](verification/Release1.22.3.json)。发行标签 `v1.22.3-dji-hsl-20261116` → `b37f6b530b00abf19d43513a6bfdd44ed52082e8` 已推送、回读;保留原标签,不随后续证据提交移动。 + +Xcode27.2、FxPlug4.3.5、Metal组件、Apple Silicon、macOS14.6+及锁定ColorManagement依赖;指定当前Xcode的DEVELOPER_DIR和MacOSX.sdk。使用 `tools/deliver.py` 完成正式签名公证安装及宿主核验,再用 `Packaging/build_pkg.py` 制包和 `Packaging/publish_release.py` 发布下载验收。主ID `com.dayu.color`,服务 `com.dayu.color.XPC`,团队B3W25FX5H5。证书私钥、公证profile、账号凭据和用户媒体/LUT独立恢复,不包含在源码Git中。 + +生成APP、回滚副本、公证ZIP、验包展开与恢复检出已清理;保留当前与历史发行包、用户媒体和QA库。当前仓库API的 `private:false` 与前两次发行一致,本轮没有修改可见性或权限。文章15792仍1.22.2(137),主APP更新通道仍1.21.8(126),本轮未动NAS生产。此前图章“最后可信帧”在FCP12.4自动跳转仍需手动按显示时间定位。[清理](verification/Cleanup1.22.3.json) · [当前交接](开发交接.md)。下文保留历史发行。 --- diff --git a/verification/Cleanup1.22.3.json b/verification/Cleanup1.22.3.json index a3d73c7..fb1406a 100644 --- a/verification/Cleanup1.22.3.json +++ b/verification/Cleanup1.22.3.json @@ -18,7 +18,32 @@ "scopeLimit": "Directory and bundle-identity scan of listed locations; not an assertion about all disks, archives, offline volumes or protected areas.", "buildAndNotaryArtifactsRemoved": true, "packageBuildStillRunning": false, - "temporaryRecoveryClonePendingCleanup": true, + "temporaryRecoveryClonePendingCleanup": false, "packageTemporaryStageCleanedByBuilder": true, - "finalPackageRetained": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.22.3.pkg" + "finalPackageRetained": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.22.3.pkg", + "temporaryRecoveryCloneRemoved": true, + "taskRollbackCopiesRemoved": true, + "looseBuildAppAndSubmissionZIPRemoved": true, + "productRegistrationFinal": [ + { + "allRecords": "com.dayu.color.XPC(1.1)\t9EB7371D-87B5-4A3C-84C7-68A87E8AFE4F\t2026-11-16 10:03:41 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)", + "defaultRecords": "com.dayu.color.XPC(1.1)\t9EB7371D-87B5-4A3C-84C7-68A87E8AFE4F\t2026-11-16 10:03:41 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)" + }, + { + "allRecords": "com.dayu.color.XPC(1.1)\t9EB7371D-87B5-4A3C-84C7-68A87E8AFE4F\t2026-11-16 10:03:41 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)", + "defaultRecords": "com.dayu.color.XPC(1.1)\t9EB7371D-87B5-4A3C-84C7-68A87E8AFE4F\t2026-11-16 10:03:41 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)" + } + ], + "runningFormalProductProcesses": [ + "16219 /Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/MacOS/大鱼调色", + "16279 /Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/MacOS/大鱼调色 XPC Service" + ], + "finalIdentityVerified": true, + "retained": [ + "Current signed/notarized 1.22.3 PKG", + "Historical installers and archives", + "User LUTs and media", + "FCP QA library (now includes user media)" + ], + "repositoryVisibility": "Existing API private:false matches prior releases; publisher did not change visibility." } diff --git a/verification/Recovery1.22.3.json b/verification/Recovery1.22.3.json new file mode 100644 index 0000000..40644be --- /dev/null +++ b/verification/Recovery1.22.3.json @@ -0,0 +1,21 @@ +{ + "passResult": true, + "remote": "https://dayu.media/git/dayu/dayu-color.git", + "compiledSource": "876c5f127072aeff3fc7719690bab95417438d2a", + "tag": "v1.22.3-dji-hsl-20261116", + "releaseCommit": "b37f6b530b00abf19d43513a6bfdd44ed52082e8", + "independentHTTPSClone": true, + "trackedFilesInRelease": 1027, + "buildInputsByteMatched": 403, + "projectFilesSemanticallyMatched": [ + "大鱼调色.xcodeproj/project.pbxproj" + ], + "gitFsck": true, + "LFSObjectsRequired": false, + "submodules": false, + "remoteRebuildPerformed": false, + "packageSHA256": "cd7e2c8a9891aa0c653a4d777064deb6afeea3a94fe5b55866765bea96c61fa7", + "packageBytes": 44582272, + "scope": "Remote final tag checkout, all tracked files present and Git integrity checked; byte comparison of all versioned app/build/template/package inputs against the local build checkout. Release attachment download is recorded separately.", + "temporaryCloneRemoved": true +} diff --git a/verification/RecoveryCandidate140.json b/verification/RecoveryCandidate140.json index 002946d..064d6f4 100644 --- a/verification/RecoveryCandidate140.json +++ b/verification/RecoveryCandidate140.json @@ -13,6 +13,7 @@ "submodules": false, "remoteRebuildPerformed": false, "temporaryClone": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/recovery-1.22.3", - "temporaryCloneRemoved": false, - "scope": "Independent complete source checkout and byte comparison of versioned build inputs; final release tag will be fetched and verified before clone cleanup." + "temporaryCloneRemoved": true, + "scope": "Independent complete source checkout and byte comparison of versioned build inputs; final release tag will be fetched and verified before clone cleanup.", + "finalReleaseRecovery": "Recovery1.22.3.json" } diff --git a/verification/Release.json b/verification/Release.json index e575d28..b576368 100644 --- a/verification/Release.json +++ b/verification/Release.json @@ -3,16 +3,16 @@ "repository": "dayu/dayu-color", "repositoryID": 52, "private": false, - "tag": "v1.22.2-clone-ui-20261115", - "releaseCommit": "90ca0f4a08ecd8481a2e736f50ede2fa0fd2f1ef", - "releaseID": 437, - "releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.2-clone-ui-20261115", - "assetID": 72, - "assetName": "大鱼调色-1.22.2.pkg", - "downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.22.2-clone-ui-20261115/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.22.2.pkg", - "bytes": 44570793, - "sha256": "237baadbdfdfdf77de8529e9e05602f1ddecf5943f44d0fe80ae0a4c3eef5843", + "tag": "v1.22.3-dji-hsl-20261116", + "releaseCommit": "b37f6b530b00abf19d43513a6bfdd44ed52082e8", + "releaseID": 448, + "releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.3-dji-hsl-20261116", + "assetID": 77, + "assetName": "大鱼调色-1.22.3.pkg", + "downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.22.3-dji-hsl-20261116/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.22.3.pkg", + "bytes": 44582272, + "sha256": "cd7e2c8a9891aa0c653a4d777064deb6afeea3a94fe5b55866765bea96c61fa7", "existingAssetReused": true, "verification": "Authenticated full download SHA-256 and byte count, then release/asset read-back.", - "credentialSource": "macOS Keychain: dayu-git-api" + "credentialSource": "macOS Keychain: dayu-git-browser-read" } diff --git a/verification/Release1.22.3.json b/verification/Release1.22.3.json new file mode 100644 index 0000000..b576368 --- /dev/null +++ b/verification/Release1.22.3.json @@ -0,0 +1,18 @@ +{ + "passResult": true, + "repository": "dayu/dayu-color", + "repositoryID": 52, + "private": false, + "tag": "v1.22.3-dji-hsl-20261116", + "releaseCommit": "b37f6b530b00abf19d43513a6bfdd44ed52082e8", + "releaseID": 448, + "releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.3-dji-hsl-20261116", + "assetID": 77, + "assetName": "大鱼调色-1.22.3.pkg", + "downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.22.3-dji-hsl-20261116/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.22.3.pkg", + "bytes": 44582272, + "sha256": "cd7e2c8a9891aa0c653a4d777064deb6afeea3a94fe5b55866765bea96c61fa7", + "existingAssetReused": true, + "verification": "Authenticated full download SHA-256 and byte count, then release/asset read-back.", + "credentialSource": "macOS Keychain: dayu-git-browser-read" +} diff --git a/verification/ReleaseInitialPublish1.22.3.json b/verification/ReleaseInitialPublish1.22.3.json new file mode 100644 index 0000000..4481255 --- /dev/null +++ b/verification/ReleaseInitialPublish1.22.3.json @@ -0,0 +1,18 @@ +{ + "passResult": true, + "repository": "dayu/dayu-color", + "repositoryID": 52, + "private": false, + "tag": "v1.22.3-dji-hsl-20261116", + "releaseCommit": "b37f6b530b00abf19d43513a6bfdd44ed52082e8", + "releaseID": 448, + "releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.3-dji-hsl-20261116", + "assetID": 77, + "assetName": "大鱼调色-1.22.3.pkg", + "downloadURL": "https://dayu.media/git/attachments/b194ddad-49e1-4d2f-8e3b-ba7794e2164f", + "bytes": 44582272, + "sha256": "cd7e2c8a9891aa0c653a4d777064deb6afeea3a94fe5b55866765bea96c61fa7", + "existingAssetReused": false, + "verification": "Authenticated full download SHA-256 and byte count, then release/asset read-back.", + "credentialSource": "macOS Keychain: dayu-git-browser-read" +} diff --git a/开发交接.md b/开发交接.md index af33d8b..bcb15fe 100644 --- a/开发交接.md +++ b/开发交接.md @@ -4,9 +4,9 @@ ## 当前结果与发行状态 -本轮增加 DJI 御 4 Pro、Pocket 4 / 4P 的 CST 曲线与 HSL 吸管,并按后续反馈加入吸管图标、紧凑按钮及色域分组。**当前正式安装 1.22.3(140)已签名、公证 Accepted、粘附、启动和宿主检查通过;PKG已签名公证并验包通过;Release上传与下载校验继续完成。** 固定位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主 ID `com.dayu.color`,服务 `com.dayu.color.XPC`,团队 `B3W25FX5H5`。[安装](verification/Delivery1.22.3.json) · [身份及实际进程](verification/InstalledIdentity140.json)。 +本轮增加 DJI 御 4 Pro、Pocket 4 / 4P 的 CST 曲线与 HSL 吸管,并按后续反馈加入吸管图标、紧凑按钮及色域分组。**当前正式安装 1.22.3(140)已签名、公证 Accepted、粘附、启动和宿主检查通过;正式PKG与Release发布、完整下载校验均完成。** 固定位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主 ID `com.dayu.color`,服务 `com.dayu.color.XPC`,团队 `B3W25FX5H5`。[安装](verification/Delivery1.22.3.json) · [身份及实际进程](verification/InstalledIdentity140.json)。 -实际编译源码 `876c5f127072aeff3fc7719690bab95417438d2a`,已推送回读;独立 HTTPS 检出核对 1015 个跟踪文件中的 403 个构建输入逐字节一致,工程字典仅排序差异,Git 完整性通过,无 LFS/子模块,未在检出内重编。恢复检出暂留缓存,待最终标签核验后清理。[恢复候选](verification/RecoveryCandidate140.json)。最终发行标签尚未创建,预定 `v1.22.3-dji-hsl-20261116`。 +实际编译源码 `876c5f127072aeff3fc7719690bab95417438d2a`,已推送回读。发行标签 `v1.22.3-dji-hsl-20261116` → `b37f6b530b00abf19d43513a6bfdd44ed52082e8`;独立HTTPS检出核对1027个跟踪文件、403个构建输入逐字节一致,工程字典仅排序差异,Git完整性通过,无LFS/子模块;未在检出内重编,临时检出已清理。[远端恢复](verification/Recovery1.22.3.json)。 ## 功能与验收范围 @@ -16,17 +16,17 @@ - 140 的发布前和正式安装 **1106 项原生自检全过**,新增6项覆盖输入/工作/输出的所有曲线、色域选项经真实检查器动作写入、刷新和读回,防止分组标题造成错位。16个starter模板未改变,参数元数据同步。[发布前](verification/Preflight140.json) · [正式安装](verification/InstalledSelfTest140.json)。 - FCP 12.4 的140实际界面确认图标、紧凑按钮和两个CST入口分组;一级调色在旧Action5矩阵与D-Gamut间选择再恢复正常,升级后保留御4Pro/D-Gamut和Pocket4P D-Log2/D-Gamut2。139已完成三项目导入、XML导出及一级调色冷重开;140未重导出用户后来补入素材的项目。[140宿主范围](verification/HostDJIHSL1.22.3.json)。 -## 安装包与下一步 +## 发行与保存 140 APP公证 `0eb8ca58-2330-4f72-abd0-81249731cbb3` 已Accepted,原提交的ZIP摘要保留,不重复上传。[公证](verification/NotarySubmission140.json)。`tools/deliver.py` 在宿主检查后已 complete 正常退出,回滚139备份清理;之前137/138的本轮回滚副本也在139用户验收后核对身份清理。[139清理](verification/AcceptedInstall139.json)。 -正式包 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.22.3.pkg`,44,582,272字节,SHA-256 `cd7e2c8a9891aa0c653a4d777064deb6afeea3a94fe5b55866765bea96c61fa7`。Developer ID Installer签名、公证 `a7c1ab03-002e-40ad-a570-bc6b68f50501` Accepted、票据与Gatekeeper通过,20项展开验包通过;未再次执行系统安装器。[验包](verification/Package1.22.3.json)。接下来提交并核验发行标签,上传Release并完整下载校验。 +正式包 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.22.3.pkg`,44,582,272字节,SHA-256 `cd7e2c8a9891aa0c653a4d777064deb6afeea3a94fe5b55866765bea96c61fa7`。Developer ID Installer签名、公证 `a7c1ab03-002e-40ad-a570-bc6b68f50501` Accepted、票据与Gatekeeper通过,20项展开验包通过;未再次执行系统安装器。[验包](verification/Package1.22.3.json)。[Release 448](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.3-dji-hsl-20261116) 附件77已发布;发布前与发布后的完整下载均匹配44,582,272字节和上述SHA-256。[首次发布](verification/ReleaseInitialPublish1.22.3.json) · [发布后下载核验](verification/Release1.22.3.json)。发行标签 `v1.22.3-dji-hsl-20261116` → `b37f6b530b00abf19d43513a6bfdd44ed52082e8` 已推送、回读;保留原标签,不随后续证据提交移动。 -文章15792仍为此前1.22.2(137),主APP更新通道仍1.21.8(126),本轮未修改文章、通道或NAS生产源码。已有历史包和用户LUT/媒体保留。 +文章15792仍为此前1.22.2(137),主APP更新通道仍1.21.8(126),本轮未修改文章、通道或NAS生产源码。已有历史包和用户LUT/媒体保留。正式登记两轮均只匹配140固定路径,已检查位置仅发现这一份主ID APP;本轮生成APP、公证ZIP、回滚副本、验包展开与恢复检出已清理,不声称扫描所有离线卷或压缩归档。[清理范围](verification/Cleanup1.22.3.json)。 ## 工程与保留事项 -工程 `/Volumes/备份/大鱼调色/大鱼调色`,分支main,私有远程 `https://dayu.media/git/dayu/dayu-color.git`。Xcode27.2、FxPlug4.3.5、Apple Silicon、macOS14.6+及锁定ColorManagement依赖。固定缓存 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color`。构建指定当前Xcode的 `DEVELOPER_DIR` 和 `MacOSX.sdk`,不要继承失效CommandLineTools SDKROOT。源文件大小写为 `DYPlugIn.mm`;既有工程引用排序差异未纳入本轮。源码及证据按共享仓库锁提交推送。 +工程 `/Volumes/备份/大鱼调色/大鱼调色`,分支main,大鱼远程 `https://dayu.media/git/dayu/dayu-color.git`。Xcode27.2、FxPlug4.3.5、Apple Silicon、macOS14.6+及锁定ColorManagement依赖。固定缓存 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color`。构建指定当前Xcode的 `DEVELOPER_DIR` 和 `MacOSX.sdk`,不要继承失效CommandLineTools SDKROOT。源文件大小写为 `DYPlugIn.mm`;既有工程引用排序差异未纳入本轮。源码及证据按共享仓库锁提交推送。 合成验收资料在固定缓存 `fcp-qa/dji-hsl-1.22.3/`,库 `fcp-qa/大鱼调色_验收.fcpbundle`。用户后来加入自己的媒体,不能把整个库上传或清理。Motion、HDR、真实DJI素材的独立色彩准确度未验收。此前图章“最后可信帧”在FCP12.4自动跳转失败,仍按显示时间手动定位。[此前交接](research/HandoffHistory-20261116-before-dji-hsl.md) · [恢复说明](RECOVERY.md)。