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

Advance UIKit rewrite with AMap integration and core UI modules.

Browse Source 
Integrate高德 SDK with simulator-safe build flags, add map views for operating area and punch points, refactor main tabs and key feature screens to UIKit with Diffable lists, and document Swift concurrency defaults in AGENTS.md.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
汉秋
2026-06-26 15:16:12 +08:00
parent 9edf993432
commit d99a5b1bf8
124 changed files with 5195 additions and 1536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
suixinkan_ios/Features/Projects/ViewControllers/ProjectViewControllers.swift
View File

@ -11,6 +11,7 @@ import UIKit
final class ProjectManagementViewController: ModuleTableViewController {
private let viewModel = ProjectManagementViewModel()
/// 视图加载完成后的 UI 初始化与数据绑定。
override func viewDidLoad() {
title = "项目管理"
navigationItem.rightBarButtonItem = UIBarButtonItem(
@ -23,13 +24,16 @@ final class ProjectManagementViewController: ModuleTableViewController {
wireViewModel(viewModel) { }
}
/// table行Count相关逻辑。
override func tableRowCount() -> Int { viewModel.items.count }
/// 配置Cell展示内容。
override func configureCell(_ cell: TitleSubtitleTableViewCell, at indexPath: IndexPath) {
let item = viewModel.items[indexPath.row]
cell.configure(title: item.name, subtitle: item.statusName, detail: "¥\(item.price)")
}
/// didSelectTableRow 回调处理。
override func didSelectTableRow(at indexPath: IndexPath) {
let item = viewModel.items[indexPath.row]
navigationController?.pushViewController(
@ -38,10 +42,12 @@ final class ProjectManagementViewController: ModuleTableViewController {
)
}
/// 刷新Content。
override func reloadContent() async {
await viewModel.reload(api: services.projectAPI, scenicId: services.currentScenicId)
}
/// 创建项目。
@objc private func createProject() {
navigationController?.pushViewController(
ProjectEditorViewController(projectId: nil),
@ -56,19 +62,23 @@ extension ProjectManagementViewModel: ViewModelBindable {}
final class StoreProjectManagementViewController: ModuleTableViewController {
private let viewModel = StoreProjectManagementViewModel()
/// 视图加载完成后的 UI 初始化与数据绑定。
override func viewDidLoad() {
title = "店铺项目"
super.viewDidLoad()
wireViewModel(viewModel) { }
}
/// table行Count相关逻辑。
override func tableRowCount() -> Int { viewModel.filteredItems.count }
/// 配置Cell展示内容。
override func configureCell(_ cell: TitleSubtitleTableViewCell, at indexPath: IndexPath) {
let item = viewModel.filteredItems[indexPath.row]
cell.configure(title: item.name, subtitle: item.typeName, detail: "¥\(item.price)")
}
/// didSelectTableRow 回调处理。
override func didSelectTableRow(at indexPath: IndexPath) {
let item = viewModel.filteredItems[indexPath.row]
navigationController?.pushViewController(
@ -77,6 +87,7 @@ final class StoreProjectManagementViewController: ModuleTableViewController {
)
}
/// 刷新Content。
override func reloadContent() async {
await viewModel.reload(api: services.projectAPI, userId: services.userId)
}
@ -91,6 +102,7 @@ final class ProjectDetailViewController: ModuleTableViewController {
private let photographerViewModel = ProjectManagementViewModel()
private let storeViewModel = StoreProjectManagementViewModel()
/// 初始化实例。
init(projectId: Int, storeMode: Bool) {
self.projectId = projectId
self.storeMode = storeMode
@ -102,6 +114,7 @@ final class ProjectDetailViewController: ModuleTableViewController {
fatalError("init(coder:) has not been implemented")
}
/// 视图加载完成后的 UI 初始化与数据绑定。
override func viewDidLoad() {
title = "项目详情"
super.viewDidLoad()
@ -116,10 +129,12 @@ final class ProjectDetailViewController: ModuleTableViewController {
storeMode ? storeViewModel.selectedDetail : photographerViewModel.selectedDetail
}
/// table行Count相关逻辑。
override func tableRowCount() -> Int {
detail == nil ? 0 : 4
}
/// 配置Cell展示内容。
override func configureCell(_ cell: TitleSubtitleTableViewCell, at indexPath: IndexPath) {
guard let detail else { return }
switch indexPath.row {
@ -130,6 +145,7 @@ final class ProjectDetailViewController: ModuleTableViewController {
}
}
/// 刷新Content。
override func reloadContent() async {
if storeMode {
await storeViewModel.loadDetail(id: projectId, api: services.projectAPI)
@ -147,6 +163,7 @@ final class ProjectEditorViewController: ModuleTableViewController {
private let priceField = UITextField()
private let projectId: Int?
/// 初始化实例。
init(projectId: Int?) {
self.projectId = projectId
super.init(nibName: nil, bundle: nil)
@ -157,6 +174,7 @@ final class ProjectEditorViewController: ModuleTableViewController {
fatalError("init(coder:) has not been implemented")
}
/// 视图加载完成后的 UI 初始化与数据绑定。
override func viewDidLoad() {
title = projectId == nil ? "新建项目" : "编辑项目"
navigationItem.rightBarButtonItem = UIBarButtonItem(
@ -170,6 +188,7 @@ final class ProjectEditorViewController: ModuleTableViewController {
wireViewModel(viewModel) { [weak self] in self?.fillFormIfNeeded() }
}
/// 初始化Header相关 UI 或状态。
private func setupHeader() {
nameField.placeholder = "项目名称"
nameField.borderStyle = .roundedRect
@ -187,8 +206,10 @@ final class ProjectEditorViewController: ModuleTableViewController {
tableView.tableHeaderView = stack
}
/// table行Count相关逻辑。
override func tableRowCount() -> Int { 0 }
/// 刷新Content。
override func reloadContent() async {
guard let projectId else { return }
if let detail = try? await services.projectAPI.projectDetail(id: projectId) {
@ -197,12 +218,14 @@ final class ProjectEditorViewController: ModuleTableViewController {
}
}
/// 按需fill表单。
private func fillFormIfNeeded() {
if nameField.text?.isEmpty != false { nameField.text = viewModel.name }
if descriptionField.text?.isEmpty != false { descriptionField.text = viewModel.descriptionText }
if priceField.text?.isEmpty != false { priceField.text = viewModel.price }
}
/// save 业务逻辑。
@objc private func save() {
viewModel.name = nameField.text ?? ""
viewModel.descriptionText = descriptionField.text ?? ""
@ -231,6 +254,7 @@ final class StoreProjectEditorViewController: ModuleTableViewController {
private let viewModel = StoreProjectEditorViewModel(mode: .create)
private let nameField = UITextField()
/// 初始化实例。
init(projectId: Int?) {
super.init(nibName: nil, bundle: nil)
}
@ -240,6 +264,7 @@ final class StoreProjectEditorViewController: ModuleTableViewController {
fatalError("init(coder:) has not been implemented")
}
/// 视图加载完成后的 UI 初始化与数据绑定。
override func viewDidLoad() {
title = "店铺项目"
navigationItem.rightBarButtonItem = UIBarButtonItem(
@ -256,18 +281,22 @@ final class StoreProjectEditorViewController: ModuleTableViewController {
wireViewModel(viewModel) { }
}
/// table行Count相关逻辑。
override func tableRowCount() -> Int { viewModel.scenicList.count }
/// 配置Cell展示内容。
override func configureCell(_ cell: TitleSubtitleTableViewCell, at indexPath: IndexPath) {
let scenic = viewModel.scenicList[indexPath.row]
cell.configure(title: scenic.name, subtitle: viewModel.selectedScenicIds.contains(scenic.id) ? "已选择" : nil)
}
/// 刷新Content。
override func reloadContent() async {
guard let userId = Int(services.userId ?? "") else { return }
await viewModel.loadScenicList(api: services.projectAPI, userId: userId)
}
/// save 业务逻辑。
@objc private func save() {
viewModel.name = nameField.text ?? ""
Task {

12
suixinkan_ios/Features/Projects/ViewModels/ProjectViewModels.swift
View File

@ -130,6 +130,7 @@ final class ProjectManagementViewModel {
return value.isEmpty ? nil : value
}
/// 重置List状态。
private func resetList() {
items = []
loading = false
@ -139,6 +140,7 @@ final class ProjectManagementViewModel {
total = 0
}
/// sorted 业务逻辑。
private func sorted(_ values: [PhotographerProjectItem]) -> [PhotographerProjectItem] {
values.sorted { lhs, rhs in
if lhs.status != rhs.status { return lhs.status < rhs.status }
@ -146,6 +148,7 @@ final class ProjectManagementViewModel {
}
}
/// deduplicated 业务逻辑。
private func deduplicated(_ values: [PhotographerProjectItem]) -> [PhotographerProjectItem] {
var result: [Int: PhotographerProjectItem] = [:]
values.forEach { result[$0.id] = $0 }
@ -278,6 +281,7 @@ final class ProjectEditorViewModel {
return labels.isEmpty ? nil : labels
}
/// resolveCover链接相关逻辑。
private func resolveCoverURL(scenicId: Int, uploadService: any OSSUploadServing) async throws -> String {
if let coverImage {
return try await uploadService.uploadProjectImage(data: coverImage.data, fileName: coverImage.fileName, scenicId: scenicId) { [weak self] progress in
@ -287,6 +291,7 @@ final class ProjectEditorViewModel {
return existingCoverURL
}
/// resolveCarouselURLs相关逻辑。
private func resolveCarouselURLs(scenicId: Int, uploadService: any OSSUploadServing) async throws -> [String] {
var urls = existingCarouselURLs
for image in carouselImages {
@ -298,11 +303,13 @@ final class ProjectEditorViewModel {
return urls
}
/// 规范化dMoney格式。
private func normalizedMoney(_ value: String) -> String? {
let amount = Double(value.trimmingCharacters(in: .whitespacesAndNewlines)) ?? 0
return amount > 0 ? String(format: "%.2f", amount) : nil
}
/// 记录校验失败并返回 false。
private func fail(_ error: ProjectEditorError) -> Bool {
errorMessage = error.localizedDescription
return false
@ -511,6 +518,7 @@ final class StoreProjectEditorViewModel {
return nil
}
/// resolveCover链接相关逻辑。
private func resolveCoverURL(scenicId: Int, uploadService: any OSSUploadServing) async throws -> String {
if let coverImage {
return try await uploadService.uploadProjectImage(data: coverImage.data, fileName: coverImage.fileName, scenicId: scenicId) { _ in }
@ -518,6 +526,7 @@ final class StoreProjectEditorViewModel {
return existingCoverURL
}
/// resolveCarouselURLs相关逻辑。
private func resolveCarouselURLs(scenicId: Int, uploadService: any OSSUploadServing) async throws -> [String] {
var urls = existingCarouselURLs
for image in carouselImages {
@ -527,6 +536,7 @@ final class StoreProjectEditorViewModel {
return urls
}
/// 提交MultiPointProject。
private func submitMultiPointProject(
userId: Int,
api: any ProjectServing,
@ -586,6 +596,7 @@ final class StoreProjectEditorViewModel {
}
}
/// 提交OfflineProject。
private func submitOfflineProject(api: any ProjectServing, name: String, description: String, coverURL: String, carouselURLs: [String]) async throws {
let scenicId = selectedScenicIds.first ?? 0
let storeId = selectedStoreId ?? 0
@ -617,6 +628,7 @@ final class StoreProjectEditorViewModel {
}
}
/// 记录校验失败并返回 false。
private func fail(_ error: ProjectEditorError) -> Bool {
errorMessage = error.localizedDescription
return false