diff --git a/RECOVERY.md b/RECOVERY.md index b0c6c6b..cd38f3e 100644 --- a/RECOVERY.md +++ b/RECOVERY.md @@ -1,3 +1,17 @@ +# 2026-11-17 控件联动与蒙版保形1.22.5(142) + +远程 `https://dayu.media/git/dayu/dayu-color.git`,main。实际编译源 `a1eb334840e1af285e878e7c094b06aaf01cba49`;发行标签 `v1.22.5-controls-sync-20261117` → `a20e734f6691313771df67d91402c200fec0b401` 已推送回读。新机器重新登录大鱼Git后克隆,以 `git switch --detach a1eb334840e1af285e878e7c094b06aaf01cba49` 恢复编译源码,或检出发行标签恢复PKG验包记录;发布后下载与交接记录在随后main证据提交,标签保持不变。 + +独立HTTPS检出编译节点1050个文件与发行标签全部跟踪文件,Git完整性通过,409个源码/工程/依赖/模板/构建输入核对通过(408个逐字节相同,工程plist仅排序等价)。无LFS/子模块;未在恢复目录重新编译,临时克隆已清理。[恢复核验](verification/Recovery1.22.5.json)。Xcode27.2、FxPlug SDK4.3.5、Metal组件、Apple Silicon/macOS14.6+与锁定依赖;指定当前Xcode的DEVELOPER_DIR及MacOSX.sdk,复用tools/deliver.py和Packaging脚本。证书私钥、公证profile、账号凭据、用户LUT及媒体独立恢复,不包含在Git。 + +APP公证 `f3c42a54-a85b-4f7b-a569-14fa34b80f5c` Accepted;签名/票据/Gatekeeper、正式安装与1113项自检通过。正式APP `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主ID com.dayu.color,服务com.dayu.color.XPC,团队B3W25FX5H5。FCP12.4验证新增LUT模块、37%/62%双向强度、100帧合成蒙版保形(最大相对比例漂移7.8537e-8)、马赛克关联及冷启动持久化。物理画布拖动/吸管与2秒提示未直接GUI验收;复杂素材、遮挡/透视、Motion/HDR/变速仍需复测。[安装](verification/Delivery1.22.5.json) · [宿主范围](verification/HostControlsSync1.22.5.json)。 + +PKG `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.22.5.pkg`,44,585,448字节,SHA-256 `194c636978289dda73860a9409401f3063d153c6e3fdafdfc98bc52c760a2a2a`。Installer签名、公证 `9ee8e167-6d03-4c1a-93bc-efab671754af` Accepted、票据、Gatekeeper与20项验包通过;未再次运行系统安装器。[验包](verification/Package1.22.5.json)。[Release450](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.5-controls-sync-20261117),附件79,发布前/发布后完整下载均匹配上述字节数及SHA。[首次发布](verification/ReleaseInitialPublish1.22.5.json) · [发布后下载](verification/Release1.22.5.json)。 + +构建APP、公证ZIP、旧141回滚APP、验包展开与恢复克隆已清理。保留当前/历史PKG、QA库和用户资料;限定目录核对仅正式APP,PluginKit仅正式路径。[清理](verification/Cleanup1.22.5.json)。本轮无NAS生产改动,文章15792仍1.22.2(137),主APP更新通道仍1.21.8(126);既有图章最后可信帧自动跳转限制保留。[当前交接](开发交接.md)。下文为历史发行。 + +--- + # 2026-11-16 DJI 机型色域 1.22.4(141) 用户范围仅御4Pro、Pocket4和Pocket4P,新增色域ID29–32,对应既有曲线ID31–34及D-Gamut/D-Gamut2;旧编号保留。实际编译源 `f241a470caf39c5e44bb1e0a5544c01f16ee5bb3`,远程 `https://dayu.media/git/dayu/dayu-color.git`,main。最终标签 `v1.22.4-dji-gamut-20261116` → `c66a9ba9b683c66d59676111916d7d81da4ab8c7` 已推送回读。恢复认证后克隆并 `git switch --detach f241a470caf39c5e44bb1e0a5544c01f16ee5bb3` 获取实际编译源,或检出发行标签获取验包记录。独立HTTPS检出1041个跟踪文件、403个构建输入核对通过,工程字典仅排序差异;Git完整性通过,无LFS/子模块,未在检出中重编,临时检出已清理。[恢复核验](verification/Recovery1.22.4.json)。 diff --git a/research/ControlsSync-20261117.md b/research/ControlsSync-20261117.md index 0f44269..0b9490a 100644 --- a/research/ControlsSync-20261117.md +++ b/research/ControlsSync-20261117.md @@ -42,3 +42,9 @@ FCP12.4正式142:LUT新增模块及37%/62%双向刷新通过;合成运动片 ## 正式PKG PKG公证9ee8e167-6d03-4c1a-93bc-efab671754af Accepted,Installer签名、票据、Gatekeeper与20项展开验包通过;44585448字节,SHA-256 194c636978289dda73860a9409401f3063d153c6e3fdafdfc98bc52c760a2a2a。实际载荷来源为已验收正式142,编译节点a1eb334;本轮未重复运行系统安装器。待Release上传与完整下载校验。 + +## 最终交付 + +Release450/附件79已发布;发布前与发布后完整下载均为44,585,448字节、SHA-256 194c636978289dda73860a9409401f3063d153c6e3fdafdfc98bc52c760a2a2a。标签v1.22.5-controls-sync-20261117固定a20e734f6691313771df67d91402c200fec0b401,实际编译源a1eb334不变。独立HTTPS恢复检出、Git完整性与构建输入核对完成,无LFS/子模块,未重新编译。临时克隆/旧APP/提交ZIP清理;正式与历史PKG及QA库保留。详细结果见verification/Release1.22.5.json、Recovery1.22.5.json、Cleanup1.22.5.json。 + +最终交付保留明确验收缺口:OSC物理拖动/吸管和提示2秒到期未直接GUI验证,用户原始复杂运动需复测;不把1113项原生回归或100帧合成测试扩大为全部素材通过。 diff --git a/verification/Cleanup1.22.5.json b/verification/Cleanup1.22.5.json new file mode 100644 index 0000000..1a3d378 --- /dev/null +++ b/verification/Cleanup1.22.5.json @@ -0,0 +1,34 @@ +{ + "passResult": true, + "date": "2026-11-16T17:15:13.369780+00:00", + "product": "com.dayu.color", + "version": "1.22.5", + "build": 142, + "searchedRoots": [ + "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color", + "/Volumes/备份/大鱼调色", + "/Library/Plug-Ins/FxPlug", + "/Applications", + "/Users/mac/Library/Plug-Ins/FxPlug" + ], + "matchingOuterApps": [ + { + "path": "/Library/Plug-Ins/FxPlug/大鱼调色.app", + "version": "1.22.5", + "build": "142" + } + ], + "pluginKit": " com.dayu.color.XPC(1.1)\n\t Path = /Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n\t UUID = 281BA504-21BF-48C3-B003-13F35E34E8C2\n\t Timestamp = 2026-11-16 16:52:32 +0000\n\t Parent Bundle = /Library/Plug-Ins/FxPlug/大鱼调色.app\n\t Display Name = 大鱼调色\n\t Short Name = 大鱼调色 XPC Service\n\t Parent Name = 大鱼调色\n\t Platform = macOS\n\n (1 plug-in)\n", + "previous141RollbackRemoved": true, + "buildAppAndSubmissionZipRemovedByDeliveryTool": true, + "recoveryCloneRemoved": true, + "temporaryPackageStageRemoved": true, + "productDeliveryLockReleased": true, + "preserved": [ + "Current signed notarizedPKG", + "HistoricalPKGs", + "Source and project", + "QA library with user media, synthetic fixtures and native acceptance presets" + ], + "scope": "Targeted product inventory in listed roots; no whole-machine uniqueness claim. Existing sources, user media and historical packages retained." +} diff --git a/verification/Recovery1.22.5.json b/verification/Recovery1.22.5.json index fe2fb42..a01e4cf 100644 --- a/verification/Recovery1.22.5.json +++ b/verification/Recovery1.22.5.json @@ -13,6 +13,15 @@ "LFSObjectsRequired": false, "submodules": false, "remoteRebuildPerformed": false, - "temporaryCloneRemoved": false, - "scope": "Compiled-source checkout retrieved via HTTPS, all versioned source/build/template/tool inputs compared with actual working source; pbxproj canonical property lists equal. Release-tag verification and clone cleanup pending." + "temporaryCloneRemoved": true, + "scope": "Independent HTTPS checkout of compiled source and final release tag; every release file present, clean tracked checkout and Git integrity checked. Working source/build/template inputs match compiled source, except equivalent pbxproj ordering. Release.json was regenerated after tag for this publication and is preserved in subsequent main evidence commit. No clean rebuild performed.", + "tag": "v1.22.5-controls-sync-20261117", + "releaseCommit": "a20e734f6691313771df67d91402c200fec0b401", + "trackedFilesInRelease": 1060, + "releaseFilesByteMatchedToCurrent": 1058, + "postTagGeneratedRecordDifferences": [ + "verification/Release.json" + ], + "packageSHA256": "194c636978289dda73860a9409401f3063d153c6e3fdafdfc98bc52c760a2a2a", + "packageBytes": 44585448 } diff --git a/verification/Release.json b/verification/Release.json index 456e9c9..7be911c 100644 --- a/verification/Release.json +++ b/verification/Release.json @@ -3,15 +3,15 @@ "repository": "dayu/dayu-color", "repositoryID": 52, "private": false, - "tag": "v1.22.4-dji-gamut-20261116", - "releaseCommit": "c66a9ba9b683c66d59676111916d7d81da4ab8c7", - "releaseID": 449, - "releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.4-dji-gamut-20261116", - "assetID": 78, - "assetName": "大鱼调色-1.22.4.pkg", - "downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.22.4-dji-gamut-20261116/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.22.4.pkg", - "bytes": 44582577, - "sha256": "5bdee54986925565761d6a6ddd20c16047fc573f99564c9232a9e6afb410d992", + "tag": "v1.22.5-controls-sync-20261117", + "releaseCommit": "a20e734f6691313771df67d91402c200fec0b401", + "releaseID": 450, + "releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.5-controls-sync-20261117", + "assetID": 79, + "assetName": "大鱼调色-1.22.5.pkg", + "downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.22.5-controls-sync-20261117/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.22.5.pkg", + "bytes": 44585448, + "sha256": "194c636978289dda73860a9409401f3063d153c6e3fdafdfc98bc52c760a2a2a", "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/Release1.22.5.json b/verification/Release1.22.5.json new file mode 100644 index 0000000..7be911c --- /dev/null +++ b/verification/Release1.22.5.json @@ -0,0 +1,18 @@ +{ + "passResult": true, + "repository": "dayu/dayu-color", + "repositoryID": 52, + "private": false, + "tag": "v1.22.5-controls-sync-20261117", + "releaseCommit": "a20e734f6691313771df67d91402c200fec0b401", + "releaseID": 450, + "releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.5-controls-sync-20261117", + "assetID": 79, + "assetName": "大鱼调色-1.22.5.pkg", + "downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.22.5-controls-sync-20261117/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.22.5.pkg", + "bytes": 44585448, + "sha256": "194c636978289dda73860a9409401f3063d153c6e3fdafdfc98bc52c760a2a2a", + "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.5.json b/verification/ReleaseInitialPublish1.22.5.json new file mode 100644 index 0000000..9e2eb15 --- /dev/null +++ b/verification/ReleaseInitialPublish1.22.5.json @@ -0,0 +1,18 @@ +{ + "passResult": true, + "repository": "dayu/dayu-color", + "repositoryID": 52, + "private": false, + "tag": "v1.22.5-controls-sync-20261117", + "releaseCommit": "a20e734f6691313771df67d91402c200fec0b401", + "releaseID": 450, + "releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.5-controls-sync-20261117", + "assetID": 79, + "assetName": "大鱼调色-1.22.5.pkg", + "downloadURL": "https://dayu.media/git/attachments/97201bb4-d56e-492f-bb06-85307e78bd6f", + "bytes": 44585448, + "sha256": "194c636978289dda73860a9409401f3063d153c6e3fdafdfc98bc52c760a2a2a", + "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 4fec839..d8c984c 100644 --- a/开发交接.md +++ b/开发交接.md @@ -2,20 +2,28 @@ 更新于2026-11-17(Asia/Shanghai)。 -## 当前目标与进展 +## 当前版本与目标 -1.22.5(142)已完成Release编译、两轮1113项自检(构建和正式安装)、Developer ID签名、公证Accepted、票据及正式位置安装;FCP宿主验收已按范围完成,正式PKG公证9ee8e167-6d03-4c1a-93bc-efab671754af已Accepted,20项验包通过,Release待上传。实际编译 `a1eb334840e1af285e878e7c094b06aaf01cba49`,Apple提交 `f3c42a54-a85b-4f7b-a569-14fa34b80f5c`。[本轮记录](research/ControlsSync-20261117.md) · [正式身份](verification/InstalledIdentity1.22.5.json) · [自检](verification/InstalledSelfTest1.22.5.json)。 +正式安装已更新为 **1.22.5(142)**,路径 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主ID `com.dayu.color`、服务 `com.dayu.color.XPC`、团队B3W25FX5H5。Release构建、Developer ID签名、Apple公证Accepted、票据、Gatekeeper、正式安装及启动完成;构建/正式安装各1113项自检通过。[安装](verification/Delivery1.22.5.json) · [身份](verification/InstalledIdentity1.22.5.json) · [本轮详细记录](research/ControlsSync-20261117.md)。 -FCP12.4正式安装实测通过新增LUT模块、37%/62%双向刷新、100帧合成运动蒙版保形、马赛克关联及跟踪编辑器、冷启动完整工具文档持久化。最大相对宽高比漂移7.8537e-8。物理OSC拖动/吸管与2秒提示消失未直接验收,详见[宿主报告](verification/HostControlsSync1.22.5.json)。已清理141回滚APP并释放宿主验收锁,PKG完成并释放产品锁。 +本轮修复:同帧源时钟相位导致曲线/畸变/白平衡画布写入被拒;面板模型事件及动态模块布局刷新;LUT浏览器五位置强度;马赛克共享蒙版与跟踪入口;巨大常驻状态框改紧凑半透明、点击穿透、2秒收起提示;Vision运动整体约束为平移/旋转/等比缩放,保持用户绘制的蒙版形状。 -## 正式基线与工程入口 +## 已验证范围与缺口 -接手正式基线1.22.4(141),当前已替换为1.22.5(142),路径 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主ID `com.dayu.color`,服务 `com.dayu.color.XPC`,团队B3W25FX5H5。141签名、公证、票据、宿主及PKG Release已完成。[上一轮完整交接](research/HandoffHistory-20261117-before-controls-sync.md) · [恢复](RECOVERY.md)。 +FCP12.4正式142实测:控制面板新增风格LUT模块后检查器出现同一模块,控制面板37%→检查器37%,检查器62%→控制面板62%。100帧合成运动正方形蒙版跟踪完成,最大相对宽高比漂移7.8537e-8;应用马赛克后100键和关联保留,选中蒙版可继续编辑跟踪。FCP及XPC退出后冷重开,保存预设的整个工具文档一致。[宿主范围](verification/HostControlsSync1.22.5.json) · [轨迹数据](verification/HostShapeTracking1.22.5.json) · [Vision回归](verification/SimilarityTracking1.22.5.json)。 -工程 `/Volumes/备份/大鱼调色/大鱼调色`,main;远程 `https://dayu.media/git/dayu/dayu-color.git`,接手SHA `3a7985195569b9def93aa35912cc5fbd6f5de41a`,已与远端核对。接手时唯一未提交改动为Xcode工程引用排序,保留,不混入当前修复。无其他活跃产品构建聊天。缓存 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color`;使用Xcode27.2/FxPlug4.3.5及当前MacOSX.sdk。正式交付使用tools/deliver.py,包使用Packaging/build_pkg.py和publish_release.py;遵循产品锁及仓库锁。 +**物理OSC拖动/画面吸管、提示2秒消失未完成直接GUI验收**:自动化坐标输入未触发OSC回调,不能据此判定产品通过或失败。同帧写入及下一帧拒绝有原生桥接回归。复杂真实素材、遮挡、透视、Motion/HDR/变速及真实DJI色彩未测;合成100帧不代表任意素材。关闭重开面板会默认选首工具,重新选中蒙版可见跟踪编辑器。既有图章“最后可信帧”在FCP12.4自动跳转仍需手动定位。 -## 接手第一步与未完成项 +## 源码、发行与恢复 -先读本轮记录并检查工作区/远端。APP交付与有范围的FCP验收已完成;PKG公证及验包完成;继续版本标签、Release及下载校验。独立HTTPS克隆1050个编译节点文件、Git完整性和构建输入核对通过,尚待发行标签核对与临时克隆清理。不得把自动诊断等同用户素材实测。 +工程 `/Volumes/备份/大鱼调色/大鱼调色`,分支main,远程 `https://dayu.media/git/dayu/dayu-color.git`。实际编译源 `a1eb334840e1af285e878e7c094b06aaf01cba49`;发行标签 `v1.22.5-controls-sync-20261117` → `a20e734f6691313771df67d91402c200fec0b401` 已推送回读,标签不随后续证据提交移动。接手遗留Xcode工程引用排序改动保留、未提交。 -FCP QA库包含用户真实媒体,不上传/清理整库。用户已授权任务进程及FCP/Motion强退。既有图章最后可信帧自动跳转限制、Motion/HDR/真实DJI色彩未测仍保留。文章15792仍1.22.2(137),更新通道仍1.21.8(126);本轮无NAS生产变更。 +[Release450](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.5-controls-sync-20261117),附件79;正式包 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.22.5.pkg`,44,585,448字节,SHA-256 `194c636978289dda73860a9409401f3063d153c6e3fdafdfc98bc52c760a2a2a`。PKG公证 `9ee8e167-6d03-4c1a-93bc-efab671754af` Accepted,20项展开验包通过;发布前及发布后完整下载均匹配。本轮未再次运行系统安装器。[验包](verification/Package1.22.5.json) · [发布后下载](verification/Release1.22.5.json) · [恢复步骤](RECOVERY.md)。 + +独立HTTPS克隆检出1050个编译节点文件和发行标签全部文件、Git完整性、409个构建输入(工程字典仅排序等价)核对通过,无LFS/子模块,未在恢复目录重编。旧141回滚APP、构建APP、公证ZIP、临时验包和恢复目录已清理;保留正式/历史PKG、源码、QA媒体与库,未宣称全盘仅一个副本。[恢复核验](verification/Recovery1.22.5.json) · [清理](verification/Cleanup1.22.5.json)。 + +## 继续工作 + +优先用用户原始素材手动复测曲线松手、畸变拖动和白平衡吸管,以及2秒提示,再扩大复杂跟踪素材范围。FCP QA库包含用户真实媒体,勿上传或清理整库。缓存 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color`;Xcode27.2、FxPlug4.3.5、当前MacOSX.sdk;复用tools/deliver.py、Packaging/build_pkg.py与publish_release.py及产品/仓库锁。 + +本轮无NAS生产改动,文章15792仍1.22.2(137),主APP更新通道仍1.21.8(126)。[上一轮完整交接](research/HandoffHistory-20261117-before-controls-sync.md)。