Migrate from iOS 17 Observation to iOS 16-compatible Combine architecture.
Lower deployment target to iOS 16, replace @Observable with ObservableObject, add navigation and UI compatibility shims, and include login smoke UI tests. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@ -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) {
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -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) }
|
||||
}
|
||||
}
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -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) }
|
||||
}
|
||||
|
||||
|
||||
@ -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() }
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user