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

将最低部署版本降至 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

View File

@ -6,7 +6,7 @@
//
import Foundation
import Observation
import Combine
/// 便
@MainActor
@ -44,9 +44,8 @@ protocol TaskServing {
/// API
@MainActor
@Observable
final class TaskAPI: TaskServing {
@ObservationIgnored private let client: APIClient
private let client: APIClient
/// API
init(client: APIClient) {

View File

@ -6,7 +6,7 @@
//
import Foundation
import Observation
import Combine
///
enum TaskCloudFileFilter: Int, CaseIterable, Identifiable {
@ -31,18 +31,17 @@ enum TaskCloudFileFilter: Int, CaseIterable, Identifiable {
/// ViewModel
@MainActor
@Observable
final class TaskCloudFileSelectionViewModel {
var path: [CloudDriveFile] = [CloudDriveFile(id: 0, name: "云盘")]
var files: [CloudDriveFile] = []
var total = 0
var page = 1
var searchText = ""
var selectedFilter: TaskCloudFileFilter = .all
var selectedFiles: [CloudDriveFile] = []
var isLoading = false
var isLoadingMore = false
var errorMessage: String?
final class TaskCloudFileSelectionViewModel: ObservableObject {
@Published var path: [CloudDriveFile] = [CloudDriveFile(id: 0, name: "云盘")]
@Published var files: [CloudDriveFile] = []
@Published var total = 0
@Published var page = 1
@Published var searchText = ""
@Published var selectedFilter: TaskCloudFileFilter = .all
@Published var selectedFiles: [CloudDriveFile] = []
@Published var isLoading = false
@Published var isLoadingMore = false
@Published var errorMessage: String?
private let pageSize = 20

View File

@ -6,7 +6,7 @@
//
import Foundation
import Observation
import Combine
///
struct TaskCloudSelectionItem: Identifiable, Hashable {
@ -43,19 +43,18 @@ struct TaskLocalUploadItem: Identifiable, Hashable {
/// ViewModel
@MainActor
@Observable
final class TaskCreateViewModel {
var taskName = ""
var remark = ""
var urgentHourText = "0"
var selectedOrder: AvailableOrderResponse?
var availableOrders: [AvailableOrderResponse] = []
var selectedCloudFiles: [TaskCloudSelectionItem] = []
var selectedLocalFiles: [TaskLocalUploadItem] = []
var isLoadingOrders = false
var isSubmitting = false
var errorMessage: String?
var didSubmitSuccessfully = false
final class TaskCreateViewModel: ObservableObject {
@Published var taskName = ""
@Published var remark = ""
@Published var urgentHourText = "0"
@Published var selectedOrder: AvailableOrderResponse?
@Published var availableOrders: [AvailableOrderResponse] = []
@Published var selectedCloudFiles: [TaskCloudSelectionItem] = []
@Published var selectedLocalFiles: [TaskLocalUploadItem] = []
@Published var isLoadingOrders = false
@Published var isSubmitting = false
@Published var errorMessage: String?
@Published var didSubmitSuccessfully = false
///
var canSubmit: Bool {

View File

@ -6,7 +6,7 @@
//
import Foundation
import Observation
import Combine
///
enum TaskStatusFilter: Int, CaseIterable, Identifiable {
@ -37,18 +37,17 @@ enum TaskStatusFilter: Int, CaseIterable, Identifiable {
/// ViewModel
@MainActor
@Observable
final class TaskManagementViewModel {
var isLoading = false
var isLoadingMore = false
var tasks: [PhotographerTaskItem] = []
var total = 0
var page = 1
var selectedStatus: TaskStatusFilter = .all
var searchText = ""
var startDate: Date?
var endDate: Date?
var errorMessage: String?
final class TaskManagementViewModel: ObservableObject {
@Published var isLoading = false
@Published var isLoadingMore = false
@Published var tasks: [PhotographerTaskItem] = []
@Published var total = 0
@Published var page = 1
@Published var selectedStatus: TaskStatusFilter = .all
@Published var searchText = ""
@Published var startDate: Date?
@Published var endDate: Date?
@Published var errorMessage: String?
private let pageSize = 10
@ -146,11 +145,10 @@ final class TaskManagementViewModel {
/// ViewModel
@MainActor
@Observable
final class TaskDetailViewModel {
var isLoading = false
var detail: TaskDetailResponse?
var errorMessage: String?
final class TaskDetailViewModel: ObservableObject {
@Published var isLoading = false
@Published var detail: TaskDetailResponse?
@Published var errorMessage: String?
///
func load(api: any TaskServing, taskId: Int) async {

View File

@ -11,14 +11,14 @@ import UniformTypeIdentifiers
///
struct TaskCreateView: View {
@Environment(AccountContext.self) private var accountContext
@Environment(TaskAPI.self) private var taskAPI
@Environment(OSSUploadService.self) private var ossUploadService
@Environment(ToastCenter.self) private var toastCenter
@EnvironmentObject private var accountContext: AccountContext
@Environment(\.taskAPI) private var taskAPI
@Environment(\.ossUploadService) private var ossUploadService
@EnvironmentObject private var toastCenter: ToastCenter
@Environment(\.dismiss) private var dismiss
@Environment(\.globalLoading) private var globalLoading
@State private var viewModel = TaskCreateViewModel()
@StateObject private var viewModel = TaskCreateViewModel()
@State private var showOrderSelection = false
@State private var showCloudSelection = false
@State private var pickerItems: [PhotosPickerItem] = []
@ -60,7 +60,7 @@ struct TaskCreateView: View {
}
}
}
.onChange(of: pickerItems) { _, items in
.onChange(of: pickerItems) { items in
Task { await importPickerItems(items) }
}
}

View File

@ -9,14 +9,14 @@ import SwiftUI
///
struct TaskDetailView: View {
@Environment(TaskAPI.self) private var taskAPI
@Environment(ToastCenter.self) private var toastCenter
@Environment(\.taskAPI) private var taskAPI
@EnvironmentObject private var toastCenter: ToastCenter
@Environment(\.globalLoading) private var globalLoading
let taskId: Int
let summary: PhotographerTaskItem?
@State private var viewModel = TaskDetailViewModel()
@StateObject private var viewModel = TaskDetailViewModel()
var body: some View {
ScrollView {

View File

@ -9,13 +9,13 @@ import SwiftUI
///
struct TaskManagementView: View {
@Environment(AccountContext.self) private var accountContext
@Environment(RouterPath.self) private var router
@Environment(TaskAPI.self) private var taskAPI
@Environment(ToastCenter.self) private var toastCenter
@EnvironmentObject private var accountContext: AccountContext
@EnvironmentObject private var router: RouterPath
@Environment(\.taskAPI) private var taskAPI
@EnvironmentObject private var toastCenter: ToastCenter
@Environment(\.globalLoading) private var globalLoading
@State private var viewModel = TaskManagementViewModel()
@StateObject private var viewModel = TaskManagementViewModel()
var body: some View {
ScrollView {
@ -55,7 +55,7 @@ struct TaskManagementView: View {
}
}
.pickerStyle(.segmented)
.onChange(of: viewModel.selectedStatus) { _, _ in
.onChange(of: viewModel.selectedStatus) { _ in
Task { await reload(showLoading: true) }
}

View File

@ -57,13 +57,13 @@ struct TaskOrderSelectionView: View {
///
struct TaskCloudFileSelectionView: View {
@Environment(TaskAPI.self) private var taskAPI
@Environment(ToastCenter.self) private var toastCenter
@Environment(\.taskAPI) private var taskAPI
@EnvironmentObject private var toastCenter: ToastCenter
@Environment(\.dismiss) private var dismiss
let onConfirm: ([TaskCloudSelectionItem]) -> Void
@State private var viewModel = TaskCloudFileSelectionViewModel()
@StateObject private var viewModel = TaskCloudFileSelectionViewModel()
var body: some View {
VStack(spacing: 0) {
@ -108,7 +108,7 @@ struct TaskCloudFileSelectionView: View {
}
}
.pickerStyle(.segmented)
.onChange(of: viewModel.selectedFilter) { _, _ in
.onChange(of: viewModel.selectedFilter) { _ in
Task { await reload() }
}
}