lujiuyin/suixinkan_uikit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善账号切换展示、首页菜单图标与有线传输设置 chip。

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
汉秋
2026-07-15 14:59:31 +08:00
parent 5eef31b8da
commit ce6de76055
18 changed files with 321 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
suixinkan/UI/Home/Views/AllFunctionMenuCell.swift
View File

@ -42,10 +42,11 @@ final class AllFunctionMenuCell: UICollectionViewCell {
/// 更新菜单内容、操作状态及整张卡片的无障碍语义。
func apply(menu: HomeMenuItem, actionStyle: ActionStyle) {
iconView.image = UIImage(named: menu.iconName) ?? UIImage(systemName: menu.iconName)
iconView.image = HomeMenuIconFactory.image(named: menu.iconName)
titleLabel.text = menu.title
accessibilityLabel = menu.title
switch actionStyle {
case .none:
actionImageView.isHidden = true
@ -75,6 +76,8 @@ final class AllFunctionMenuCell: UICollectionViewCell {
iconView.tintColor = AppColor.primary
iconView.contentMode = .scaleAspectFit
iconView.preferredSymbolConfiguration = HomeMenuIconFactory.symbolConfiguration
contentStackView.axis = .vertical
contentStackView.alignment = .center

4
suixinkan/UI/Home/Views/HomeCollectionCells.swift
View File

@ -128,7 +128,7 @@ final class HomeMenuCell: UICollectionViewCell {
}
func apply(menu: HomeMenuItem) {
iconView.image = UIImage(named: menu.iconName) ?? UIImage(systemName: menu.iconName)
iconView.image = HomeMenuIconFactory.image(named: menu.iconName)
iconView.accessibilityIdentifier = menu.iconName
titleLabel.text = menu.title
}
@ -147,6 +147,8 @@ final class HomeMenuCell: UICollectionViewCell {
iconView.tintColor = AppColor.primary
iconView.contentMode = .scaleAspectFit
iconView.preferredSymbolConfiguration = HomeMenuIconFactory.symbolConfiguration
contentStackView.axis = .vertical
contentStackView.alignment = .center

14
suixinkan/UI/Login/AccountSelectionViewController.swift
View File

@ -186,7 +186,7 @@ private final class AccountSelectionCell: UITableViewCell {
private let avatarPlaceholderLabel = UILabel()
private let titleLabel = UILabel()
private let subtitleLabel = UILabel()
private let phoneLabel = UILabel()
private let nameLabel = UILabel()
private let typeTag = UILabel()
private let currentTag = UILabel()
private let checkmark = UIImageView()
@ -214,8 +214,8 @@ private final class AccountSelectionCell: UITableViewCell {
subtitleLabel.font = .systemFont(ofSize: 13)
subtitleLabel.textColor = AppColor.text666
phoneLabel.font = .systemFont(ofSize: 12)
phoneLabel.textColor = UIColor(hex: 0x9AA1AA)
nameLabel.font = .systemFont(ofSize: 12)
nameLabel.textColor = UIColor(hex: 0x9AA1AA)
typeTag.font = .systemFont(ofSize: 11, weight: .semibold)
typeTag.textAlignment = .center
@ -239,7 +239,7 @@ private final class AccountSelectionCell: UITableViewCell {
avatarView.addSubview(avatarPlaceholderLabel)
card.addSubview(titleLabel)
card.addSubview(subtitleLabel)
card.addSubview(phoneLabel)
card.addSubview(nameLabel)
card.addSubview(typeTag)
card.addSubview(currentTag)
card.addSubview(checkmark)
@ -277,7 +277,7 @@ private final class AccountSelectionCell: UITableViewCell {
make.trailing.equalTo(checkmark.snp.leading).offset(-8)
}
phoneLabel.snp.makeConstraints { make in
nameLabel.snp.makeConstraints { make in
make.top.equalTo(subtitleLabel.snp.bottom).offset(4)
make.leading.equalTo(titleLabel)
make.bottom.equalToSuperview().inset(16)
@ -304,8 +304,8 @@ private final class AccountSelectionCell: UITableViewCell {
titleLabel.text = account.title.isEmpty ? account.accountTypeLabel : account.title
subtitleLabel.text = account.subtitle
subtitleLabel.isHidden = account.subtitle.isEmpty
phoneLabel.text = account.phone
phoneLabel.isHidden = account.phone.isEmpty
nameLabel.text = account.realName
nameLabel.isHidden = account.realName.isEmpty
currentTag.isHidden = !account.isCurrent
let avatarPlaceholderColor: UIColor

14
suixinkan/UI/Profile/AccountSwitchViewController.swift
View File

@ -161,7 +161,7 @@ private final class AccountSwitchCell: UITableViewCell {
private let titleLabel = UILabel()
private let currentTagLabel = UILabel()
private let subtitleLabel = UILabel()
private let phoneLabel = UILabel()
private let nameLabel = UILabel()
private let tagLabel = UILabel()
private let checkView = UIImageView()
@ -197,8 +197,8 @@ private final class AccountSwitchCell: UITableViewCell {
currentTagLabel.setContentCompressionResistancePriority(.required, for: .horizontal)
subtitleLabel.font = .systemFont(ofSize: 13)
subtitleLabel.textColor = AppColor.text666
phoneLabel.font = .systemFont(ofSize: 12)
phoneLabel.textColor = UIColor(hex: 0x9AA1AA)
nameLabel.font = .systemFont(ofSize: 12)
nameLabel.textColor = UIColor(hex: 0x9AA1AA)
tagLabel.font = .systemFont(ofSize: 11, weight: .semibold)
tagLabel.textAlignment = .center
tagLabel.layer.cornerRadius = 4
@ -210,7 +210,7 @@ private final class AccountSwitchCell: UITableViewCell {
card.addSubview(titleStackView)
card.addSubview(subtitleLabel)
card.addSubview(phoneLabel)
card.addSubview(nameLabel)
card.addSubview(tagLabel)
card.addSubview(checkView)
@ -234,7 +234,7 @@ private final class AccountSwitchCell: UITableViewCell {
make.leading.equalTo(titleStackView)
make.top.equalTo(titleStackView.snp.bottom).offset(4)
}
phoneLabel.snp.makeConstraints { make in
nameLabel.snp.makeConstraints { make in
make.leading.equalTo(titleLabel)
make.top.equalTo(subtitleLabel.snp.bottom).offset(4)
}
@ -257,7 +257,9 @@ private final class AccountSwitchCell: UITableViewCell {
titleLabel.text = account.title
currentTagLabel.isHidden = !isCurrent
subtitleLabel.text = account.subtitle
phoneLabel.text = account.phone
subtitleLabel.isHidden = account.subtitle.isEmpty
nameLabel.text = account.realName
nameLabel.isHidden = account.realName.isEmpty
tagLabel.text = account.isStoreUser ? "门店" : "景区"
tagLabel.textColor = account.isStoreUser ? UIColor(hex: 0x0F9F6E) : UIColor(hex: 0x7C3AED)
tagLabel.backgroundColor = account.isStoreUser ? UIColor(hex: 0xE8F8F1) : UIColor(hex: 0xF3ECFF)

29
suixinkan/UI/TravelAlbum/TravelAlbumEntryViewController.swift
View File

@ -55,7 +55,6 @@ final class TravelAlbumEntryViewController: BaseViewController {
cell.apply(album: album)
cell.onShootUpload = { [weak self] in self?.pushWiredTransfer(album: album) }
cell.onAlbumCode = { [weak self] in self?.loadAlbumCode(album) }
cell.onShare = { [weak self] in self?.showShareSheet() }
return cell
}
@ -162,18 +161,6 @@ final class TravelAlbumEntryViewController: BaseViewController {
present(controller, animated: true)
}
private func showShareSheet() {
let sheet = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
sheet.addAction(UIAlertAction(title: "微信好友", style: .default) { [weak self] _ in
self?.showToast("已选择微信好友")
})
sheet.addAction(UIAlertAction(title: "QQ好友", style: .default) { [weak self] _ in
self?.showToast("已选择QQ好友")
})
sheet.addAction(UIAlertAction(title: "取消", style: .cancel))
present(sheet, animated: true)
}
private func pushWiredTransfer(album: TravelAlbum) {
let controller = WiredCameraTransferViewController(
viewModel: WiredCameraTransferViewModel(
@ -272,7 +259,6 @@ private final class TravelAlbumTaskCell: UITableViewCell {
var onShootUpload: (() -> Void)?
var onAlbumCode: (() -> Void)?
var onShare: (() -> Void)?
private let cardView = UIView()
private let coverView = UIImageView()
@ -280,7 +266,6 @@ private final class TravelAlbumTaskCell: UITableViewCell {
private let nameLabel = UILabel()
private let timeLabel = UILabel()
private let phoneLabel = UILabel()
private let shareButton = UIButton(type: .system)
private let codeButton = UIButton(type: .system)
private let uploadButton = UIButton(type: .system)
@ -314,8 +299,6 @@ private final class TravelAlbumTaskCell: UITableViewCell {
phoneLabel.numberOfLines = 1
phoneLabel.setContentCompressionResistancePriority(.required, for: .vertical)
shareButton.setImage(UIImage(systemName: "square.and.arrow.up"), for: .normal)
shareButton.tintColor = AppColor.primary
codeButton.setImage(UIImage(systemName: "qrcode"), for: .normal)
codeButton.tintColor = .black
uploadButton.setImage(UIImage(systemName: "camera.fill"), for: .normal)
@ -332,7 +315,6 @@ private final class TravelAlbumTaskCell: UITableViewCell {
cardView.addSubview(nameLabel)
cardView.addSubview(timeLabel)
cardView.addSubview(phoneLabel)
cardView.addSubview(shareButton)
cardView.addSubview(codeButton)
cardView.addSubview(uploadButton)
@ -347,20 +329,15 @@ private final class TravelAlbumTaskCell: UITableViewCell {
make.center.equalToSuperview()
make.size.equalTo(42)
}
shareButton.snp.makeConstraints { make in
make.top.equalToSuperview().offset(12)
make.trailing.equalTo(codeButton.snp.leading).offset(-8)
make.size.equalTo(26)
}
codeButton.snp.makeConstraints { make in
make.top.equalTo(shareButton)
make.top.equalToSuperview().offset(12)
make.trailing.equalToSuperview().offset(-10)
make.size.equalTo(26)
}
nameLabel.snp.makeConstraints { make in
make.top.equalToSuperview().offset(14)
make.leading.equalTo(coverView.snp.trailing).offset(12)
make.trailing.equalTo(shareButton.snp.leading).offset(-8)
make.trailing.equalTo(codeButton.snp.leading).offset(-8)
}
timeLabel.snp.makeConstraints { make in
make.top.equalTo(nameLabel.snp.bottom).offset(7)
@ -381,7 +358,6 @@ private final class TravelAlbumTaskCell: UITableViewCell {
}
uploadButton.addTarget(self, action: #selector(uploadTapped), for: .touchUpInside)
shareButton.addTarget(self, action: #selector(shareTapped), for: .touchUpInside)
codeButton.addTarget(self, action: #selector(codeTapped), for: .touchUpInside)
}
@ -404,7 +380,6 @@ private final class TravelAlbumTaskCell: UITableViewCell {
}
@objc private func uploadTapped() { onShootUpload?() }
@objc private func shareTapped() { onShare?() }
@objc private func codeTapped() { onAlbumCode?() }
}

41
suixinkan/UI/TravelAlbum/WiredCameraTransferViewController.swift
View File

@ -40,10 +40,9 @@ final class WiredCameraTransferViewController: BaseViewController {
private let refreshButton = UIButton(type: .system)
private let helpLabel = UILabel()
private let chipsStack = UIStackView()
private let retouchButton = UIButton(type: .system)
private let formatButton = UIButton(type: .system)
private let modeButton = UIButton(type: .system)
private let modeChevronView = UIImageView()
private let retouchButton = WiredTransferSettingChipButton()
private let formatButton = WiredTransferSettingChipButton()
private let modeButton = WiredTransferSettingChipButton(showsChevron: true)
private let settingsStatsDivider = UIView()
private let statsCard = UIStackView()
private let firstStatsDivider = UIView()
@ -160,19 +159,10 @@ final class WiredCameraTransferViewController: BaseViewController {
chipsStack.spacing = 6
chipsStack.distribution = .fillEqually
[retouchButton, formatButton, modeButton].forEach {
configureChipButton($0)
chipsStack.addArrangedSubview($0)
}
retouchButton.isUserInteractionEnabled = false
formatButton.isUserInteractionEnabled = false
modeButton.setConfigurationContentInsets(
NSDirectionalEdgeInsets(top: 6, leading: 10, bottom: 6, trailing: 32)
)
modeChevronView.image = UIImage(systemName: "chevron.down")?
.withConfiguration(UIImage.SymbolConfiguration(pointSize: 13, weight: .semibold))
modeChevronView.tintColor = AppColor.textTertiary
modeChevronView.contentMode = .scaleAspectFit
modeChevronView.isUserInteractionEnabled = false
settingsStatsDivider.backgroundColor = AppColor.border
statsCard.axis = .horizontal
@ -269,7 +259,6 @@ final class WiredCameraTransferViewController: BaseViewController {
view.addSubview(emptyLabel)
view.addSubview(bottomBar)
bottomBar.addSubview(bottomButtonsStack)
modeButton.addSubview(modeChevronView)
bottomButtonsStack.addArrangedSubview(batchButton)
bottomButtonsStack.addArrangedSubview(specifyButton)
bottomButtonsStack.addArrangedSubview(albumImportButton)
@ -318,11 +307,6 @@ final class WiredCameraTransferViewController: BaseViewController {
make.leading.trailing.equalToSuperview().inset(14)
make.height.equalTo(34)
}
modeChevronView.snp.makeConstraints { make in
make.trailing.equalToSuperview().offset(-10)
make.centerY.equalToSuperview()
make.size.equalTo(16)
}
settingsStatsDivider.snp.makeConstraints { make in
make.top.equalTo(chipsStack.snp.bottom).offset(12)
make.leading.trailing.equalToSuperview()
@ -431,9 +415,9 @@ final class WiredCameraTransferViewController: BaseViewController {
statusLabel.backgroundColor = (isFailed ? AppColor.danger : AppColor.primary).withAlphaComponent(0.10)
refreshButton.setTitle(viewModel.actionButtonText, for: .normal)
retouchButton.setTitle(viewModel.retouchOption, for: .normal)
formatButton.setTitle("JPG", for: .normal)
modeButton.setTitle(viewModel.transferModeOption, for: .normal)
retouchButton.apply(title: viewModel.retouchOption)
formatButton.apply(title: "JPG")
modeButton.apply(title: viewModel.transferModeOption)
helpLabel.attributedText = helpText(viewModel.sonyMTPHint)
rebuildStats()
@ -642,19 +626,6 @@ final class WiredCameraTransferViewController: BaseViewController {
statsCard.bringSubviewToFront(secondStatsDivider)
}
private func configureChipButton(_ button: UIButton) {
button.titleLabel?.font = .systemFont(ofSize: 11)
button.setTitleColor(AppColor.textTertiary, for: .normal)
button.backgroundColor = AppColor.pageBackground
button.layer.cornerRadius = 8
button.layer.borderWidth = 1
button.layer.borderColor = AppColor.border.cgColor
button.contentHorizontalAlignment = .leading
button.setConfigurationContentInsets(
NSDirectionalEdgeInsets(top: 6, leading: 10, bottom: 6, trailing: 10)
)
}
private func makeStatButton(title: String, count: Int, selected: Bool, danger: Bool) -> UIButton {
var config = UIButton.Configuration.plain()
config.title = "\(count)"

88
suixinkan/UI/TravelAlbum/WiredTransferSettingChipButton.swift Normal file
View File

@ -0,0 +1,88 @@
//
// WiredTransferSettingChipButton.swift
// suixinkan
//
import SnapKit
import UIKit
/// 有线传输页设置 chip 按钮，通过子视图展示标题与可选下拉箭头，不依赖 `UIButton` 原生 title 样式。
final class WiredTransferSettingChipButton: UIButton {
private let titleLabelView = UILabel()
private let chevronView = UIImageView()
private var titleTrailingToSuperviewConstraint: Constraint?
private var titleTrailingToChevronConstraint: Constraint?
/// 是否展示右侧下拉箭头。
var showsChevron: Bool {
didSet { updateChevronLayout() }
}
/// 当前展示的标题文案。
private(set) var titleText: String = ""
/// 创建设置 chip 按钮。
/// - Parameter showsChevron: 是否展示下拉箭头，默认不展示。
init(showsChevron: Bool = false) {
self.showsChevron = showsChevron
super.init(frame: .zero)
setupUI()
updateChevronLayout()
}
@available(*, unavailable)
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
/// 更新 chip 标题文案。
func apply(title: String) {
titleText = title
titleLabelView.text = title
accessibilityLabel = title
}
private func setupUI() {
backgroundColor = AppColor.pageBackground
layer.cornerRadius = 8
layer.borderWidth = 1
layer.borderColor = AppColor.border.cgColor
titleLabelView.font = .systemFont(ofSize: 11)
titleLabelView.textColor = AppColor.textTertiary
titleLabelView.lineBreakMode = .byTruncatingTail
titleLabelView.isUserInteractionEnabled = false
chevronView.image = UIImage(systemName: "chevron.down")?
.withConfiguration(UIImage.SymbolConfiguration(pointSize: 13, weight: .semibold))
chevronView.tintColor = AppColor.textTertiary
chevronView.contentMode = .scaleAspectFit
chevronView.isUserInteractionEnabled = false
addSubview(titleLabelView)
addSubview(chevronView)
titleLabelView.snp.makeConstraints { make in
make.leading.equalToSuperview().offset(10)
make.centerY.equalToSuperview()
titleTrailingToSuperviewConstraint = make.trailing.lessThanOrEqualToSuperview().offset(-10).constraint
titleTrailingToChevronConstraint = make.trailing.lessThanOrEqualTo(chevronView.snp.leading).offset(-4).constraint
}
chevronView.snp.makeConstraints { make in
make.trailing.equalToSuperview().offset(-10)
make.centerY.equalToSuperview()
make.size.equalTo(16)
}
}
private func updateChevronLayout() {
chevronView.isHidden = !showsChevron
if showsChevron {
titleTrailingToSuperviewConstraint?.deactivate()
titleTrailingToChevronConstraint?.activate()
} else {
titleTrailingToChevronConstraint?.deactivate()
titleTrailingToSuperviewConstraint?.activate()
}
}
}

2
suixinkan/UI/WildPhotographerReport/WildPhotographerReportListViewController.swift
View File

@ -1187,7 +1187,7 @@ final class WildPhotographerReportDetailViewController: BaseViewController {
button.titleLabel?.adjustsFontSizeToFitWidth = true
button.titleLabel?.minimumScaleFactor = 0.82
button.setConfigurationContentInsets(
NSDirectionalEdgeInsets(top: 0, leading: 10, bottom: 0, trailing: 10)
NSDirectionalEdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0)
)
button.configuration?.imagePlacement = .leading
button.configuration?.imagePadding = 4

100
suixinkan/UI/WildPhotographerReport/WildReportRiskMapViewController.swift
View File

@ -328,14 +328,7 @@ final class WildReportRiskMapViewController: BaseViewController {
}
private func makeRadarHeader(clue: WildReportRadarActiveClue) -> UIView {
let container = UIStackView()
container.axis = .vertical
container.spacing = 6
let row = UIStackView()
row.axis = .horizontal
row.alignment = .top
row.spacing = 12
let container = UIView()
let iconWrap = UIView()
iconWrap.backgroundColor = headerIconColor(for: clue)
@ -348,17 +341,15 @@ final class WildReportRiskMapViewController: BaseViewController {
make.center.equalToSuperview()
make.size.equalTo(20)
}
iconWrap.snp.makeConstraints { make in
make.size.equalTo(44)
}
let textStack = UIStackView()
textStack.axis = .vertical
textStack.spacing = 6
var reportMetaText: String?
let badge = WildReportRiskStatusBadge(text: clue.statusText, color: statusColor(for: clue))
badge.setContentHuggingPriority(.required, for: .horizontal)
badge.setContentCompressionResistancePriority(.required, for: .horizontal)
let title: UILabel
var metaText: String?
if isReportClue(clue) {
let title = WildReportUI.label("线索 ID：\(clue.id)", font: .systemFont(ofSize: 16, weight: .bold), color: AppColor.textPrimary, lines: 2)
textStack.addArrangedSubview(title)
title = WildReportUI.label("线索 ID：\(clue.id)", font: .systemFont(ofSize: 14, weight: .bold), color: AppColor.textPrimary, lines: 1)
var metaParts: [String] = []
if let distance = clue.distanceText ?? clue.distance {
metaParts.append("距离：距离您\(distance)")
@ -366,41 +357,58 @@ final class WildReportRiskMapViewController: BaseViewController {
if let updatedAt = clue.updatedAt {
metaParts.append("时间：\(updatedAt)")
}
reportMetaText = metaParts.isEmpty ? nil : metaParts.joined(separator: " ")
metaText = metaParts.isEmpty ? nil : metaParts.joined(separator: " ")
} else {
let title = WildReportUI.label(clue.displayTitle, font: .systemFont(ofSize: 16, weight: .bold), color: AppColor.textPrimary, lines: 2)
textStack.addArrangedSubview(title)
title = WildReportUI.label(clue.displayTitle, font: .systemFont(ofSize: 16, weight: .bold), color: AppColor.textPrimary, lines: 2)
if clue.type == .green {
let metaText = [clue.distance.map { "距蓝点 \($0)" }, clue.direction, clue.updatedAt].compactMap { $0 }.joined(separator: " ")
if !metaText.isEmpty {
textStack.addArrangedSubview(WildReportUI.label(metaText, font: .systemFont(ofSize: 12), color: AppColor.textSecondary))
let text = [clue.distance.map { "距蓝点 \($0)" }, clue.direction, clue.updatedAt].compactMap { $0 }.joined(separator: " ")
metaText = text.isEmpty ? nil : text
}
}
container.addSubview(iconWrap)
container.addSubview(badge)
container.addSubview(title)
iconWrap.snp.makeConstraints { make in
make.top.leading.equalToSuperview()
make.size.equalTo(44)
}
badge.snp.makeConstraints { make in
make.top.trailing.equalToSuperview()
}
title.snp.makeConstraints { make in
make.top.equalToSuperview()
make.leading.equalTo(iconWrap.snp.trailing).offset(12)
make.trailing.lessThanOrEqualTo(badge.snp.leading).offset(-12)
}
if let metaText {
let metaLabel = WildReportUI.label(metaText, font: .systemFont(ofSize: 12), color: AppColor.textSecondary, lines: 0)
container.addSubview(metaLabel)
metaLabel.snp.makeConstraints { make in
make.top.equalTo(title.snp.bottom).offset(6)
make.leading.equalTo(title)
make.trailing.equalToSuperview()
make.bottom.equalToSuperview()
}
iconWrap.snp.makeConstraints { make in
make.bottom.lessThanOrEqualToSuperview()
}
} else {
[iconWrap, title, badge].forEach { view in
view.snp.makeConstraints { make in
make.bottom.lessThanOrEqualToSuperview()
}
}
}
let badge = WildReportRiskStatusBadge(text: clue.statusText, color: statusColor(for: clue))
row.addArrangedSubview(iconWrap)
row.addArrangedSubview(textStack)
row.addArrangedSubview(badge)
textStack.setContentHuggingPriority(.defaultLow, for: .horizontal)
badge.setContentHuggingPriority(.required, for: .horizontal)
container.addArrangedSubview(row)
if let reportMetaText {
let metaRow = UIStackView()
metaRow.axis = .horizontal
metaRow.spacing = 0
let spacer = UIView()
spacer.snp.makeConstraints { make in
make.width.equalTo(56)
iconWrap.snp.makeConstraints { make in
make.bottom.equalToSuperview().priority(.high)
}
title.snp.makeConstraints { make in
make.bottom.equalToSuperview().priority(.high)
}
let metaLabel = WildReportUI.label(reportMetaText, font: .systemFont(ofSize: 12), color: AppColor.textSecondary)
metaLabel.textAlignment = .right
metaLabel.setContentCompressionResistancePriority(.required, for: .horizontal)
metaRow.addArrangedSubview(spacer)
metaRow.addArrangedSubview(metaLabel)
container.addArrangedSubview(metaRow)
}
return container
}