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

36
suixinkan/Features/Assets/Views/MediaLibraryViews.swift
View File

@ -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) }
}
}