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

完善实名认证、钱包与打卡点模块 UI 与业务逻辑。

Browse Source 
对齐 Android 实名认证流程与审核页、钱包提现/积分兑换界面，优化打卡点列表与详情交互，并补充相关资源、主题 token 与单元测试。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
汉秋
2026-07-13 16:28:10 +08:00
parent 07b2b9d459
commit 5138c1c11a
63 changed files with 3101 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

240
suixinkan/UI/PunchPoint/PunchPointDetailViewController.swift
View File

@ -15,9 +15,9 @@ final class PunchPointDetailViewController: BaseViewController {
private let mapView = PunchPointMapView()
private let zoomStack = UIStackView()
private let zoomInButton = PunchPointMapControlButton(symbol: "plus")
private let zoomOutButton = PunchPointMapControlButton(symbol: "minus")
private let locateButton = PunchPointMapControlButton(symbol: "location.fill")
private let zoomInButton = PunchPointMapControlButton(assetName: "punch_point_zoom_in")
private let zoomOutButton = PunchPointMapControlButton(assetName: "punch_point_zoom_out")
private let locateButton = PunchPointMapControlButton(assetName: "punch_point_map_location")
private let cardView = UIView()
private let scrollView = UIScrollView()
private let contentStack = UIStackView()
@ -102,11 +102,11 @@ final class PunchPointDetailViewController: BaseViewController {
}
zoomStack.snp.makeConstraints { make in
make.trailing.equalToSuperview().inset(16)
make.bottom.equalTo(cardView.snp.top).offset(-16)
make.bottom.equalTo(locateButton.snp.top).offset(-12)
}
locateButton.snp.makeConstraints { make in
make.trailing.equalToSuperview().inset(16)
make.bottom.equalTo(zoomStack.snp.top).offset(-12)
make.bottom.equalTo(cardView.snp.top).offset(-16)
make.size.equalTo(40)
}
zoomInButton.snp.makeConstraints { make in
@ -178,8 +178,11 @@ final class PunchPointDetailViewController: BaseViewController {
bottomBar.isHidden = false
if let region = detail.region {
let coordinate = CLLocationCoordinate2D(latitude: region.lat, longitude: region.lot)
mapView.updateMarker(coordinate: coordinate)
mapView.setCenter(coordinate, zoomLevel: 16)
mapView.updatePunchPointMarker(
coordinate: coordinate,
imageURL: detail.guideImages.first,
fitWithUserLocation: true
)
}
rebuildContent(detail)
}
@ -188,7 +191,11 @@ final class PunchPointDetailViewController: BaseViewController {
contentStack.arrangedSubviews.forEach { $0.removeFromSuperview() }
contentStack.addArrangedSubview(PunchPointReadOnlyField(title: "*打卡点名称", value: detail.name))
let coordinateText = detail.region.map { "\($0.lat),\($0.lot)" } ?? "--"
contentStack.addArrangedSubview(PunchPointReadOnlyField(title: "*打卡点坐标", value: coordinateText))
contentStack.addArrangedSubview(PunchPointReadOnlyField(
title: "*打卡点坐标",
value: coordinateText,
showsLocationIcon: true
))
contentStack.addArrangedSubview(PunchPointReadOnlyField(title: "*打卡点地址", value: detail.displayAddress.nonEmptyTrimmed ?? "--"))
if let description = detail.description?.nonEmptyTrimmed {
contentStack.addArrangedSubview(PunchPointReadOnlyField(title: "打卡点描述", value: description, multiline: true))
@ -241,7 +248,9 @@ final class PunchPointDetailViewController: BaseViewController {
imageView.isUserInteractionEnabled = true
imageView.tag = index
if let url = URL(string: urlText) {
imageView.kf.setImage(with: url)
imageView.kf.setImage(with: url, placeholder: UIImage(named: "SplashLogo"))
} else {
imageView.image = UIImage(named: "SplashLogo")
}
imageView.snp.makeConstraints { make in
make.width.equalTo(120)
@ -266,7 +275,7 @@ final class PunchPointDetailViewController: BaseViewController {
label.font = .systemFont(ofSize: 14)
label.textColor = UIColor(hex: 0x2E3746)
let chip = PunchPointStatusChip()
chip.apply(text: detail.statusLabel.nonEmptyTrimmed ?? "--", status: detail.status)
chip.apply(PunchPointDisplayFormatter.auditStatus(detail.status), compact: false)
row.addArrangedSubview(label)
row.addArrangedSubview(chip)
row.isLayoutMarginsRelativeArrangement = true
@ -301,7 +310,9 @@ final class PunchPointDetailViewController: BaseViewController {
imageView.clipsToBounds = true
imageView.layer.cornerRadius = 16
if let url = URL(string: qrCode) {
imageView.kf.setImage(with: url)
imageView.kf.setImage(with: url, placeholder: UIImage(named: "SplashLogo"))
} else {
imageView.image = UIImage(named: "SplashLogo")
}
imageView.snp.makeConstraints { make in
make.size.equalTo(180)
@ -331,6 +342,11 @@ final class PunchPointDetailViewController: BaseViewController {
}
Task {
do {
let authorization = await PHPhotoLibrary.requestAuthorization(for: .addOnly)
guard authorization == .authorized || authorization == .limited else {
await MainActor.run { self.presentPhotoPermissionAlert() }
return
}
let (data, _) = try await URLSession.shared.data(from: url)
guard let image = UIImage(data: data) else { throw APIError.decodeFailed("二维码图片无效") }
try await PHPhotoLibrary.shared().performChanges {
@ -343,6 +359,21 @@ final class PunchPointDetailViewController: BaseViewController {
}
}
@MainActor
private func presentPhotoPermissionAlert() {
let alert = UIAlertController(
title: "无法保存二维码",
message: "相册权限未授予，请在设置中开启",
preferredStyle: .alert
)
alert.addAction(UIAlertAction(title: "取消", style: .cancel))
alert.addAction(UIAlertAction(title: "去设置", style: .default) { _ in
guard let url = URL(string: UIApplication.openSettingsURLString) else { return }
UIApplication.shared.open(url)
})
present(alert, animated: true)
}
private func requiredTitle(_ text: String) -> NSAttributedString {
let mutable = NSMutableAttributedString(string: text, attributes: [
.font: UIFont.systemFont(ofSize: 14, weight: .medium),
@ -368,7 +399,35 @@ final class PunchPointDetailViewController: BaseViewController {
}
@objc private func locateTapped() {
mapView.centerOnUserLocation()
Task {
do {
let snapshot = try await LocationProvider.shared.requestSnapshot()
let coordinate = CLLocationCoordinate2D(
latitude: snapshot.latitude,
longitude: snapshot.longitude
)
await MainActor.run { self.mapView.setCenter(coordinate, zoomLevel: 16) }
} catch LocationProviderError.permissionDenied {
await MainActor.run { self.presentLocationPermissionAlert() }
} catch {
await MainActor.run { self.showToast("定位失败") }
}
}
}
@MainActor
private func presentLocationPermissionAlert() {
let alert = UIAlertController(
title: "无法定位",
message: "定位权限未授予，请在设置中开启",
preferredStyle: .alert
)
alert.addAction(UIAlertAction(title: "取消", style: .cancel))
alert.addAction(UIAlertAction(title: "去设置", style: .default) { _ in
guard let url = URL(string: UIApplication.openSettingsURLString) else { return }
UIApplication.shared.open(url)
})
present(alert, animated: true)
}
@objc private func retryTapped() {
@ -393,7 +452,10 @@ final class PunchPointMapView: UIView, MAMapViewDelegate {
var onMapTap: ((CLLocationCoordinate2D) -> Void)?
private let mapView: MAMapView
private var markerAnnotation: MAPointAnnotation?
private var punchPointAnnotation: MAPointAnnotation?
private var selectedAnnotation: MAPointAnnotation?
private var punchPointImageURL: URL?
private var fitWithUserLocation = false
override init(frame: CGRect) {
_ = AMapBootstrap.configureIfNeeded()
@ -403,6 +465,7 @@ final class PunchPointMapView: UIView, MAMapViewDelegate {
mapView.showsUserLocation = true
mapView.showsCompass = false
mapView.showsScale = false
mapView.touchPOIEnabled = true
mapView.zoomLevel = 15
addSubview(mapView)
mapView.snp.makeConstraints { make in
@ -415,17 +478,45 @@ final class PunchPointMapView: UIView, MAMapViewDelegate {
fatalError("init(coder:) has not been implemented")
}
/// 更新打卡点标记。
/// 更新原打卡点标记，可使用首张图片作为 Android 同款圆角 Marker。
func updatePunchPointMarker(
coordinate: CLLocationCoordinate2D?,
imageURL: String? = nil,
fitWithUserLocation: Bool = false
) {
if let punchPointAnnotation {
mapView.removeAnnotation(punchPointAnnotation)
self.punchPointAnnotation = nil
}
punchPointImageURL = imageURL.flatMap(URL.init(string:))
self.fitWithUserLocation = fitWithUserLocation
guard let coordinate, CLLocationCoordinate2DIsValid(coordinate) else { return }
let annotation = MAPointAnnotation()
annotation.coordinate = coordinate
annotation.title = "punch_point_original"
punchPointAnnotation = annotation
mapView.addAnnotation(annotation)
if fitWithUserLocation {
fitPunchPointAndUserLocation()
}
}
/// 兼容仅需更新普通 Marker 的调用。
func updateMarker(coordinate: CLLocationCoordinate2D?) {
if let markerAnnotation {
mapView.removeAnnotation(markerAnnotation)
self.markerAnnotation = nil
updatePunchPointMarker(coordinate: coordinate)
}
/// 更新地图点击产生的新位置 Marker。
func updateSelectedMarker(coordinate: CLLocationCoordinate2D?) {
if let selectedAnnotation {
mapView.removeAnnotation(selectedAnnotation)
self.selectedAnnotation = nil
}
guard let coordinate, CLLocationCoordinate2DIsValid(coordinate) else { return }
let annotation = MAPointAnnotation()
annotation.coordinate = coordinate
annotation.title = "打卡点位置"
markerAnnotation = annotation
annotation.title = "punch_point_selected"
selectedAnnotation = annotation
mapView.addAnnotation(annotation)
}
@ -453,21 +544,92 @@ final class PunchPointMapView: UIView, MAMapViewDelegate {
setCenter(coordinate)
}
/// 同时展示原打卡点、用户位置和新选位置，并留出 Android 同款边距。
func fitAllMarkers(edgePadding: UIEdgeInsets = UIEdgeInsets(top: 80, left: 56, bottom: 80, right: 56)) {
var annotations: [MAAnnotation] = []
if let punchPointAnnotation { annotations.append(punchPointAnnotation) }
if let selectedAnnotation { annotations.append(selectedAnnotation) }
if let userLocation = mapView.userLocation,
let location = userLocation.location,
CLLocationCoordinate2DIsValid(location.coordinate) {
annotations.append(userLocation)
}
guard !annotations.isEmpty else { return }
if annotations.count == 1, let annotation = annotations.first {
setCenter(annotation.coordinate, zoomLevel: 16)
} else {
mapView.showAnnotations(annotations, edgePadding: edgePadding, animated: true)
}
}
private func fitPunchPointAndUserLocation() {
guard fitWithUserLocation else { return }
fitAllMarkers(edgePadding: UIEdgeInsets(top: 80, left: 50, bottom: 80, right: 50))
}
func mapView(_ mapView: MAMapView!, viewFor annotation: MAAnnotation!) -> MAAnnotationView! {
if annotation is MAUserLocation { return nil }
let isOriginal = annotation === punchPointAnnotation
let reuseIdentifier = isOriginal ? "PunchPointImageMarker" : "PunchPointSelectedMarker"
let annotationView = mapView.dequeueReusableAnnotationView(withIdentifier: reuseIdentifier)
?? MAAnnotationView(annotation: annotation, reuseIdentifier: reuseIdentifier)
annotationView?.annotation = annotation
annotationView?.canShowCallout = false
annotationView?.centerOffset = CGPoint(x: 0, y: -12)
if isOriginal, let punchPointImageURL {
annotationView?.image = UIImage(named: "punch_point_marker")
KingfisherManager.shared.retrieveImage(with: punchPointImageURL) { result in
guard case let .success(value) = result else { return }
Task { @MainActor in
guard annotationView?.annotation === annotation else { return }
annotationView?.image = Self.roundedMarkerImage(value.image)
}
}
} else {
annotationView?.image = UIImage(named: "punch_point_marker")
}
return annotationView
}
func mapView(_ mapView: MAMapView!, didUpdate userLocation: MAUserLocation!, updatingLocation: Bool) {
guard updatingLocation, userLocation.location != nil else { return }
fitPunchPointAndUserLocation()
}
private static func roundedMarkerImage(_ source: UIImage) -> UIImage {
let size = CGSize(width: 40, height: 40)
return UIGraphicsImageRenderer(size: size).image { _ in
UIBezierPath(roundedRect: CGRect(origin: .zero, size: size), cornerRadius: 6).addClip()
source.draw(in: CGRect(origin: .zero, size: size))
}
}
func mapView(_ mapView: MAMapView!, didSingleTappedAt coordinate: CLLocationCoordinate2D) {
onMapTap?(coordinate)
}
func mapView(_ mapView: MAMapView!, didTouchPois pois: [Any]!) {
guard let poi = pois.first as? MATouchPoi else { return }
onMapTap?(poi.coordinate)
}
}
/// 打卡点地图控制按钮。
/// 地图悬浮控制按钮。
final class PunchPointMapControlButton: UIButton {
init(symbol: String) {
init(assetName: String) {
super.init(frame: .zero)
setImage(UIImage(systemName: symbol), for: .normal)
tintColor = AppColor.textPrimary
setImage(UIImage(named: assetName), for: .normal)
backgroundColor = .white
layer.cornerRadius = 12
clipsToBounds = true
imageView?.contentMode = .scaleAspectFit
accessibilityLabel = switch assetName {
case "punch_point_zoom_in": "放大地图"
case "punch_point_zoom_out": "缩小地图"
default: "定位当前位置"
}
}
@available(*, unavailable)
@ -479,20 +641,46 @@ final class PunchPointMapControlButton: UIButton {
/// 打卡点只读字段。
/// 详情页只读字段块。
final class PunchPointReadOnlyField: UIView {
init(title: String, value: String, multiline: Bool = false) {
init(title: String, value: String, multiline: Bool = false, showsLocationIcon: Bool = false) {
super.init(frame: .zero)
let stack = UIStackView()
stack.axis = .vertical
stack.spacing = 8
let titleLabel = UILabel()
titleLabel.attributedText = Self.requiredTitle(title)
let valueContainer = UIView()
valueContainer.backgroundColor = UIColor(hex: 0xF4F4F4)
valueContainer.layer.cornerRadius = 8
let valueLabel = UILabel()
valueLabel.text = value.nonEmptyTrimmed ?? "--"
valueLabel.font = .systemFont(ofSize: 14, weight: .medium)
valueLabel.textColor = AppColor.textPrimary
valueLabel.font = .systemFont(ofSize: 14)
valueLabel.textColor = UIColor(hex: 0x4B5563)
valueLabel.numberOfLines = multiline ? 0 : 2
stack.addArrangedSubview(titleLabel)
stack.addArrangedSubview(valueLabel)
stack.addArrangedSubview(valueContainer)
valueContainer.addSubview(valueLabel)
if showsLocationIcon {
let icon = UIImageView(image: UIImage(named: "punch_point_location"))
icon.contentMode = .scaleAspectFit
valueContainer.addSubview(icon)
icon.snp.makeConstraints { make in
make.trailing.equalToSuperview().inset(12)
make.centerY.equalToSuperview()
make.size.equalTo(20)
}
valueLabel.snp.makeConstraints { make in
make.top.bottom.equalToSuperview().inset(12)
make.leading.equalToSuperview().offset(12)
make.trailing.lessThanOrEqualTo(icon.snp.leading).offset(-8)
}
} else {
valueLabel.snp.makeConstraints { make in
make.edges.equalToSuperview().inset(UIEdgeInsets(top: 12, left: 12, bottom: 12, right: 12))
}
}
valueContainer.snp.makeConstraints { make in
make.height.greaterThanOrEqualTo(multiline ? 72 : 46)
}
addSubview(stack)
stack.snp.makeConstraints { make in
make.edges.equalToSuperview()

95
suixinkan/UI/PunchPoint/PunchPointFormViewController.swift
View File

@ -17,9 +17,9 @@ final class PunchPointFormViewController: BaseViewController {
private let mapView = PunchPointMapView()
private let zoomStack = UIStackView()
private let zoomInButton = PunchPointMapControlButton(symbol: "plus")
private let zoomOutButton = PunchPointMapControlButton(symbol: "minus")
private let locateButton = PunchPointMapControlButton(symbol: "location.fill")
private let zoomInButton = PunchPointMapControlButton(assetName: "punch_point_zoom_in")
private let zoomOutButton = PunchPointMapControlButton(assetName: "punch_point_zoom_out")
private let locateButton = PunchPointMapControlButton(assetName: "punch_point_map_location")
private let cardView = UIView()
private let scrollView = UIScrollView()
private let formStack = UIStackView()
@ -105,11 +105,11 @@ final class PunchPointFormViewController: BaseViewController {
}
zoomStack.snp.makeConstraints { make in
make.trailing.equalToSuperview().inset(16)
make.bottom.equalTo(cardView.snp.top).offset(-16)
make.bottom.equalTo(locateButton.snp.top).offset(-12)
}
locateButton.snp.makeConstraints { make in
make.trailing.equalToSuperview().inset(16)
make.bottom.equalTo(zoomStack.snp.top).offset(-12)
make.bottom.equalTo(cardView.snp.top).offset(-16)
make.size.equalTo(40)
}
zoomInButton.snp.makeConstraints { make in
@ -148,12 +148,11 @@ final class PunchPointFormViewController: BaseViewController {
Task { @MainActor in self?.applyViewModel() }
}
viewModel.onShowMessage = { [weak self] message in
Task { @MainActor in self?.showToast(message) }
Task { @MainActor in self?.handleMessage(message) }
}
viewModel.onCoordinateChange = { [weak self] coordinate in
Task { @MainActor in
self?.mapView.updateMarker(coordinate: coordinate)
self?.mapView.setCenter(coordinate, zoomLevel: 17)
self?.applyMapCoordinate(coordinate)
}
}
viewModel.onSubmitSuccess = { [weak self] in
@ -232,6 +231,39 @@ final class PunchPointFormViewController: BaseViewController {
return PunchPointImageState(data: data, fileName: fileName)
}
@MainActor
private func handleMessage(_ message: String) {
guard message.contains("定位权限未授予") else {
showToast(message)
return
}
let alert = UIAlertController(title: "无法定位", message: message, preferredStyle: .alert)
alert.addAction(UIAlertAction(title: "取消", style: .cancel))
alert.addAction(UIAlertAction(title: "去设置", style: .default) { _ in
guard let url = URL(string: UIApplication.openSettingsURLString) else { return }
UIApplication.shared.open(url)
})
present(alert, animated: true)
}
@MainActor
private func applyMapCoordinate(_ coordinate: CLLocationCoordinate2D) {
if let initialDetail, let original = initialDetail.coordinate {
mapView.updatePunchPointMarker(
coordinate: original,
imageURL: initialDetail.guideImages.first
)
let isOriginal = abs(original.latitude - coordinate.latitude) < 0.000_001
&& abs(original.longitude - coordinate.longitude) < 0.000_001
mapView.updateSelectedMarker(coordinate: isOriginal ? nil : coordinate)
mapView.fitAllMarkers()
} else {
mapView.updatePunchPointMarker(coordinate: nil)
mapView.updateSelectedMarker(coordinate: coordinate)
mapView.setCenter(coordinate, zoomLevel: 17)
}
}
private func updateUploadDialog(_ state: PunchPointUploadDialogState?) {
guard let state else {
progressAlert?.dismiss(animated: true)
@ -329,13 +361,13 @@ private final class PunchPointTextFieldView: UIView {
super.init(frame: .zero)
titleLabel.attributedText = Self.requiredTitle(title)
textField.placeholder = placeholder
textField.font = .systemFont(ofSize: 14)
textField.font = .systemFont(ofSize: 15)
textField.textColor = AppColor.textPrimary
textField.backgroundColor = .white
textField.layer.cornerRadius = 8
textField.layer.borderColor = AppColor.border.cgColor
textField.layer.borderWidth = 1
textField.leftView = UIView(frame: CGRect(x: 0, y: 0, width: 12, height: 44))
textField.leftView = UIView(frame: CGRect(x: 0, y: 0, width: 12, height: 46))
textField.leftViewMode = .always
addSubview(titleLabel)
addSubview(textField)
@ -345,7 +377,7 @@ private final class PunchPointTextFieldView: UIView {
textField.snp.makeConstraints { make in
make.top.equalTo(titleLabel.snp.bottom).offset(8)
make.leading.trailing.bottom.equalToSuperview()
make.height.equalTo(44)
make.height.equalTo(46)
}
textField.addTarget(self, action: #selector(textChanged), for: .editingChanged)
}
@ -395,10 +427,11 @@ private final class PunchPointCoordinateFieldView: UIView {
container.layer.borderWidth = 1
container.layer.borderColor = AppColor.border.cgColor
valueLabel.text = placeholder
valueLabel.font = .systemFont(ofSize: 14)
valueLabel.font = .systemFont(ofSize: 15)
valueLabel.textColor = UIColor(hex: 0x999999)
locateButton.setImage(UIImage(systemName: "location.fill"), for: .normal)
locateButton.tintColor = AppColor.textPrimary
locateButton.setImage(UIImage(named: "punch_point_location"), for: .normal)
locateButton.imageView?.contentMode = .scaleAspectFit
locateButton.accessibilityLabel = "定位打卡点坐标"
addSubview(titleLabel)
addSubview(container)
container.addSubview(valueLabel)
@ -409,7 +442,7 @@ private final class PunchPointCoordinateFieldView: UIView {
container.snp.makeConstraints { make in
make.top.equalTo(titleLabel.snp.bottom).offset(8)
make.leading.trailing.bottom.equalToSuperview()
make.height.equalTo(44)
make.height.equalTo(46)
}
valueLabel.snp.makeConstraints { make in
make.leading.equalToSuperview().offset(12)
@ -457,7 +490,7 @@ private final class PunchPointTextViewFieldView: UIView, UITextViewDelegate {
titleLabel.text = title
titleLabel.font = .systemFont(ofSize: 14, weight: .medium)
titleLabel.textColor = UIColor(hex: 0x333333)
textView.font = .systemFont(ofSize: 14)
textView.font = .systemFont(ofSize: 15)
textView.textColor = AppColor.textPrimary
textView.layer.cornerRadius = 8
textView.layer.borderWidth = 1
@ -476,7 +509,7 @@ private final class PunchPointTextViewFieldView: UIView, UITextViewDelegate {
textView.snp.makeConstraints { make in
make.top.equalTo(titleLabel.snp.bottom).offset(8)
make.leading.trailing.bottom.equalToSuperview()
make.height.equalTo(92)
make.height.equalTo(100)
}
placeholderLabel.snp.makeConstraints { make in
make.top.equalToSuperview().offset(10)
@ -575,7 +608,8 @@ private final class PunchPointImageGridView: UIView {
/// 打卡点图片缩略图。
private final class PunchPointImageThumbView: UIControl {
private let imageView = UIImageView()
private let addIcon = UIImageView(image: UIImage(systemName: "plus"))
private let addIcon = UIImageView(image: UIImage(named: "punch_point_image_add"))
private let addLabel = UILabel()
private let deleteButton = UIButton(type: .system)
private let overlayLabel = UILabel()
var onAdd: (() -> Void)?
@ -586,26 +620,35 @@ private final class PunchPointImageThumbView: UIControl {
super.init(frame: frame)
layer.cornerRadius = 8
clipsToBounds = true
backgroundColor = .white
backgroundColor = UIColor(hex: 0xF4F4F4)
imageView.contentMode = .scaleAspectFill
imageView.clipsToBounds = true
addIcon.tintColor = AppColor.primary
deleteButton.setImage(UIImage(systemName: "xmark.circle.fill"), for: .normal)
deleteButton.tintColor = .white
addLabel.text = "点击上传"
addLabel.font = .systemFont(ofSize: 12)
addLabel.textColor = UIColor(hex: 0xB6BECA)
addLabel.textAlignment = .center
deleteButton.setImage(UIImage(named: "punch_point_image_delete"), for: .normal)
deleteButton.accessibilityLabel = "删除图片"
overlayLabel.font = .systemFont(ofSize: 14, weight: .medium)
overlayLabel.textColor = .white
overlayLabel.textAlignment = .center
overlayLabel.backgroundColor = UIColor.black.withAlphaComponent(0.45)
addSubview(imageView)
addSubview(addIcon)
addSubview(addLabel)
addSubview(deleteButton)
addSubview(overlayLabel)
imageView.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
addIcon.snp.makeConstraints { make in
make.center.equalToSuperview()
make.size.equalTo(28)
make.centerX.equalToSuperview()
make.centerY.equalToSuperview().offset(-8)
make.size.equalTo(24)
}
addLabel.snp.makeConstraints { make in
make.top.equalTo(addIcon.snp.bottom).offset(2)
make.centerX.equalToSuperview()
}
deleteButton.snp.makeConstraints { make in
make.top.trailing.equalToSuperview().inset(4)
@ -624,18 +667,22 @@ private final class PunchPointImageThumbView: UIControl {
}
func applyAdd() {
accessibilityLabel = "点击上传图片"
layer.borderColor = UIColor(hex: 0xE5E7EB).cgColor
layer.borderWidth = 1
imageView.image = nil
imageView.kf.cancelDownloadTask()
addIcon.isHidden = false
addLabel.isHidden = false
deleteButton.isHidden = true
overlayLabel.isHidden = true
}
func apply(item: PunchPointImageState) {
accessibilityLabel = item.errorMessage == nil ? "打卡点图片" : "图片上传失败，点击重试"
layer.borderWidth = 0
addIcon.isHidden = true
addLabel.isHidden = true
deleteButton.isHidden = item.isUploading
if let urlText = item.previewURL, let url = URL(string: urlText), !urlText.isEmpty {
imageView.kf.setImage(with: url)

274
suixinkan/UI/PunchPoint/PunchPointListViewController.swift
View File

@ -15,7 +15,7 @@ final class PunchPointListViewController: BaseViewController {
private let filterContainer = UIView()
private let filterButton = UIButton(type: .system)
private let filterTitleLabel = UILabel()
private let filterChevronView = UIImageView(image: UIImage(systemName: "chevron.down"))
private let filterChevronView = UIImageView(image: UIImage(named: "punch_point_dropdown"))
private let filterDropdownView = UIView()
private let filterDropdownStack = UIStackView()
private let tableView = UITableView(frame: .zero, style: .plain)
@ -43,18 +43,22 @@ final class PunchPointListViewController: BaseViewController {
override func setupNavigationBar() {
title = "打卡点列表"
navigationController?.navigationBar.titleTextAttributes = [
.font: UIFont.systemFont(ofSize: 18, weight: .regular),
.foregroundColor: UIColor(hex: 0x333333),
]
}
override func setupUI() {
view.backgroundColor = AppColor.pageBackground
view.backgroundColor = UIColor(hex: 0xF4F4F4)
filterContainer.backgroundColor = .white
filterButton.backgroundColor = UIColor(hex: 0xF5F5F5)
filterButton.layer.cornerRadius = 8
filterButton.accessibilityLabel = "筛选打卡点状态"
filterTitleLabel.text = PunchPointFilterType.all.title
filterTitleLabel.font = .systemFont(ofSize: 14)
filterTitleLabel.textColor = AppColor.textPrimary
filterChevronView.tintColor = AppColor.textSecondary
filterChevronView.contentMode = .scaleAspectFit
filterDropdownView.backgroundColor = .white
@ -66,7 +70,7 @@ final class PunchPointListViewController: BaseViewController {
filterDropdownView.isHidden = true
filterDropdownStack.axis = .vertical
tableView.backgroundColor = AppColor.pageBackground
tableView.backgroundColor = UIColor(hex: 0xF4F4F4)
tableView.separatorStyle = .none
tableView.delegate = self
tableView.rowHeight = UITableView.automaticDimension
@ -91,6 +95,7 @@ final class PunchPointListViewController: BaseViewController {
addButton.titleLabel?.font = .systemFont(ofSize: 16, weight: .medium)
addButton.backgroundColor = AppColor.primary
addButton.layer.cornerRadius = 8
addButton.accessibilityLabel = "添加打卡点"
emptyView.isHidden = true
emptyView.onAction = { [weak self] in self?.addTapped() }
@ -166,6 +171,9 @@ final class PunchPointListViewController: BaseViewController {
viewModel.onShowQRCode = { [weak self] url in
Task { @MainActor in self?.showQRCodeDialog(url: url) }
}
viewModel.onBeginDeleteAnimation = { [weak self] id in
Task { @MainActor in self?.animateRemoval(id: id) }
}
tableView.refreshControl?.addTarget(self, action: #selector(refreshPulled), for: .valueChanged)
filterButton.addTarget(self, action: #selector(filterTapped), for: .touchUpInside)
addButton.addTarget(self, action: #selector(addTapped), for: .touchUpInside)
@ -222,35 +230,49 @@ final class PunchPointListViewController: BaseViewController {
}
private func confirmDelete(_ item: PunchPointItem) {
let alert = UIAlertController(
let alert = PunchPointMaterialDialogController.confirmation(
title: "删除打卡点",
message: "确定删除\(item.name)打卡点吗？",
preferredStyle: .alert
)
alert.addAction(UIAlertAction(title: "取消", style: .cancel))
alert.addAction(UIAlertAction(title: "确定", style: .destructive) { [weak self] _ in
guard let self else { return }
Task { await self.viewModel.delete(item: item, api: self.api) }
})
confirmTitle: "确定",
onConfirm: { [weak self] in
self?.dismiss(animated: true)
guard let self else { return }
Task { await self.viewModel.delete(item: item, api: self.api) }
}
) { [weak self] in
self?.dismiss(animated: true)
}
present(alert, animated: true)
}
@MainActor
private func animateRemoval(id: Int64) {
guard let index = viewModel.items.firstIndex(where: { $0.id == id }) else {
viewModel.completeDeleteAnimation(id: id)
return
}
let indexPath = IndexPath(row: index, section: 0)
guard let cell = tableView.cellForRow(at: indexPath) else {
viewModel.completeDeleteAnimation(id: id)
return
}
UIView.animate(
withDuration: 0.3,
delay: 0,
options: [.curveEaseIn, .allowUserInteraction]
) {
cell.contentView.transform = CGAffineTransform(translationX: self.tableView.bounds.width, y: 0)
cell.contentView.alpha = 0
} completion: { [weak self] _ in
guard let self else { return }
self.viewModel.completeDeleteAnimation(id: id)
}
}
private func showQRCodeDialog(url: String) {
let controller = UIAlertController(title: nil, message: "\n\n\n\n\n\n\n\n", preferredStyle: .alert)
let imageView = UIImageView()
imageView.contentMode = .scaleAspectFill
imageView.clipsToBounds = true
imageView.layer.cornerRadius = 12
if let imageURL = URL(string: url) {
imageView.kf.setImage(with: imageURL)
let controller = PunchPointMaterialDialogController.qrCode(url: url) { [weak self] in
self?.dismiss(animated: true)
}
controller.view.addSubview(imageView)
imageView.snp.makeConstraints { make in
make.centerX.equalToSuperview()
make.top.equalToSuperview().offset(52)
make.size.equalTo(180)
}
controller.addAction(UIAlertAction(title: "确定", style: .default))
present(controller, animated: true)
}
@ -294,7 +316,7 @@ private final class PunchPointListCell: UITableViewCell {
private let operatingTag = PunchPointStatusChip()
private let creatorLabel = UILabel()
private let createdAtLabel = UILabel()
private let locationIcon = UIImageView(image: UIImage(systemName: "mappin.and.ellipse"))
private let locationIcon = UIImageView(image: UIImage(named: "punch_point_location"))
private let addressLabel = UILabel()
private let reviewTag = PunchPointStatusChip()
private let auditTimeLabel = UILabel()
@ -324,14 +346,14 @@ private final class PunchPointListCell: UITableViewCell {
$0.font = .systemFont(ofSize: 12)
$0.textColor = AppColor.textSecondary
}
locationIcon.tintColor = UIColor(hex: 0x4B5563)
locationIcon.contentMode = .scaleAspectFit
addressLabel.font = .systemFont(ofSize: 12)
addressLabel.textColor = UIColor(hex: 0x4B5563)
addressLabel.numberOfLines = 2
qrButton.setImage(UIImage(systemName: "qrcode"), for: .normal)
qrButton.tintColor = AppColor.textPrimary
deleteButton.setImage(UIImage(systemName: "trash"), for: .normal)
deleteButton.tintColor = AppColor.textPrimary
qrButton.setImage(UIImage(named: "punch_point_qr"), for: .normal)
deleteButton.setImage(UIImage(named: "punch_point_delete"), for: .normal)
qrButton.accessibilityLabel = "查看二维码"
deleteButton.accessibilityLabel = "删除打卡点"
contentView.addSubview(cardView)
[coverImageView, nameLabel, operatingTag, creatorLabel, createdAtLabel, locationIcon, addressLabel, reviewTag, auditTimeLabel, qrButton, deleteButton].forEach(cardView.addSubview)
@ -341,7 +363,8 @@ private final class PunchPointListCell: UITableViewCell {
make.leading.trailing.equalToSuperview().inset(15)
}
coverImageView.snp.makeConstraints { make in
make.top.leading.equalToSuperview().offset(16)
make.top.equalToSuperview().offset(14)
make.leading.equalToSuperview().offset(16)
make.size.equalTo(128)
}
nameLabel.snp.makeConstraints { make in
@ -402,17 +425,19 @@ private final class PunchPointListCell: UITableViewCell {
}
func apply(item: PunchPointItem) {
contentView.transform = .identity
contentView.alpha = 1
nameLabel.text = item.name
creatorLabel.text = "负责人:\(item.creator?.nonEmptyTrimmed ?? "--")"
createdAtLabel.text = "创建时间:\(item.createdAt)"
addressLabel.text = item.displayAddress.nonEmptyTrimmed ?? "--"
auditTimeLabel.text = "审核时间：\(item.auditTime?.nonEmptyTrimmed ?? "--")"
operatingTag.apply(text: item.statusLabel.nonEmptyTrimmed ?? "--", status: item.status)
reviewTag.apply(text: item.statusLabel.nonEmptyTrimmed ?? "--", status: item.status)
operatingTag.apply(PunchPointDisplayFormatter.operatingStatus(item.status), compact: true)
reviewTag.apply(PunchPointDisplayFormatter.auditStatus(item.status), compact: false)
if let url = item.guideImages.first.flatMap(URL.init(string:)) {
coverImageView.kf.setImage(with: url, placeholder: UIImage(systemName: "photo"))
coverImageView.kf.setImage(with: url, placeholder: UIImage(named: "SplashLogo"))
} else {
coverImageView.image = UIImage(systemName: "photo")
coverImageView.image = UIImage(named: "SplashLogo")
}
}
@ -432,14 +457,12 @@ final class PunchPointStatusChip: UIView {
override init(frame: CGRect) {
super.init(frame: frame)
layer.cornerRadius = 10
layer.cornerRadius = 4
clipsToBounds = true
label.font = .systemFont(ofSize: 12, weight: .medium)
label.font = .systemFont(ofSize: 12)
label.textAlignment = .center
addSubview(label)
label.snp.makeConstraints { make in
make.edges.equalToSuperview().inset(UIEdgeInsets(top: 3, left: 8, bottom: 3, right: 8))
}
label.snp.makeConstraints { make in make.edges.equalToSuperview() }
}
@available(*, unavailable)
@ -448,11 +471,15 @@ final class PunchPointStatusChip: UIView {
}
/// 应用标签文案和状态色。
func apply(text: String, status: Int) {
label.text = text
let colors = PunchPointDisplayFormatter.statusColors(status)
backgroundColor = UIColor(hex: colors.background)
label.textColor = UIColor(hex: colors.text)
func apply(_ presentation: PunchPointStatusPresentation, compact: Bool = false) {
label.text = presentation.title
backgroundColor = UIColor(hex: presentation.backgroundColor)
label.textColor = UIColor(hex: presentation.textColor)
label.snp.remakeConstraints { make in
make.edges.equalToSuperview().inset(
UIEdgeInsets(top: compact ? 2 : 4, left: compact ? 8 : 10, bottom: compact ? 2 : 4, right: compact ? 8 : 10)
)
}
}
}
@ -465,11 +492,11 @@ private final class PunchPointEmptyView: UIView {
override init(frame: CGRect) {
super.init(frame: frame)
titleLabel.text = "暂无打卡点"
titleLabel.font = .systemFont(ofSize: 15)
titleLabel.text = "暂无打卡点，点击下方按钮即可添加"
titleLabel.font = .systemFont(ofSize: 14)
titleLabel.textColor = AppColor.textSecondary
titleLabel.textAlignment = .center
button.setTitle("添加打卡点", for: .normal)
button.setTitle("立即添加", for: .normal)
button.setTitleColor(.white, for: .normal)
button.titleLabel?.font = .systemFont(ofSize: 14, weight: .medium)
button.backgroundColor = AppColor.primary
@ -482,7 +509,7 @@ private final class PunchPointEmptyView: UIView {
button.snp.makeConstraints { make in
make.top.equalTo(titleLabel.snp.bottom).offset(12)
make.centerX.bottom.equalToSuperview()
make.width.equalTo(128)
make.width.greaterThanOrEqualTo(96)
make.height.equalTo(40)
}
button.addTarget(self, action: #selector(actionTapped), for: .touchUpInside)
@ -498,6 +525,151 @@ private final class PunchPointEmptyView: UIView {
}
}
/// Android Material3 风格的打卡点确认与二维码弹窗。
private final class PunchPointMaterialDialogController: UIViewController {
private enum Content {
case confirmation(title: String, message: String, confirmTitle: String)
case qrCode(url: String)
}
private let content: Content
private let onConfirm: () -> Void
private let onCancel: (() -> Void)?
private init(content: Content, onConfirm: @escaping () -> Void, onCancel: (() -> Void)? = nil) {
self.content = content
self.onConfirm = onConfirm
self.onCancel = onCancel
super.init(nibName: nil, bundle: nil)
modalPresentationStyle = .overFullScreen
modalTransitionStyle = .crossDissolve
}
@available(*, unavailable)
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
static func confirmation(
title: String,
message: String,
confirmTitle: String,
onConfirm: @escaping () -> Void,
onCancel: @escaping () -> Void
) -> PunchPointMaterialDialogController {
PunchPointMaterialDialogController(
content: .confirmation(title: title, message: message, confirmTitle: confirmTitle),
onConfirm: onConfirm,
onCancel: onCancel
)
}
static func qrCode(url: String, onConfirm: @escaping () -> Void) -> PunchPointMaterialDialogController {
PunchPointMaterialDialogController(content: .qrCode(url: url), onConfirm: onConfirm)
}
override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = UIColor.black.withAlphaComponent(0.32)
view.accessibilityViewIsModal = true
let dialog = UIView()
dialog.backgroundColor = .white
dialog.layer.cornerRadius = 28
dialog.clipsToBounds = true
view.addSubview(dialog)
dialog.snp.makeConstraints { make in
make.center.equalToSuperview()
make.leading.greaterThanOrEqualToSuperview().offset(32)
make.trailing.lessThanOrEqualToSuperview().offset(-32)
make.width.lessThanOrEqualTo(320)
}
switch content {
case let .confirmation(title, message, confirmTitle):
configureConfirmation(dialog: dialog, title: title, message: message, confirmTitle: confirmTitle)
case let .qrCode(url):
configureQRCode(dialog: dialog, url: url)
}
}
private func configureConfirmation(dialog: UIView, title: String, message: String, confirmTitle: String) {
let titleLabel = UILabel()
titleLabel.text = title
titleLabel.font = .systemFont(ofSize: 16, weight: .medium)
titleLabel.textColor = UIColor(hex: 0x333333)
let messageLabel = UILabel()
messageLabel.text = message
messageLabel.font = .systemFont(ofSize: 14)
messageLabel.textColor = UIColor(hex: 0x666666)
messageLabel.numberOfLines = 0
let cancel = textButton(title: "取消", color: UIColor(hex: 0x666666), action: #selector(cancelTapped))
let confirm = textButton(title: confirmTitle, color: AppColor.primary, action: #selector(confirmTapped))
let actions = UIStackView(arrangedSubviews: [UIView(), cancel, confirm])
actions.axis = .horizontal
actions.spacing = 8
[titleLabel, messageLabel, actions].forEach(dialog.addSubview)
titleLabel.snp.makeConstraints { make in
make.top.equalToSuperview().offset(24)
make.leading.trailing.equalToSuperview().inset(24)
}
messageLabel.snp.makeConstraints { make in
make.top.equalTo(titleLabel.snp.bottom).offset(16)
make.leading.trailing.equalToSuperview().inset(24)
}
actions.snp.makeConstraints { make in
make.top.equalTo(messageLabel.snp.bottom).offset(16)
make.leading.trailing.equalToSuperview().inset(16)
make.bottom.equalToSuperview().inset(12)
make.height.equalTo(44)
}
}
private func configureQRCode(dialog: UIView, url: String) {
let imageView = UIImageView()
imageView.contentMode = .scaleAspectFill
imageView.clipsToBounds = true
imageView.layer.cornerRadius = 12
if let imageURL = URL(string: url) {
imageView.kf.setImage(with: imageURL)
}
let confirm = textButton(title: "确定", color: AppColor.primary, action: #selector(confirmTapped))
dialog.addSubview(imageView)
dialog.addSubview(confirm)
imageView.snp.makeConstraints { make in
make.top.equalToSuperview().offset(32)
make.centerX.equalToSuperview()
make.size.equalTo(180)
make.leading.greaterThanOrEqualToSuperview().offset(32)
}
confirm.snp.makeConstraints { make in
make.top.equalTo(imageView.snp.bottom).offset(12)
make.trailing.equalToSuperview().inset(16)
make.bottom.equalToSuperview().inset(12)
make.width.equalTo(64)
make.height.equalTo(44)
}
}
private func textButton(title: String, color: UIColor, action: Selector) -> UIButton {
let button = UIButton(type: .system)
button.setTitle(title, for: .normal)
button.setTitleColor(color, for: .normal)
button.titleLabel?.font = .systemFont(ofSize: 14, weight: .medium)
button.addTarget(self, action: action, for: .touchUpInside)
return button
}
@objc private func confirmTapped() {
onConfirm()
}
@objc private func cancelTapped() {
onCancel?()
}
}
private extension String {
var nonEmptyTrimmed: String? {
let text = trimmingCharacters(in: .whitespacesAndNewlines)