From 7113e49fbbf754f2aefa764394df322b63a35cb6 Mon Sep 17 00:00:00 2001 From: mac Date: Mon, 2 Nov 2026 16:21:01 +0800 Subject: [PATCH] Verify main app registration, visible three-second exit and document final UI scope --- README.md | 4 +- RECOVERY.md | 10 ++- research/MainApp1.6.1.md | 32 +++++---- verification/Delivery.json | 15 ++-- verification/InstalledSelfTest.json | 8 +-- verification/MainApp1.6.1.json | 107 ++++++++++++++++++++++++++++ 大鱼调色主APP开发交接.md | 2 + 7 files changed, 147 insertions(+), 31 deletions(-) create mode 100644 verification/MainApp1.6.1.json diff --git a/README.md b/README.md index 9fb300c..c9a4588 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # 大鱼调色 -原生 FxPlug 4 调色器,当前正式安装版本 **1.6.0(39)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。 +原生 FxPlug 4 调色器,当前正式安装版本 **1.6.1(44)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。 交接与恢复入口:[大鱼调色FxPlug4交接.md](大鱼调色FxPlug4交接.md)。 -下一阶段:[主 APP 开发交接](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色主APP开发交接.md),面向自动更新、登录验证及账号/版本界面,含现有生产接口与实现边界。 +主 APP 已改为深色产品介绍界面,发布地址置顶;启动自动注册并回读系统登记,成功后在状态卡显示3秒倒计时退出。查看介绍或打开FCP检查可保留窗口;FCP中的实际效果由用户确认。外层沙盒按用户要求关闭,登录、授权、加密、自动更新及后端暂未接入。见[本轮说明](research/MainApp1.6.1.md)与[主APP验证](verification/MainApp1.6.1.json);后续账号工作仍参考[原交接](大鱼调色主APP开发交接.md)。 ## 胶片模拟与通道混合器 diff --git a/RECOVERY.md b/RECOVERY.md index aa98a02..64c5af9 100644 --- a/RECOVERY.md +++ b/RECOVERY.md @@ -2,7 +2,15 @@ 当前交接:[大鱼调色FxPlug4交接.md](大鱼调色FxPlug4交接.md)。 -## 当前1.6.0(39):八种印片、低版本模板与默认映射 +## 当前1.6.1(44):主 APP 界面与自动注册 + +远程 https://dayu.media/git/dayu/dayu-color.git ,main。实际编译源码 `90d6022520c59ea34f42b511daee85ac2936cfd9`,签名团队B3W25FX5H5,唯一正式位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`。主/服务Bundle ID维持com.dayu.color、com.dayu.color.XPC,Apple Silicon / macOS14.6或更新。Xcode27.1、FxPlugSDK4.3.5;无LFS或子模块。 + +主界面、显式注册、精确路径回读和3秒倒计时通过;独立用户FCP确认单独记录,不把登记当作渲染验收。调色/Metal/模板未改,395项正式原生检查通过。证书、私钥和公证凭据需独立恢复,不在Git中;准备本机签名身份与profile后用tools/deliver.py进行Release构建和正式交付。 + +通过克隆仓库并 `git switch --detach 90d6022520c59ea34f42b511daee85ac2936cfd9` 可恢复实际编译节点;`verification/Delivery.json`、MainApp1.6.1.json、MainAppRecovery1.6.1.json分别记录安装、UI/登记及远端恢复。最终版本标签、PKG和Release以本轮后续交付记录为准。 + +## 历史1.6.0(39):八种印片、低版本模板与默认映射 远程 `https://dayu.media/git/dayu/dayu-color.git`,main;发行标签 `v1.6.0-print-looks-20261102`。APP实际编译源码 `e5affd3f097fc96f87f41be8e1a3f131ed01daeb`,公证 `5d74c04c-8a30-47e9-822d-4f616dfdee56` Accepted。APP和内部XPC固定ID、唯一正式路径与签名团队不变。正式395项自检、独立原版136项印片对照、FCP12.4八外观/叠层/蒙版100键跟踪/三个完整导出与冷重开通过,见 `verification/HostPrintLooks1.6.0.json`。 diff --git a/research/MainApp1.6.1.md b/research/MainApp1.6.1.md index 99e2e32..3ac1fb3 100644 --- a/research/MainApp1.6.1.md +++ b/research/MainApp1.6.1.md @@ -1,29 +1,31 @@ -# 主 APP 1.6.1(44)改造 +# 主 APP 1.6.1(44) -本轮范围:仅主 APP 产品介绍、插件自动检查/提交注册、成功退出。不加入登录、授权、加密、自动更新或后端接口;以本轮用户说明为准,不执行旧交接中的下一阶段账号计划。 +本轮只改现有主 APP 的产品介绍、系统插件注册及退出体验。按用户最新说明,发布地址位于最顶部,关闭外层 APP 沙盒;登录、授权、加密、自动更新及后端均未接入。调色、渲染、参数、Uniform、预设、Metal 和 FCP 模板保持原样。 -## 界面合同 +## 最终界面与交互 -延续现有 Objective-C/AppKit、Nib 连线和手动内存管理。使用 standard 档原生交互;静态深色渐变、圆角彩色卡片与胶囊按钮呼应用户参考图,不引入常驻动画、模糊或新的渲染依赖。 +沿用 Objective-C/AppKit、Nib 连线和手动内存管理。采用 standard 档原生交互,深色静态渐变、圆角彩色卡片和胶囊按钮呼应参考图。比较单列介绍、左右双栏、状态+使用指引+双列特色三种结构后,选择第三种:顶部可点击的发布地址 https://dayu.media,随后产品名称/版本、插件注册与宿主检查,最后四张完整调色、LUT、胶片、蒙版叠层特色卡。默认920×850,最小760×620,纵向滚动。 -比较了单列介绍、左右双栏状态+功能、状态+使用指引+双列特色卡三种结构,选择第三种:优先显示注册与宿主入口,接着完整调色、LUT、胶片、蒙版叠层,顶部首先显示可点击的发布地址 https://dayu.media。窗口默认920×850,最小760×620,纵向滚动;介绍可通过按钮/⌘I保留,菜单⌘R重试、⌘W关闭、⌘Q退出。保留可访问的原生按钮、文本、焦点环和状态播报;表面不透明,增强对比度加粗边框。 +每次启动:检查内嵌组件 → 提交注册 → 系统回读确认。成功后在注册卡片内清晰显示3→2→1秒倒计时并退出,取消了旧版底部难以看到的提示。查看介绍/⌘I取消本次自动退出;⌘R可重新检查,工作期间防止重复提交;⌘W关闭窗口、⌘Q退出。失败时保留窗口和重试入口。 -状态唯一归属 AppDelegate:checking → registering → ready/failed。所有 PluginKit 操作在后台队列;主线程负责状态和窗口。重复检查期间禁用重入。每次打开都提交内嵌组件注册;先验证内嵌组件Bundle ID、当前构建号和FxPlug登记协议1.1,提交精确路径的注册;查询可用时核对实际路径。若系统明确拒绝沙盒查询,则使用成功的pkd注册应答,不将查询受限误报为注册失败。其他查询/提交失败仍不放行。成功默认3秒后退出;查看介绍取消本次倒计时;失败保留窗口和重试。关闭窗口退出,无后台常驻。 +“打开FCP检查”会保留本窗口,并按Bundle ID打开Final Cut Pro。用户在FCP内将大鱼调色应用到片段,确认画面与调节正常后,可点击“已确认正常,退出”。系统注册成功与宿主功能确认分开记录;自动化不代替用户点击确认。Motion也有明确入口,覆盖正式及历史两种宿主Bundle ID。 -运行诊断仅记录本机插件登记和版本,写入应用 Application Support/com.dayu.color/Registration.json;不联网、不含凭据。--show-introduction 是保留介绍的启动方式,仍运行真实注册流程。 +## 系统登记与权限 -## 参考来源 +外层AppDelegate拥有唯一注册状态:checking → registering → ready/failed。PluginKit操作在后台队列,UI在主线程。先验证精确内嵌组件的Bundle ID、当前构建号、FxPlug协议及登记版本1.1,再向/usr/bin/pluginkit提交独立路径参数;查询返回的标识/协议/完整路径必须匹配。1.1是登记协议版本,不是APP版本。不使用shell字符串、不需管理员提权、不改变其他插件的用户选择。 -用户指定仓库 https://dayu.media/git/dayu/fcpx-qwen3-asr.git ,只读参考提交113069c74aff935db2082b5bcd8e1aa47fe1fbf2的ContentView.swift和LicenseViewModel.swift。借鉴深色渐变、卡片配色和操作层级;未复用会员、识别计费、账号或扩展业务代码。 +40/41候选发现沙盒允许注册却拒绝CLI的PKDiscoverAll查询,即使不带-A也会失败,不能把它解释为“插件未注册”。用户随后明确允许关闭沙盒。最终移除主APP的app-sandbox entitlement,查询可直接回读;不采用42候选的应答降级。内嵌服务原本未启用该沙盒,Developer ID、Hardened Runtime、可信时间戳、公证、票据及Gatekeeper要求保持。 -## 保留范围 +本机诊断写入 ~/Library/Application Support/com.dayu.color/Registration.json,记录登记应答、实际路径、版本、进程、退出原因及用户确认,不联网、不含凭据。--show-introduction可保留介绍,仍执行真实注册流程。 -主 Bundle ID com.dayu.color,服务com.dayu.color.XPC,唯一正式路径/Library/Plug-Ins/FxPlug/大鱼调色.app。主 APP/内嵌服务版本同步1.6.1(44)。调色/渲染、Uniform、参数、预设、Metal、模板无改动。现有自检及正式安装、宿主、打包/Release证据在verification记录;本文件不预先宣称未执行的验证通过。 +## 视觉与无障碍 -首轮正式40版发现沙盒查询-A会返回PKDiscoverAll未授权,虽然-a注册已经成功。41版移除-A/-D,仅查询自身组件,不取消沙盒、不新增权限。注册标记+后的可变空白单独归一化;发布地址按用户补充移到页面最顶部。40版保留为问题定位记录,不作为最终发行包。 +使用原生按钮、可访问文本、键盘快捷键、焦点环和状态播报。不使用透明采样、模糊、着色器或装饰性动画;增强对比度加粗边界,进度采用系统控件。实际测试、未覆盖的VoiceOver/系统显示选项及暂定评分以verification/MainApp1.6.1.json为准,不仅凭截图宣称90分质量。 -41版实测证明系统CLI即使不带-A,查询也请求PKDiscoverAll;沙盒拒绝查询但允许显式注册。最终42版分别记录discoveryVerified、discoveryRestricted、submissionAccepted与confirmationMethod。只有明确的查询权限错误且精确组件验证/注册应答成功时,使用pkd应答判定注册成功;没有给沙盒增加权限,也没有把未知错误一律当成功。交付时由外部PluginKit回读和删除登记后重建的实际结果独立验证。 +## 来源、身份与交付 -最终范围更新:用户明确允许关闭沙盒。43版移除外层APP的app-sandbox entitlement,Hardened Runtime、Developer ID、公证等交付要求保持;内嵌服务原本未启用该沙盒。恢复严格的系统登记回读,不再使用42版候选的pkd应答降级。主界面“打开FCP检查”会保留窗口,由用户在宿主确认画面及调节后点击“已确认正常,退出”。该确认写入本机诊断,自动验收不代替用户点击;系统注册成功与宿主用户确认分开。默认启动仍在注册成功3秒后退出。42版中断等待后未安装、不发布;40/41为定位问题的候选,不发布。 +只读参考用户指定的 https://dayu.media/git/dayu/fcpx-qwen3-asr.git ,提交113069c74aff935db2082b5bcd8e1aa47fe1fbf2中的ContentView.swift、LicenseViewModel.swift;借鉴配色和层级,没有引入其会员、计费或识别业务代码。 -用户最终补充:自动退出改为3秒,倒计时从底部移到注册卡片内,使用15pt半粗体、两行提示,确保无需滚动即可看到3→2→1;查看介绍可取消退出。最终44版交付;43版仅用于注册与主界面验证,不发布安装包。 +唯一正式路径 /Library/Plug-Ins/FxPlug/大鱼调色.app;主/服务Bundle ID为com.dayu.color、com.dayu.color.XPC,版本同步1.6.1(44)。实际编译源码90d6022520c59ea34f42b511daee85ac2936cfd9。40/41/43是本轮定位或界面候选,42未安装,均不发布安装包;历史已发布版本及用户验收媒体/预设保留。 + +APP签名、公证、票据、正式安装、自检见verification/Delivery.json和InstalledSelfTest.json;主界面/注册验证见MainApp1.6.1.json;安装包、Release及独立恢复见Package.json、Release.json和MainAppRecovery1.6.1.json。以各记录的实际状态为准,不将系统登记等同于用户已确认宿主功能。 diff --git a/verification/Delivery.json b/verification/Delivery.json index 4081d63..d670875 100644 --- a/verification/Delivery.json +++ b/verification/Delivery.json @@ -1,19 +1,16 @@ { - "status": "verified", + "status": "installed-awaiting-host-verification", "path": "/Library/Plug-Ins/FxPlug/大鱼调色.app", "bundleID": "com.dayu.color", - "version": "1.6.0", - "build": "39", + "version": "1.6.1", + "build": "44", "team": "B3W25FX5H5", - "notaryID": "5d74c04c-8a30-47e9-822d-4f616dfdee56", + "notaryID": "23d7b69c-5585-435d-ad07-faee061e0ccb", "notaryStatus": "Accepted", "gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID", - "sourceCommit": "e5affd3f097fc96f87f41be8e1a3f131ed01daeb", + "sourceCommit": "90d6022520c59ea34f42b511daee85ac2936cfd9", "templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef", "templateSHA256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250", "shaderSHA256": "6ec98b85aeb841f9988a4b66e3e5fba9e34d5ab3d7542c9205b0480c77f9ac6d", - "hostVerification": "verification/HostPrintLooks1.6.0.json", - "additionalHostVerification": "verification/HostPrimaryDefaults1.6.0.json", - "nativeChecks": 395, - "printReferenceChecks": 136 + "previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-64318d3d286948999f05720142bd99c1.app" } diff --git a/verification/InstalledSelfTest.json b/verification/InstalledSelfTest.json index 6743aa9..15be521 100644 --- a/verification/InstalledSelfTest.json +++ b/verification/InstalledSelfTest.json @@ -12,7 +12,7 @@ "error": "未提供错误信息", "name": "runtime-directory", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/81DF4064-2BBA-4E89-AC85-020D7F1270BC" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/ED00D426-57B3-45AD-86FA-0A5A8B38E1F2" }, { "descriptors": 278, @@ -820,7 +820,7 @@ "error": "未提供错误信息", "name": "renderer-export-33cube", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/81DF4064-2BBA-4E89-AC85-020D7F1270BC/diagnostic-export.cube" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/ED00D426-57B3-45AD-86FA-0A5A8B38E1F2/diagnostic-export.cube" }, { "bytes": 1186074, @@ -840,7 +840,7 @@ }, { "heartbeats": 0, - "maximumGapMS": 96.47729154676199, + "maximumGapMS": 92.54920833333813, "name": "external-activation-main-loop-responsive", "pass": true }, @@ -2067,6 +2067,6 @@ "pass": true } ], - "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/81DF4064-2BBA-4E89-AC85-020D7F1270BC", + "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/ED00D426-57B3-45AD-86FA-0A5A8B38E1F2", "scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document." } diff --git a/verification/MainApp1.6.1.json b/verification/MainApp1.6.1.json new file mode 100644 index 0000000..344973f --- /dev/null +++ b/verification/MainApp1.6.1.json @@ -0,0 +1,107 @@ +{ + "passResult": true, + "version": "1.6.1", + "build": "44", + "formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app", + "compiledSource": "90d6022520c59ea34f42b511daee85ac2936cfd9", + "existingRegistrationStartup": { + "before": { + "output": " com.dayu.color.XPC(1.1)\tB4382CC6-0A29-4014-95DF-17FF12BD426A\t2026-11-02 08:19:21 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)\n", + "code": 0 + }, + "submissionAccepted": true, + "submission": { + "output": "", + "code": 0 + }, + "plugin": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit", + "version": "1.6.1", + "terminationReason": "registration-succeeded", + "executable": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/MacOS/大鱼调色", + "registered": true, + "hostVerification": "awaiting-user-confirmation", + "bundleID": "com.dayu.color", + "confirmationMethod": "exact-path-discovery", + "after": { + "output": " com.dayu.color.XPC(1.1)\t46C65B43-DF7C-4DEF-A159-4C46E0C6F2E3\t2026-11-02 08:19:22 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)\n", + "code": 0 + }, + "pid": 1957, + "discoveryVerified": true, + "status": "registered", + "build": "44" + }, + "sandboxDisabled": true, + "nativeChecks": 395, + "hostVerification": "awaiting-user-confirmation", + "registryAfterRemoval": " (no matches)\n", + "externalRegistryAfterRepair": " com.dayu.color.XPC(1.1)\t7594B515-4788-4BD2-8F31-DA38C23CFF88\t2026-11-02 08:20:00 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)\n", + "keyboardShortcuts": [ + "Command-I preserved introduction", + "Command-R repeated three times without re-entry failure" + ], + "visualReview": [ + "top publication link is clickable", + "successful registration state matches registry", + "four feature cards and FCP confirmation controls visible" + ], + "uiProfile": "standard", + "swiftUIAudit": "not applicable: Objective-C/AppKit; audit reports no Swift files", + "unverified": [ + "Actual user FCP confirmation", + "VoiceOver spoken reading and system accessibility display settings", + "Full runtime resize matrix" + ], + "appleFidelityProvisional": { + "total": 84, + "platform": 14, + "layout": 13, + "semantics": 13, + "interaction": 18, + "motion": 13, + "accessibility": 5, + "implementation": 8, + "evidenceCap": "Assistive technology and reduced-effects settings not fully exercised; no 90-point quality claim." + }, + "countdownSeconds": 3, + "countdownVisibleInRegistrationCard": true, + "automaticExitVerified": true, + "automaticExitProcessAbsent": true, + "registrationRepairPreviousBuild": "43: same registration implementation; only countdown/UI placement changed in44", + "priorBuild43MissingRegistrationEvidence": "Missing registration was repaired and externally verified on43 before countdown-only change.", + "missingRegistrationRepaired": { + "before": { + "output": " (no matches)\n", + "code": 0 + }, + "submissionAccepted": true, + "submission": { + "output": "", + "code": 0 + }, + "plugin": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit", + "version": "1.6.1", + "executable": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/MacOS/大鱼调色", + "registered": true, + "hostVerification": "awaiting-user-confirmation", + "bundleID": "com.dayu.color", + "confirmationMethod": "exact-path-discovery", + "after": { + "output": " com.dayu.color.XPC(1.1)\t7594B515-4788-4BD2-8F31-DA38C23CFF88\t2026-11-02 08:20:00 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)\n", + "code": 0 + }, + "pid": 2000, + "discoveryVerified": true, + "status": "registered", + "build": "44" + }, + "finalEntitlements": {}, + "actualProcessPaths": [ + "2000 /Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/MacOS/大鱼调色", + "2040 /Applications/Final Cut Pro.app/Contents/MacOS/Final Cut Pro", + "2048 /Library/Plug-Ins/FxPlug/大鱼调色盘.app/Contents/PlugIns/DayuColorService.pluginkit/Contents/MacOS/DayuColorService", + "2050 /Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/MacOS/大鱼调色 XPC Service" + ], + "shaderSHA256": "6ec98b85aeb841f9988a4b66e3e5fba9e34d5ab3d7542c9205b0480c77f9ac6d", + "renderingSourceUnchanged": true +} diff --git a/大鱼调色主APP开发交接.md b/大鱼调色主APP开发交接.md index 5a7ff44..7311eba 100644 --- a/大鱼调色主APP开发交接.md +++ b/大鱼调色主APP开发交接.md @@ -1,5 +1,7 @@ # 大鱼调色主 APP 开发交接 +> 2026-11-02接续:主APP UI与自动注册已在1.6.1(44)实现,发布地址置顶、注册成功3秒倒计时、FCP由用户确认,外层沙盒按用户明确要求关闭。登录/授权/加密/更新及后端未实现;本文原接口盘点仍作为后续参考。最新行为见[本轮说明](research/MainApp1.6.1.md),交付状态见verification/Delivery.json与MainApp1.6.1.json。 + 交接日期:2026-11-02(Asia/Shanghai)。下一阶段目标:优化现有主 APP,加入自动更新、登录验证及相应的账号与版本管理界面。本次只整理交接和只读盘点,尚未实现这些功能,未修改正式 APP、后台源码、账号绑定或线上更新清单。 ## 1. 接手位置与可恢复基线