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,15 +6,14 @@
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import Observation
|
||||
import Combine
|
||||
|
||||
/// 云盘传输记录仓库，保存本次 App 会话内的上传和下载进度。
|
||||
@MainActor
|
||||
@Observable
|
||||
final class CloudTransferStore {
|
||||
final class CloudTransferStore: ObservableObject {
|
||||
static let shared = CloudTransferStore()
|
||||
|
||||
private(set) var records: [CloudTransferItem] = []
|
||||
@Published private(set) var records: [CloudTransferItem] = []
|
||||
|
||||
/// 新增一条传输记录并返回记录 ID。
|
||||
@discardableResult
|
||||
@ -56,19 +55,18 @@ final class CloudTransferStore {
|
||||
|
||||
/// 云盘 ViewModel，负责文件列表、筛选、分页、文件操作和上传闭环。
|
||||
@MainActor
|
||||
@Observable
|
||||
final class CloudStorageViewModel {
|
||||
var path: [CloudDriveFile] = [CloudDriveFile(id: 0, name: "云盘")]
|
||||
var files: [CloudDriveFile] = []
|
||||
var total = 0
|
||||
var page = 1
|
||||
var searchText = ""
|
||||
var selectedFilter: CloudDriveFilter = .all
|
||||
var selectedSort: CloudDriveSort = .updatedDesc
|
||||
var isLoading = false
|
||||
var isLoadingMore = false
|
||||
var isMutating = false
|
||||
var errorMessage: String?
|
||||
final class CloudStorageViewModel: 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: CloudDriveFilter = .all
|
||||
@Published var selectedSort: CloudDriveSort = .updatedDesc
|
||||
@Published var isLoading = false
|
||||
@Published var isLoadingMore = false
|
||||
@Published var isMutating = false
|
||||
@Published var errorMessage: String?
|
||||
|
||||
private let pageSize = 20
|
||||
|
||||
@ -260,20 +258,19 @@ final class CloudStorageViewModel {
|
||||
|
||||
/// 媒体库 ViewModel，负责素材或样片列表、筛选、分页、详情和上下架。
|
||||
@MainActor
|
||||
@Observable
|
||||
final class MediaLibraryViewModel {
|
||||
final class MediaLibraryViewModel: ObservableObject {
|
||||
let kind: MediaLibraryKind
|
||||
var items: [MediaLibraryItem] = []
|
||||
var selectedDetail: MediaLibraryDetail?
|
||||
var orderInfo: MediaLibraryOrderInfo?
|
||||
var total = 0
|
||||
var page = 1
|
||||
var keyword = ""
|
||||
var selectedAuditFilter: MediaLibraryAuditFilter = .all
|
||||
var isLoading = false
|
||||
var isLoadingMore = false
|
||||
var isLoadingDetail = false
|
||||
var errorMessage: String?
|
||||
@Published var items: [MediaLibraryItem] = []
|
||||
@Published var selectedDetail: MediaLibraryDetail?
|
||||
@Published var orderInfo: MediaLibraryOrderInfo?
|
||||
@Published var total = 0
|
||||
@Published var page = 1
|
||||
@Published var keyword = ""
|
||||
@Published var selectedAuditFilter: MediaLibraryAuditFilter = .all
|
||||
@Published var isLoading = false
|
||||
@Published var isLoadingMore = false
|
||||
@Published var isLoadingDetail = false
|
||||
@Published var errorMessage: String?
|
||||
|
||||
private let pageSize = 10
|
||||
|
||||
@ -396,20 +393,19 @@ final class MediaLibraryViewModel {
|
||||
|
||||
/// 媒体库上传编辑 ViewModel，负责表单校验、OSS 上传和提交素材或样片。
|
||||
@MainActor
|
||||
@Observable
|
||||
final class MediaLibraryEditorViewModel {
|
||||
var name = ""
|
||||
var description = ""
|
||||
var selectedSpotId: Int?
|
||||
var selectedProjectId: Int?
|
||||
var projects: [PhotographerProjectItem] = []
|
||||
var tagsText = ""
|
||||
var coverFile: MediaLocalUploadFile?
|
||||
var mediaFiles: [MediaLocalUploadFile] = []
|
||||
var isSubmitting = false
|
||||
var isLoadingProjects = false
|
||||
var errorMessage: String?
|
||||
var didSubmitSuccessfully = false
|
||||
final class MediaLibraryEditorViewModel: ObservableObject {
|
||||
@Published var name = ""
|
||||
@Published var description = ""
|
||||
@Published var selectedSpotId: Int?
|
||||
@Published var selectedProjectId: Int?
|
||||
@Published var projects: [PhotographerProjectItem] = []
|
||||
@Published var tagsText = ""
|
||||
@Published var coverFile: MediaLocalUploadFile?
|
||||
@Published var mediaFiles: [MediaLocalUploadFile] = []
|
||||
@Published var isSubmitting = false
|
||||
@Published var isLoadingProjects = false
|
||||
@Published var errorMessage: String?
|
||||
@Published var didSubmitSuccessfully = false
|
||||
|
||||
private let editingId: Int?
|
||||
|
||||
@ -611,18 +607,17 @@ final class MediaLibraryEditorViewModel {
|
||||
|
||||
/// 相册列表 ViewModel，负责相册文件夹搜索、日期筛选、分页和新建相册。
|
||||
@MainActor
|
||||
@Observable
|
||||
final class AlbumListViewModel {
|
||||
var folders: [AlbumFolderItem] = []
|
||||
var total = 0
|
||||
var page = 1
|
||||
var searchText = ""
|
||||
var startTime = ""
|
||||
var endTime = ""
|
||||
var isLoading = false
|
||||
var isLoadingMore = false
|
||||
var isMutating = false
|
||||
var errorMessage: String?
|
||||
final class AlbumListViewModel: ObservableObject {
|
||||
@Published var folders: [AlbumFolderItem] = []
|
||||
@Published var total = 0
|
||||
@Published var page = 1
|
||||
@Published var searchText = ""
|
||||
@Published var startTime = ""
|
||||
@Published var endTime = ""
|
||||
@Published var isLoading = false
|
||||
@Published var isLoadingMore = false
|
||||
@Published var isMutating = false
|
||||
@Published var errorMessage: String?
|
||||
|
||||
private let pageSize = 10
|
||||
|
||||
@ -716,18 +711,17 @@ final class AlbumListViewModel {
|
||||
|
||||
/// 相册详情 ViewModel，负责相册信息、图片/视频列表和文件操作。
|
||||
@MainActor
|
||||
@Observable
|
||||
final class AlbumDetailViewModel {
|
||||
final class AlbumDetailViewModel: ObservableObject {
|
||||
let folderId: Int
|
||||
var folder: AlbumFolderItem?
|
||||
var files: [AlbumFileItem] = []
|
||||
var selectedTab: AlbumFileTab = .image
|
||||
var total = 0
|
||||
var page = 1
|
||||
var isLoading = false
|
||||
var isLoadingMore = false
|
||||
var isMutating = false
|
||||
var errorMessage: String?
|
||||
@Published var folder: AlbumFolderItem?
|
||||
@Published var files: [AlbumFileItem] = []
|
||||
@Published var selectedTab: AlbumFileTab = .image
|
||||
@Published var total = 0
|
||||
@Published var page = 1
|
||||
@Published var isLoading = false
|
||||
@Published var isLoadingMore = false
|
||||
@Published var isMutating = false
|
||||
@Published var errorMessage: String?
|
||||
|
||||
private let pageSize = 20
|
||||
|
||||
@ -863,16 +857,15 @@ final class AlbumDetailViewModel {
|
||||
|
||||
/// 相册预览上传 ViewModel，负责选择相册、本地文件上传和相册入库。
|
||||
@MainActor
|
||||
@Observable
|
||||
final class AlbumTrailerViewModel {
|
||||
var folders: [AlbumFolderItem] = []
|
||||
var selectedFolderId: Int?
|
||||
var localFiles: [AlbumLocalUploadFile] = []
|
||||
var uploadProgress = 0
|
||||
var isLoadingFolders = false
|
||||
var isSubmitting = false
|
||||
var errorMessage: String?
|
||||
var didUploadSuccessfully = false
|
||||
final class AlbumTrailerViewModel: ObservableObject {
|
||||
@Published var folders: [AlbumFolderItem] = []
|
||||
@Published var selectedFolderId: Int?
|
||||
@Published var localFiles: [AlbumLocalUploadFile] = []
|
||||
@Published var uploadProgress = 0
|
||||
@Published var isLoadingFolders = false
|
||||
@Published var isSubmitting = false
|
||||
@Published var errorMessage: String?
|
||||
@Published var didUploadSuccessfully = false
|
||||
|
||||
/// 加载可上传的相册列表。
|
||||
func loadFolders(api: any AssetsServing, scenicId: Int?) async {
|
||||
|
||||
Reference in New Issue
Block a user