From 42d130c8117ce9b815acb568e095a607b63c24ff Mon Sep 17 00:00:00 2001 From: mac Date: Wed, 11 Nov 2026 18:47:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9C=A8=E7=BA=BF=E4=B8=8E?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=9D=A5=E6=BA=90=E5=88=87=E6=8D=A2=E5=9B=9E?= =?UTF-8?q?=E5=BD=92=EF=BC=8C=E7=A1=AE=E5=AE=9A=201.22.0=20=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=20129?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Packaging/Release-1.22.0.md | 2 +- research/OnlineLUTIntegration-20261111.md | 2 ++ tools/verify_online_luts.mm | 6 +++++- verification/SupersededOnlineLUTBuild128.json | 14 ++++++++++++++ 大鱼调色/Plugin/DYLUTBrowser.mm | 4 +++- 大鱼调色/Plugin/Info.plist | 2 +- 大鱼调色/Wrapper Application/Info.plist | 2 +- 开发交接.md | 2 +- 8 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 verification/SupersededOnlineLUTBuild128.json diff --git a/Packaging/Release-1.22.0.md b/Packaging/Release-1.22.0.md index e5ef00f..8886be6 100644 --- a/Packaging/Release-1.22.0.md +++ b/Packaging/Release-1.22.0.md @@ -1,4 +1,4 @@ -大鱼调色 1.22.0(128)增加在线 LUT 库。 +大鱼调色 1.22.0(129)增加在线 LUT 库。 - 主 APP 增加微信登录、刷新权限和退出登录。购买过文章 14421、15792 中任意一个,或当前为有效会员,即可使用全部已发布在线 LUT。 - 插件 LUT 浏览器增加在线来源、分类、分页和搜索。点击 LUT 后下载并检查文件大小、SHA-256 和 Cube 内容,保存到本地库后应用;相同文件重复下载复用已有副本。 diff --git a/research/OnlineLUTIntegration-20261111.md b/research/OnlineLUTIntegration-20261111.md index b6054ca..b13de87 100644 --- a/research/OnlineLUTIntegration-20261111.md +++ b/research/OnlineLUTIntegration-20261111.md @@ -25,3 +25,5 @@ 第二阶段:PHP/GD 权限与渲染合约 36 项、原生 AppKit 在线浏览器与导入合约 36 项通过;原生测试模拟网络应答,未使用用户凭据或上传真实时间线帧。已从现有公开接口盘点 1,233 个发布 LUT 和 17 个分类。准备 1.22.0(127)正式交付,后台部署前检查点包含专用部署脚本及安装说明。 部署与修正:两个新增生产文件已按映射部署并核对内容;线上 6 项未登录/伪造凭据检查通过,本地浏览器 40 项回归通过。127 候选 APP 已获 Apple Accepted 并完成票据验证,安装后的 CLI 检查期间停止交付,未进行用户界面验收或发布。保留 126 恢复 APP;127 的来源、公证和备份见 `verification/SupersededOnlineLUTBuild127.json`。补齐清除/本地选择时的在线选中状态复位,最终候选改为 1.22.0(128)。交付脚本安装后校验区在键盘中断时也执行回滚。 + +最终 UI 回归补充了在线比较标题使用 LUT 名称、来源切回本地时恢复打开文件夹按钮,以及清除和本地选择后的选中状态。128 候选在公证等待阶段停止,未安装;公证 ID 与来源见 `verification/SupersededOnlineLUTBuild128.json`,继续只读查询该提交,不重传相同产物。最终候选更新为 1.22.0(129)。 diff --git a/tools/verify_online_luts.mm b/tools/verify_online_luts.mm index 732be19..e25739c 100644 --- a/tools/verify_online_luts.mm +++ b/tools/verify_online_luts.mm @@ -17,6 +17,7 @@ - (void)clearSelection:(id)sender; - (void)rebuildGrid; - (void)layoutBrowser; +- (void)refreshComparison; @end static NSMutableArray *checks,*requests; static NSData *cubeData,*renderPNG; @@ -68,7 +69,7 @@ int main(int argc,const char **argv){@autoreleasepool{ NSImage *image=DYLUTThumbnail(nil,pixels,320,180,NSMakeSize(320,180),nil);renderPNG=[[(NSBitmapImageRep *)image.representations[0]representationUsingType:NSBitmapImageFileTypePNG properties:@{}]retain]; __block NSString *applied=nil; DYLUTBrowser *browser=[[DYLUTBrowser alloc]initWithLibrary:library preview:frame selectedPath:nil palette:@{} selection:^NSProgress *(NSString *path,void(^completion)(NSError *)){NSProgress *job=[NSProgress discreteProgressWithTotalUnitCount:1];dispatch_async(dispatch_get_main_queue(),^{[applied release];applied=[path copy];completion(nil);});return job;}]; - pump(^{return [browser valueForKey:@"libraryTask"]==nil;});require(!browser.window.visible,@"acceptance never displays an unsigned test app"); + pump(^{return [browser valueForKey:@"libraryTask"]==nil;});require(!browser.window.visible,@"acceptance never displays an unsigned test app");[browser setValue:@YES forKey:@"visible"]; NSPopUpButton *source=[browser valueForKey:@"sourceMenu"];[source selectItemAtIndex:1];[browser sourceChanged:source];pump(^{return [[browser valueForKey:@"onlineEntries"]count]==10;}); require(count(@"/catalog")==1&&count(@"/preview")==0,@"opening online categories does not upload a timeline frame"); require([[browser valueForKey:@"folderPaths"]count]==4,@"online categories include all and named categories"); @@ -84,12 +85,15 @@ int main(int argc,const char **argv){@autoreleasepool{ NSUInteger previous=count(@"/preview");[browser updatePreview:@{@"standard":pixels,@"standardSize":[NSValue valueWithSize:NSMakeSize(320,180)],@"time":@2}];require(count(@"/preview")==previous,@"new timeline frames never trigger automatic uploads"); NSDictionary *tiles=[browser valueForKey:@"tiles"];NSButton *tile=tiles.allValues.firstObject;[browser thumbnailClicked:tile];pump(^{return [browser valueForKey:@"selectionTask"]==nil&&applied!=nil;}); require([applied hasPrefix:library.rootURL.path]&&[NSFileManager.defaultManager fileExistsAtPath:applied],@"downloaded verified LUT is applied through local host selection"); + [browser refreshComparison];pump(^{return [[[[browser valueForKey:@"compareStatus"]stringValue]description]isEqual:[tile valueForKey:@"displayName"]];});require([[[browser valueForKey:@"compareStatus"]stringValue]isEqual:[tile valueForKey:@"displayName"]],@"comparison displays LUT title without internal identifier"); [browser clearSelection:nil];pump(^{return [browser valueForKey:@"selectionTask"]==nil;});require([browser valueForKey:@"onlineSelectedPath"]==nil&&[browser valueForKey:@"selectedPath"]==nil,@"clearing online LUT removes both local and online selection markers"); [browser thumbnailClicked:tile];pump(^{return [browser valueForKey:@"selectionTask"]==nil;}); NSUInteger localCount=library.entries.count;[browser thumbnailClicked:tile];pump(^{return [browser valueForKey:@"selectionTask"]==nil;});require(library.entries.count==localCount,@"repeated online click does not duplicate installed LUT"); badDownload=YES;[browser thumbnailClicked:tile];pump(^{return [browser valueForKey:@"selectionTask"]==nil;});require([[[browser valueForKey:@"statusLabel"]stringValue]containsString:@"大小"],@"incomplete download produces a visible error");badDownload=NO; paid=NO;[browser folderClicked:folder];pump(^{return [browser valueForKey:@"onlineCatalogTask"]==nil;});require([[browser valueForKey:@"onlineEntries"]count]==0,@"permission rejection removes online entries"); [source selectItemAtIndex:0];[browser sourceChanged:source];require(![[browser valueForKey:@"onlineMode"]boolValue]&&[[browser valueForKey:@"visibleEntries"]count]>0,@"local LUT library remains usable without online permission"); + require([[browser valueForKey:@"reveal"]isEnabled],@"local reveal button is restored after an online empty page or error"); + NSButton *localTile=[[[browser valueForKey:@"tiles"]allValues]firstObject];[localTile setEnabled:YES];[browser thumbnailClicked:localTile];pump(^{return [browser valueForKey:@"selectionTask"]==nil;});require([browser valueForKey:@"onlineSelectedPath"]==nil,@"local selection resets previous online highlight"); [browser close];[browser release];[library release];[applied release];[installed release]; [NSFileManager.defaultManager removeItemAtURL:root error:nil]; for(NSString *key in NSUserDefaults.standardUserDefaults.dictionaryRepresentation.allKeys)if([key containsString:root.path])[NSUserDefaults.standardUserDefaults removeObjectForKey:key]; diff --git a/verification/SupersededOnlineLUTBuild128.json b/verification/SupersededOnlineLUTBuild128.json new file mode 100644 index 0000000..60aee87 --- /dev/null +++ b/verification/SupersededOnlineLUTBuild128.json @@ -0,0 +1,14 @@ +{ + "version": "1.22.0", + "build": "128", + "sourceCommit": "f24c67907e11c85a644e81e127327f9012b6b411", + "state": "superseded-before-installation", + "reason": "Source-switch reveal button and online comparison title correction; final candidate uses build 129.", + "notarization": { + "name": "notarization-submission.zip", + "status": "In Progress", + "id": "db0365b8-962b-407c-acdf-9487ae2e0d16", + "createdDate": "2026-11-11T10:44:06.664Z" + }, + "archiveSHA256": "5bcfaa1e594b968da14f1337162cf58346574a59ee081525540cc16f6e56bfce" +} diff --git a/大鱼调色/Plugin/DYLUTBrowser.mm b/大鱼调色/Plugin/DYLUTBrowser.mm index 6cd8aab..0a07b51 100644 --- a/大鱼调色/Plugin/DYLUTBrowser.mm +++ b/大鱼调色/Plugin/DYLUTBrowser.mm @@ -692,7 +692,8 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b NSImage *source=original[@"image"],*look=styled[@"image"]; _compareSlider.enabled=source!=nil&&look!=nil; [_compareView setOriginal:source styled:look]; - _compareStatus.stringValue=path.length?(look?path.lastPathComponent.stringByDeletingPathExtension:@"无法预览当前 LUT"):@"选择一个 LUT 查看对比"; + NSString *name=_onlineMode?[self onlineEntryForPath:path][@"name"]:path.lastPathComponent.stringByDeletingPathExtension; + _compareStatus.stringValue=path.length?(look?(name?:@"在线 LUT"):@"无法预览当前 LUT"):@"选择一个 LUT 查看对比"; _compareStatus.toolTip=_compareStatus.stringValue; } - (void)setStatus:(NSString *)status{_statusLabel.stringValue=status?:@"";_statusLabel.toolTip=status;} @@ -845,6 +846,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b if(online){[_localFolder release];_localFolder=[_folder copy];[_folder release];_folder=[@"*" copy];_onlinePage=1;} else {[_folder release];_folder=[(_localFolder?:@"*")copy];} _onlineMode=online;_importFiles.title=online?@"预览当前帧":@"导入文件…";_importFolder.title=online?@"登录 / 权限":@"导入文件夹…";_reveal.title=online?@"下一页":@"打开 LUT 文件夹"; + _reveal.enabled=YES; _search.stringValue=@"";[self invalidatePreviewImages];[self rebuildFolders];[self rebuildGrid]; if(online)[self loadOnlineCatalog];else [self setStatus:@"单击缩略图应用 LUT"]; } diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index ef40be8..3c2e9ee 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.22.0 CFBundleVersion - 128 + 129 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index e696996..47ab499 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.22.0 CFBundleVersion - 128 + 129 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/开发交接.md b/开发交接.md index 18799b8..6ae21e1 100644 --- a/开发交接.md +++ b/开发交接.md @@ -4,7 +4,7 @@ ## 2026-11-11 在线 LUT 下载可行性 -后续用户已要求实际接入在线分类、主 APP 登录、14421/15792 任一购买或会员权限,以及时间线帧在线效果预览。实现与生产路径见[专项记录](research/OnlineLUTIntegration-20261111.md),接入前基线为 `5fae1150f4b7b6087f5da8298b5ac3ad8916e529`。首个实现检查点已包含后端、主 APP 登录和浏览器接入;Release 编译、PHP/GD 权限渲染合约与 36 项原生在线浏览器检查通过。两个后端文件已部署,线上 6 项未授权检查及 40 项本地浏览器回归通过。最终候选为 1.22.0(128);127 公证安装后尚未完成 CLI 检查,已停止发行,126 恢复副本保留,详见专项记录。以下保留此前可行性结论。 +后续用户已要求实际接入在线分类、主 APP 登录、14421/15792 任一购买或会员权限,以及时间线帧在线效果预览。实现与生产路径见[专项记录](research/OnlineLUTIntegration-20261111.md),接入前基线为 `5fae1150f4b7b6087f5da8298b5ac3ad8916e529`。首个实现检查点已包含后端、主 APP 登录和浏览器接入;Release 编译、PHP/GD 权限渲染合约与 36 项原生在线浏览器检查通过。两个后端文件已部署,线上 6 项未授权检查及 40 项本地浏览器回归通过。最终候选为 1.22.0(129);127 公证安装后尚未完成 CLI 检查,已停止发行,126 恢复副本保留,详见专项记录。以下保留此前可行性结论。 用户询问 LUT 浏览器能否联网下载预置 LUT,随后明确关心 FxPlug4 插件独立界面本身是否能够联网。核对当前源码、正式安装元数据及 Apple 官方文档;正式版本仍为 **1.21.8(126)**。首轮接手提交 `f554b11e6c17aaf38a7ae136787cdbb3eb9d45da` 与远端 `main` 一致,可行性记录已保存为 `995ac745d05fa0f5f1bbd142ae4ef6af45e281df`。两轮均未修改功能、运行宿主或发布新版本。