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>

suixinkan/Features/Assets/API/AssetsAPI.swift

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import Observation
+import Combine
 
 /// 资产服务协议，抽象云盘、媒体库和相册接口以便 ViewModel 测试替换。
 @MainActor
@@ -83,9 +83,8 @@ protocol AssetsServing {
 
 /// 资产 API，负责封装相册云盘和素材管理相关接口。
 @MainActor
-@Observable
 final class AssetsAPI: AssetsServing {
-    @ObservationIgnored private let client: APIClient
+    private let client: APIClient
 
     /// 初始化资产 API，并注入共享网络客户端。
     init(client: APIClient) {

suixinkan/Features/Assets/ViewModels/AssetsViewModels.swift

@@ -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 {

suixinkan/Features/Assets/Views/AlbumViews.swift

@@ -12,12 +12,12 @@ import UniformTypeIdentifiers
 
 /// 相册管理页面，展示相册列表、筛选和新建相册入口。
 struct AlbumListView: View {
-    @Environment(AccountContext.self) private var accountContext
-    @Environment(AssetsAPI.self) private var assetsAPI
-    @Environment(ToastCenter.self) private var toastCenter
+    @EnvironmentObject private var accountContext: AccountContext
+    @Environment(\.assetsAPI) private var assetsAPI
+    @EnvironmentObject private var toastCenter: ToastCenter
     @Environment(\.globalLoading) private var globalLoading
 
-    @State private var viewModel = AlbumListViewModel()
+    @StateObject private var viewModel = AlbumListViewModel()
     @State private var showCreateSheet = false
     @State private var newAlbumName = ""
     @State private var newAlbumRemark = ""
@@ -158,12 +158,12 @@ struct AlbumListView: View {
 
 /// 相册详情页面，展示图片/视频列表并支持封面、删除和编辑。
 struct AlbumDetailView: View {
-    @Environment(AccountContext.self) private var accountContext
-    @Environment(AssetsAPI.self) private var assetsAPI
-    @Environment(ToastCenter.self) private var toastCenter
+    @EnvironmentObject private var accountContext: AccountContext
+    @Environment(\.assetsAPI) private var assetsAPI
+    @EnvironmentObject private var toastCenter: ToastCenter
     @Environment(\.globalLoading) private var globalLoading
 
-    @State private var viewModel: AlbumDetailViewModel
+    @StateObject private var viewModel: AlbumDetailViewModel
     @State private var actionFile: AlbumFileItem?
     @State private var previewFile: AlbumFileItem?
     @State private var showRenameSheet = false
@@ -174,7 +174,7 @@ struct AlbumDetailView: View {
 
     /// 初始化相册详情页面。
     init(folderId: Int, summary: AlbumFolderItem? = nil) {
-        _viewModel = State(initialValue: AlbumDetailViewModel(folderId: folderId, summary: summary))
+        _viewModel = StateObject(wrappedValue: AlbumDetailViewModel(folderId: folderId, summary: summary))
     }
 
     var body: some View {
@@ -282,7 +282,7 @@ struct AlbumDetailView: View {
             }
         }
         .pickerStyle(.segmented)
-        .onChange(of: viewModel.selectedTab) { _, tab in
+        .onChange(of: viewModel.selectedTab) { tab in
             Task { await viewModel.selectTab(tab, api: assetsAPI, scenicId: accountContext.currentScenic?.id) }
         }
     }
@@ -378,14 +378,14 @@ struct AlbumTrailerEntryView: View {
 
 /// 相册预览上传页面，负责选择相册、本地文件和提交上传。
 struct AlbumTrailerUploadView: View {
-    @Environment(AccountContext.self) private var accountContext
-    @Environment(AssetsAPI.self) private var assetsAPI
-    @Environment(OSSUploadService.self) private var uploadService
-    @Environment(ToastCenter.self) private var toastCenter
+    @EnvironmentObject private var accountContext: AccountContext
+    @Environment(\.assetsAPI) private var assetsAPI
+    @Environment(\.ossUploadService) private var uploadService
+    @EnvironmentObject private var toastCenter: ToastCenter
     @Environment(\.dismiss) private var dismiss
     @Environment(\.globalLoading) private var globalLoading
 
-    @State private var viewModel = AlbumTrailerViewModel()
+    @StateObject private var viewModel = AlbumTrailerViewModel()
     @State private var selectedItems: [PhotosPickerItem] = []
 
     let initialFolderId: Int?
@@ -412,7 +412,7 @@ struct AlbumTrailerUploadView: View {
                 toastCenter.show(message)
             }
         }
-        .onChange(of: selectedItems) { _, items in
+        .onChange(of: selectedItems) { items in
             Task { await loadPickedFiles(items) }
         }
     }

suixinkan/Features/Assets/Views/CloudStorageViews.swift

@@ -14,14 +14,14 @@ import UIKit
 
 /// 相册云盘页面，展示文件夹浏览、筛选、上传、预览和文件操作。
 struct CloudStorageView: View {
-    @Environment(AccountContext.self) private var accountContext
-    @Environment(AssetsAPI.self) private var assetsAPI
-    @Environment(OSSUploadService.self) private var uploadService
-    @Environment(RouterPath.self) private var router
-    @Environment(ToastCenter.self) private var toastCenter
+    @EnvironmentObject private var accountContext: AccountContext
+    @Environment(\.assetsAPI) private var assetsAPI
+    @Environment(\.ossUploadService) private var uploadService
+    @EnvironmentObject private var router: RouterPath
+    @EnvironmentObject private var toastCenter: ToastCenter
     @Environment(\.globalLoading) private var globalLoading
 
-    @State private var viewModel = CloudStorageViewModel()
+    @StateObject private var viewModel = CloudStorageViewModel()
     @State private var transferStore = CloudTransferStore.shared
     @State private var selectedItems: [PhotosPickerItem] = []
     @State private var actionItem: CloudDriveFile?
@@ -70,7 +70,7 @@ struct CloudStorageView: View {
             guard viewModel.files.isEmpty else { return }
             await reload(showLoading: true)
         }
-        .onChange(of: selectedItems) { _, items in
+        .onChange(of: selectedItems) { items in
             Task { await upload(items) }
         }
         .confirmationDialog("文件操作", isPresented: actionDialogBinding, presenting: actionItem) { item in
@@ -176,7 +176,7 @@ struct CloudStorageView: View {
                 }
             }
             .pickerStyle(.segmented)
-            .onChange(of: viewModel.selectedFilter) { _, _ in
+            .onChange(of: viewModel.selectedFilter) { _ in
                 Task { await reload(showLoading: true) }
             }
 
@@ -186,7 +186,7 @@ struct CloudStorageView: View {
                 }
             }
             .pickerStyle(.segmented)
-            .onChange(of: viewModel.selectedSort) { _, _ in
+            .onChange(of: viewModel.selectedSort) { _ in
                 Task { await reload(showLoading: true) }
             }
         }

suixinkan/Features/Assets/Views/MediaLibraryViews.swift

@@ -12,18 +12,18 @@ import SwiftUI
 struct MediaLibraryView: View {
     let kind: MediaLibraryKind
 
-    @Environment(AssetsAPI.self) private var assetsAPI
-    @Environment(RouterPath.self) private var router
-    @Environment(ToastCenter.self) private var toastCenter
+    @Environment(\.assetsAPI) private var assetsAPI
+    @EnvironmentObject private var router: RouterPath
+    @EnvironmentObject private var toastCenter: ToastCenter
     @Environment(\.globalLoading) private var globalLoading
 
-    @State private var viewModel: MediaLibraryViewModel
+    @StateObject private var viewModel: MediaLibraryViewModel
     @State private var selectedItem: MediaLibraryItem?
 
     /// 初始化媒体库页面。
     init(kind: MediaLibraryKind = .material) {
         self.kind = kind
-        _viewModel = State(initialValue: MediaLibraryViewModel(kind: kind))
+        _viewModel = StateObject(wrappedValue: MediaLibraryViewModel(kind: kind))
     }
 
     var body: some View {
@@ -54,7 +54,7 @@ struct MediaLibraryView: View {
             guard viewModel.items.isEmpty else { return }
             await reload(showLoading: true)
         }
-        .navigationDestination(item: $selectedItem) { item in
+        .appNavigationDestination(item: $selectedItem) { item in
             MediaLibraryDetailView(item: item, listViewModel: viewModel)
         }
     }
@@ -82,7 +82,7 @@ struct MediaLibraryView: View {
                 }
             }
             .pickerStyle(.segmented)
-            .onChange(of: viewModel.selectedAuditFilter) { _, _ in
+            .onChange(of: viewModel.selectedAuditFilter) { _ in
                 Task { await reload(showLoading: true) }
             }
         }
@@ -235,8 +235,8 @@ struct MediaLibraryDetailView: View {
     let item: MediaLibraryItem
     let listViewModel: MediaLibraryViewModel
 
-    @Environment(AssetsAPI.self) private var assetsAPI
-    @Environment(ToastCenter.self) private var toastCenter
+    @Environment(\.assetsAPI) private var assetsAPI
+    @EnvironmentObject private var toastCenter: ToastCenter
     @Environment(\.dismiss) private var dismiss
     @Environment(\.globalLoading) private var globalLoading
 
@@ -415,15 +415,15 @@ struct MediaLibraryUploadView: View {
     let kind: MediaLibraryKind
     let editingDetail: MediaLibraryDetail?
 
-    @Environment(AccountContext.self) private var accountContext
-    @Environment(ScenicSpotContext.self) private var scenicSpotContext
-    @Environment(AssetsAPI.self) private var assetsAPI
-    @Environment(OSSUploadService.self) private var uploadService
-    @Environment(ToastCenter.self) private var toastCenter
+    @EnvironmentObject private var accountContext: AccountContext
+    @EnvironmentObject private var scenicSpotContext: ScenicSpotContext
+    @Environment(\.assetsAPI) private var assetsAPI
+    @Environment(\.ossUploadService) private var uploadService
+    @EnvironmentObject private var toastCenter: ToastCenter
     @Environment(\.dismiss) private var dismiss
     @Environment(\.globalLoading) private var globalLoading
 
-    @State private var viewModel: MediaLibraryEditorViewModel
+    @StateObject private var viewModel: MediaLibraryEditorViewModel
     @State private var coverSelection: PhotosPickerItem?
     @State private var mediaSelection: [PhotosPickerItem] = []
 
@@ -431,7 +431,7 @@ struct MediaLibraryUploadView: View {
     init(kind: MediaLibraryKind = .material, editingDetail: MediaLibraryDetail? = nil) {
         self.kind = kind
         self.editingDetail = editingDetail
-        _viewModel = State(initialValue: MediaLibraryEditorViewModel(detail: editingDetail))
+        _viewModel = StateObject(wrappedValue: MediaLibraryEditorViewModel(detail: editingDetail))
     }
 
     var body: some View {
@@ -457,10 +457,10 @@ struct MediaLibraryUploadView: View {
                 toastCenter.show(message)
             }
         }
-        .onChange(of: coverSelection) { _, item in
+        .onChange(of: coverSelection) { item in
             Task { await loadCover(item) }
         }
-        .onChange(of: mediaSelection) { _, items in
+        .onChange(of: mediaSelection) { items in
             Task { await loadMedia(items) }
         }
     }