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

25
suixinkan/Features/Tasks/ViewModels/TaskCloudFileSelectionViewModel.swift
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

27
suixinkan/Features/Tasks/ViewModels/TaskCreateViewModel.swift
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 {

34
suixinkan/Features/Tasks/ViewModels/TaskManagementViewModel.swift
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 {