diff --git a/suixinkan/Assets.xcassets/TravelAlbum/ai_retouch_template_placeholder.imageset/Contents.json b/suixinkan/Assets.xcassets/TravelAlbum/ai_retouch_template_placeholder.imageset/Contents.json new file mode 100644 index 0000000..0f46078 --- /dev/null +++ b/suixinkan/Assets.xcassets/TravelAlbum/ai_retouch_template_placeholder.imageset/Contents.json @@ -0,0 +1,13 @@ +{ + "images" : [ + { + "filename" : "ai_retouch_template_placeholder.png", + "idiom" : "universal", + "scale" : "1x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/suixinkan/Assets.xcassets/TravelAlbum/ai_retouch_template_placeholder.imageset/ai_retouch_template_placeholder.png b/suixinkan/Assets.xcassets/TravelAlbum/ai_retouch_template_placeholder.imageset/ai_retouch_template_placeholder.png new file mode 100644 index 0000000..38ed4d0 Binary files /dev/null and b/suixinkan/Assets.xcassets/TravelAlbum/ai_retouch_template_placeholder.imageset/ai_retouch_template_placeholder.png differ diff --git a/suixinkan/Features/TravelAlbum/ViewModels/TravelAlbumAIRetouchTemplateViewModel.swift b/suixinkan/Features/TravelAlbum/ViewModels/TravelAlbumAIRetouchTemplateViewModel.swift index 666bf18..0e76259 100644 --- a/suixinkan/Features/TravelAlbum/ViewModels/TravelAlbumAIRetouchTemplateViewModel.swift +++ b/suixinkan/Features/TravelAlbum/ViewModels/TravelAlbumAIRetouchTemplateViewModel.swift @@ -66,12 +66,9 @@ final class TravelAlbumAIRetouchTemplateViewModel { return false } - /// 首次修图页按实际展示分组生成的规则说明。 + /// 首次修图页固定展示的氛围感与封面生成规则说明。 var initialTipsText: String { - if visibleCategories.contains(.cover) { - return "每张照片生成精修结果，氛围感可选；本次可免费生成 1 张封面" - } - return "每张照片生成精修结果，氛围感可选" + "Tips：氛围感修图为选填，可横向选择一种样式；选中后每张照片会额外生成1个独立结果，第一张照片仍另生成封面。" } /// 当前分组是否为选填。 diff --git a/suixinkan/UI/TravelAlbum/TravelAlbumAIRetouchTemplateViewController.swift b/suixinkan/UI/TravelAlbum/TravelAlbumAIRetouchTemplateViewController.swift index b58f2fc..e718689 100644 --- a/suixinkan/UI/TravelAlbum/TravelAlbumAIRetouchTemplateViewController.swift +++ b/suixinkan/UI/TravelAlbum/TravelAlbumAIRetouchTemplateViewController.swift @@ -583,6 +583,7 @@ final class TravelAlbumAIRetouchTemplateCell: UICollectionViewCell { previewImageView.contentMode = .scaleAspectFill previewImageView.clipsToBounds = true previewImageView.backgroundColor = UIColor(hex: 0xEDF2F8) + previewImageView.accessibilityIdentifier = "travelAlbum.aiRetouchTemplateImage" nameLabel.font = .systemFont(ofSize: 13, weight: .semibold) nameLabel.textColor = AIRetouchTemplateStyle.textPrimary nameLabel.textAlignment = .center @@ -595,12 +596,12 @@ final class TravelAlbumAIRetouchTemplateCell: UICollectionViewCell { previewConfiguration.title = "预览" previewConfiguration.baseForegroundColor = .white previewConfiguration.baseBackgroundColor = UIColor.black.withAlphaComponent(0.58) - previewConfiguration.background.cornerRadius = 15 + previewConfiguration.background.cornerRadius = 14 previewConfiguration.contentInsets = .zero previewConfiguration.titleTextAttributesTransformer = UIConfigurationTextAttributesTransformer { attributes in var attributes = attributes - attributes.font = .systemFont(ofSize: 13, weight: .regular) + attributes.font = .systemFont(ofSize: 12, weight: .regular) return attributes } previewButton.configuration = previewConfiguration @@ -625,9 +626,9 @@ final class TravelAlbumAIRetouchTemplateCell: UICollectionViewCell { make.size.equalTo(22) } previewButton.snp.makeConstraints { make in - make.trailing.bottom.equalTo(previewImageView).inset(7) - make.width.equalTo(54) - make.height.equalTo(30) + make.trailing.bottom.equalTo(previewImageView).inset(4) + make.width.equalTo(48) + make.height.equalTo(28) } } @@ -646,19 +647,16 @@ final class TravelAlbumAIRetouchTemplateCell: UICollectionViewCell { /// 更新模板内容与选中状态。 func apply(template: TravelAlbumAIRetouchTemplate, selected: Bool) { nameLabel.text = template.name + let placeholder = UIImage(named: "ai_retouch_template_placeholder") if let url = URL(string: template.previewURL), !template.previewURL.isEmpty { previewImageView.contentMode = .scaleAspectFill previewImageView.kf.setImage( with: url, - placeholder: UIImage(systemName: "photo")?.withTintColor( - AIRetouchTemplateStyle.textSecondary, - renderingMode: .alwaysOriginal - ) + placeholder: placeholder ) } else { - previewImageView.image = UIImage(systemName: "photo") - previewImageView.tintColor = AIRetouchTemplateStyle.textSecondary - previewImageView.contentMode = .scaleAspectFit + previewImageView.image = placeholder + previewImageView.contentMode = .scaleAspectFill } contentView.layer.borderColor = ( selected ? AIRetouchTemplateStyle.primary : AIRetouchTemplateStyle.border @@ -680,7 +678,7 @@ final class TravelAlbumAIRetouchTemplateCell: UICollectionViewCell { /// 扩大模板预览按钮的触摸区域，同时保持截图中的胶囊尺寸。 private final class AIRetouchTemplatePreviewButton: UIButton { override func point(inside point: CGPoint, with event: UIEvent?) -> Bool { - bounds.insetBy(dx: -6, dy: -6).contains(point) + bounds.insetBy(dx: -8, dy: -8).contains(point) } } @@ -1009,17 +1007,14 @@ final class TravelAlbumAIRetouchTemplatePreviewViewController: UIViewController } private func loadPreview() { + let placeholder = UIImage(named: "ai_retouch_template_placeholder") guard let url = URL(string: template.previewURL), !template.previewURL.isEmpty else { - imageView.image = UIImage(systemName: "photo") - imageView.tintColor = UIColor.white.withAlphaComponent(0.45) + imageView.image = placeholder return } imageView.kf.setImage( with: url, - placeholder: UIImage(systemName: "photo")?.withTintColor( - UIColor.white.withAlphaComponent(0.45), - renderingMode: .alwaysOriginal - ) + placeholder: placeholder ) } diff --git a/suixinkanTests/TravelAlbumAIRetouchTemplateViewModelTests.swift b/suixinkanTests/TravelAlbumAIRetouchTemplateViewModelTests.swift index 404e55d..6f86ee4 100644 --- a/suixinkanTests/TravelAlbumAIRetouchTemplateViewModelTests.swift +++ b/suixinkanTests/TravelAlbumAIRetouchTemplateViewModelTests.swift @@ -25,7 +25,7 @@ final class TravelAlbumAIRetouchTemplateViewModelTests: XCTestCase { XCTAssertTrue(viewModel.shouldShowInitialTips) XCTAssertEqual( viewModel.initialTipsText, - "每张照片生成精修结果，氛围感可选；本次可免费生成 1 张封面" + "Tips：氛围感修图为选填，可横向选择一种样式；选中后每张照片会额外生成1个独立结果，第一张照片仍另生成封面。" ) XCTAssertEqual(viewModel.visibleCategories, [.refined, .atmosphere, .cover]) XCTAssertEqual(viewModel.selectedRefinedTemplateId, 11) diff --git a/suixinkanTests/TravelAlbumDetailViewControllerTests.swift b/suixinkanTests/TravelAlbumDetailViewControllerTests.swift index c207b5e..183d1da 100644 --- a/suixinkanTests/TravelAlbumDetailViewControllerTests.swift +++ b/suixinkanTests/TravelAlbumDetailViewControllerTests.swift @@ -572,8 +572,13 @@ final class TravelAlbumDetailViewControllerTests: XCTestCase { let previewButton = cell.findSubview { $0.accessibilityIdentifier == "travelAlbum.aiRetouchTemplatePreviewButton" } as? UIButton + let previewImageView = cell.findSubview { + $0.accessibilityIdentifier == "travelAlbum.aiRetouchTemplateImage" + } as? UIImageView previewButton?.sendActions(for: .touchUpInside) + XCTAssertNotNil(UIImage(named: "ai_retouch_template_placeholder")) + XCTAssertNotNil(previewImageView?.image) XCTAssertEqual(cell.contentView.layer.borderWidth, 2) XCTAssertTrue(cell.accessibilityTraits.contains(.selected)) XCTAssertEqual(cell.accessibilityValue, "已选择")