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

从 iOS 17 Observation 迁移至 iOS 16 兼容的 Combine 架构

Browse Source 
将最低部署版本降至 iOS 16，以 ObservableObject 替换 @Observable，新增导航与 UI 兼容层，并补充登录冒烟 UI 测试。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
汉秋
2026-06-26 10:16:35 +08:00
parent 0314033a7f
commit 703078352c
127 changed files with 2320 additions and 1465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
suixinkan/Features/ScenicPermission/API/ScenicPermissionAPI.swift
View File

@ -6,7 +6,7 @@
//
import Foundation
import Observation
import Combine
/// 景区权限模块服务协议，定义景区选择、权限申请和景区申请所需接口。
@MainActor
@ -34,10 +34,9 @@ protocol ScenicPermissionServing {
}
@MainActor
@Observable
/// 景区权限 API，封装景区选择和申请相关网络请求。
final class ScenicPermissionAPI {
@ObservationIgnored private let client: APIClient
private let client: APIClient
/// 初始化景区权限 API，并注入共享网络客户端。
init(client: APIClient) {

36
suixinkan/Features/ScenicPermission/ViewModels/PermissionApplyViewModel.swift
View File

@ -6,7 +6,7 @@
//
import Foundation
import Observation
import Combine
/// 权限申请角色选项实体，表示可申请的一个业务角色。
struct PermissionRoleOption: Equatable, Identifiable {
@ -31,21 +31,20 @@ struct ExistingRolePermissionInfo: Equatable, Identifiable {
}
@MainActor
@Observable
/// 权限申请 ViewModel，负责角色/景区选择和提交审核。
final class PermissionApplyViewModel {
var roleOptions: [PermissionRoleOption] = []
var selectedRoleId: Int?
var scenicOptions: [PermissionScenicOption] = []
var loadingScenics = false
var scenicLoadFailed = false
var scenicLoadFailureReason: String?
var submitting = false
var message: String?
final class PermissionApplyViewModel: ObservableObject {
@Published var roleOptions: [PermissionRoleOption] = []
@Published var selectedRoleId: Int?
@Published var scenicOptions: [PermissionScenicOption] = []
@Published var loadingScenics = false
@Published var scenicLoadFailed = false
@Published var scenicLoadFailureReason: String?
@Published var submitting = false
@Published var message: String?
private let initialPending: RoleApplyPendingResponse?
private var rolePermissions: [RolePermissionResponse] = []
private var selectedIds: Set<Int> = []
@Published private var rolePermissions: [RolePermissionResponse] = []
@Published private var selectedIds: Set<Int> = []
/// 初始化权限申请 ViewModel，可传入驳回申请用于编辑回填。
init(initialPending: RoleApplyPendingResponse? = nil) {
@ -181,13 +180,12 @@ final class PermissionApplyViewModel {
}
@MainActor
@Observable
/// 权限申请状态 ViewModel，负责读取审核中的或指定编号的权限申请。
final class PermissionApplyStatusViewModel {
var loading = false
var pending: RoleApplyPendingResponse?
var loadFailed = false
var loadFailureReason: String?
final class PermissionApplyStatusViewModel: ObservableObject {
@Published var loading = false
@Published var pending: RoleApplyPendingResponse?
@Published var loadFailed = false
@Published var loadFailureReason: String?
/// 加载权限申请状态；有申请编号时优先匹配编号，否则展示审核中或驳回记录。
func load(api: any ScenicPermissionServing, applyCode: String?) async {

41
suixinkan/Features/ScenicPermission/ViewModels/ScenicApplicationViewModel.swift
View File

@ -6,7 +6,7 @@
//
import Foundation
import Observation
import Combine
/// 景区申请本地图片草稿实体，表示尚未或正在上传的图片。
struct ScenicApplicationImageDraft: Equatable, Identifiable {
@ -29,27 +29,26 @@ struct ScenicApplicationImageDraft: Equatable, Identifiable {
}
@MainActor
@Observable
/// 景区申请 ViewModel，负责新增景区申请表单、图片上传和待审核记录回填。
final class ScenicApplicationViewModel {
var scenicName = ""
var imageURLs = ""
var localImages: [ScenicApplicationImageDraft] = []
var selectedProvince = ""
var selectedCity = ""
var coopType = 1
var remark = ""
var agreed = false
var submitting = false
var message: String?
var provinces: [ScenicAreaNode] = []
var cities: [ScenicAreaNode] = []
var pending: ScenicApplicationPendingResponse?
var loading = false
var loadFailed = false
var loadFailureReason: String?
var pendingLoadFailed = false
var pendingLoadFailureReason: String?
final class ScenicApplicationViewModel: ObservableObject {
@Published var scenicName = ""
@Published var imageURLs = ""
@Published var localImages: [ScenicApplicationImageDraft] = []
@Published var selectedProvince = ""
@Published var selectedCity = ""
@Published var coopType = 1
@Published var remark = ""
@Published var agreed = false
@Published var submitting = false
@Published var message: String?
@Published var provinces: [ScenicAreaNode] = []
@Published var cities: [ScenicAreaNode] = []
@Published var pending: ScenicApplicationPendingResponse?
@Published var loading = false
@Published var loadFailed = false
@Published var loadFailureReason: String?
@Published var pendingLoadFailed = false
@Published var pendingLoadFailureReason: String?
/// 返回当前申请是否只读；审核中的申请不可再次编辑提交。
var isReadOnly: Bool {

13
suixinkan/Features/ScenicPermission/ViewModels/ScenicSelectionViewModel.swift
View File

@ -7,7 +7,7 @@
import CoreLocation
import Foundation
import Observation
import Combine
/// 景区选择展示实体，表示列表中的一个可切换景区。
struct ScenicSelectionItem: Equatable, Identifiable {
@ -51,13 +51,12 @@ struct ScenicSelectionItem: Equatable, Identifiable {
}
@MainActor
@Observable
/// 景区选择 ViewModel，负责搜索、定位距离计算和切换景区持久化。
final class ScenicSelectionViewModel {
var searchQuery = ""
var currentLocationText = "定位后获取最近景区"
var locationWarning: String?
private(set) var items: [ScenicSelectionItem] = []
final class ScenicSelectionViewModel: ObservableObject {
@Published var searchQuery = ""
@Published var currentLocationText = "定位后获取最近景区"
@Published var locationWarning: String?
@Published private(set) var items: [ScenicSelectionItem] = []
/// 返回按搜索关键词过滤后的景区列表。
var filteredItems: [ScenicSelectionItem] {

10
suixinkan/Features/ScenicPermission/Views/PermissionApplyStatusView.swift
View File

@ -9,8 +9,8 @@ import SwiftUI
/// 权限申请状态页面，展示审核中、通过或驳回的角色景区权限申请。
struct PermissionApplyStatusView: View {
@Environment(ScenicPermissionAPI.self) private var scenicPermissionAPI
@State private var viewModel = PermissionApplyStatusViewModel()
@Environment(\.scenicPermissionAPI) private var scenicPermissionAPI
@StateObject private var viewModel = PermissionApplyStatusViewModel()
@State private var editingPending: RoleApplyPendingResponse?
let applyCode: String?
@ -27,7 +27,7 @@ struct PermissionApplyStatusView: View {
roleCard(pending)
scenicCard(pending)
} else if viewModel.loadFailed {
ContentUnavailableView(
AppContentUnavailableView(
"申请状态加载失败",
systemImage: "exclamationmark.triangle",
description: Text(viewModel.loadFailureReason ?? "请检查网络后重试")
@ -38,7 +38,7 @@ struct PermissionApplyStatusView: View {
.font(.system(size: AppMetrics.FontSize.footnote, weight: .semibold))
.buttonStyle(.plain)
} else {
ContentUnavailableView("暂无审核中的申请", systemImage: "doc.text.magnifyingglass")
AppContentUnavailableView("暂无审核中的申请", systemImage: "doc.text.magnifyingglass")
}
}
.padding(AppMetrics.Spacing.medium)
@ -57,7 +57,7 @@ struct PermissionApplyStatusView: View {
}
}
}
.navigationDestination(item: $editingPending) { pending in
.appNavigationDestination(item: $editingPending) { pending in
PermissionApplyView(initialPending: pending)
}
.task {

8
suixinkan/Features/ScenicPermission/Views/PermissionApplyView.swift
View File

@ -9,14 +9,14 @@ import SwiftUI
/// 权限申请页面，支持申请某角色在更多景区下的权限。
struct PermissionApplyView: View {
@Environment(PermissionContext.self) private var permissionContext
@Environment(ScenicPermissionAPI.self) private var scenicPermissionAPI
@State private var viewModel: PermissionApplyViewModel
@EnvironmentObject private var permissionContext: PermissionContext
@Environment(\.scenicPermissionAPI) private var scenicPermissionAPI
@StateObject private var viewModel: PermissionApplyViewModel
@State private var activePicker: PermissionPickerSheet?
/// 初始化权限申请页面，可传入驳回记录用于编辑。
init(initialPending: RoleApplyPendingResponse? = nil) {
_viewModel = State(initialValue: PermissionApplyViewModel(initialPending: initialPending))
_viewModel = StateObject(wrappedValue: PermissionApplyViewModel(initialPending: initialPending))
}
var body: some View {

12
suixinkan/Features/ScenicPermission/Views/ScenicApplicationView.swift
View File

@ -10,9 +10,9 @@ import SwiftUI
/// 景区申请页面，支持新增景区入驻资料、图片上传和审核状态回填。
struct ScenicApplicationView: View {
@Environment(ScenicPermissionAPI.self) private var scenicPermissionAPI
@Environment(OSSUploadService.self) private var ossUploadService
@State private var viewModel = ScenicApplicationViewModel()
@Environment(\.scenicPermissionAPI) private var scenicPermissionAPI
@Environment(\.ossUploadService) private var ossUploadService
@StateObject private var viewModel = ScenicApplicationViewModel()
@State private var pickedImageItems: [PhotosPickerItem] = []
@State private var activeLocationPicker: ScenicLocationPicker?
@ -21,7 +21,7 @@ struct ScenicApplicationView: View {
ScrollView {
VStack(spacing: AppMetrics.Spacing.medium) {
if viewModel.loadFailed {
ContentUnavailableView(
AppContentUnavailableView(
"景区申请初始化失败",
systemImage: "exclamationmark.triangle",
description: Text(viewModel.loadFailureReason ?? "请检查网络后重试")
@ -48,7 +48,7 @@ struct ScenicApplicationView: View {
.task {
await viewModel.loadInitial(api: scenicPermissionAPI)
}
.onChange(of: pickedImageItems) { _, items in
.onChange(of: pickedImageItems) { items in
guard !items.isEmpty else { return }
Task {
await importPickedImages(items)
@ -111,7 +111,7 @@ struct ScenicApplicationView: View {
locationSection
coopTypeSection
inputField("备注信息 (\(viewModel.remark.count)/50)", text: $viewModel.remark, axis: .vertical, disabled: viewModel.isReadOnly)
.onChange(of: viewModel.remark) { _, value in
.onChange(of: viewModel.remark) { value in
if value.count > 50 {
viewModel.remark = String(value.prefix(50))
}

10
suixinkan/Features/ScenicPermission/Views/ScenicSelectionView.swift
View File

@ -10,12 +10,12 @@ import SwiftUI
/// 景区选择页面，支持搜索、定位距离展示和切换当前景区。
struct ScenicSelectionView: View {
@Environment(AccountContext.self) private var accountContext
@Environment(PermissionContext.self) private var permissionContext
@Environment(AccountSnapshotStore.self) private var snapshotStore
@EnvironmentObject private var accountContext: AccountContext
@EnvironmentObject private var permissionContext: PermissionContext
@Environment(\.accountSnapshotStore) private var snapshotStore
@Environment(\.dismiss) private var dismiss
@State private var viewModel = ScenicSelectionViewModel()
@StateObject private var viewModel = ScenicSelectionViewModel()
@State private var locationProvider = ScenicSelectionLocationProvider()
var body: some View {
@ -109,7 +109,7 @@ struct ScenicSelectionView: View {
private var content: some View {
ScrollView {
if viewModel.filteredItems.isEmpty {
ContentUnavailableView(
AppContentUnavailableView(
"暂无可选景区",
systemImage: "mountain.2",
description: Text("可尝试清空搜索关键词或刷新定位。")