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

40
suixinkan/Features/Live/Views/LiveAlbumViews.swift
View File

@ -12,12 +12,12 @@ import UniformTypeIdentifiers
/// 直播相册首页，展示相册列表、筛选和上传入口。
struct LiveAlbumView: View {
@Environment(AccountContext.self) private var accountContext
@Environment(LiveAPI.self) private var liveAPI
@Environment(ToastCenter.self) private var toastCenter
@EnvironmentObject private var accountContext: AccountContext
@Environment(\.liveAPI) private var liveAPI
@EnvironmentObject private var toastCenter: ToastCenter
@Environment(\.globalLoading) private var globalLoading
@State private var viewModel = LiveAlbumViewModel()
@StateObject private var viewModel = LiveAlbumViewModel()
@State private var showStartPicker = false
@State private var showEndPicker = false
@State private var showCreatePage = false
@ -29,7 +29,7 @@ struct LiveAlbumView: View {
ScrollView {
LazyVStack(spacing: AppMetrics.Spacing.medium) {
if viewModel.folders.isEmpty {
ContentUnavailableView("暂无素材", systemImage: "photo.stack")
AppContentUnavailableView("暂无素材", systemImage: "photo.stack")
.frame(maxWidth: .infinity, minHeight: 300)
} else {
ForEach(viewModel.folders) { folder in
@ -286,13 +286,13 @@ private struct LiveDatePickerSheet: View {
/// 新建直播相册页面，支持选择本地图片/视频并上传。
struct LiveAlbumCreateView: View {
@Environment(AccountContext.self) private var accountContext
@Environment(LiveAPI.self) private var liveAPI
@Environment(OSSUploadService.self) private var uploadService
@Environment(ToastCenter.self) private var toastCenter
@EnvironmentObject private var accountContext: AccountContext
@Environment(\.liveAPI) private var liveAPI
@Environment(\.ossUploadService) private var uploadService
@EnvironmentObject private var toastCenter: ToastCenter
@Environment(\.dismiss) private var dismiss
@State private var viewModel = LiveAlbumCreateViewModel()
@StateObject private var viewModel = LiveAlbumCreateViewModel()
@State private var pickerItems: [PhotosPickerItem] = []
let onCreated: () -> Void
@ -330,7 +330,7 @@ struct LiveAlbumCreateView: View {
.background(Color(hex: 0xF5F7FA))
.navigationTitle("上传素材")
.navigationBarTitleDisplayMode(.inline)
.onChange(of: pickerItems) { _, newItems in
.onChange(of: pickerItems) { newItems in
Task { await importPickerItems(newItems) }
}
}
@ -338,7 +338,7 @@ struct LiveAlbumCreateView: View {
@ViewBuilder
private var localFileGrid: some View {
if viewModel.localFiles.isEmpty {
ContentUnavailableView("未选择素材", systemImage: "photo")
AppContentUnavailableView("未选择素材", systemImage: "photo")
.frame(maxWidth: .infinity, minHeight: 180)
.background(.white, in: RoundedRectangle(cornerRadius: AppMetrics.CornerRadius.card))
} else {
@ -392,21 +392,21 @@ struct LiveAlbumCreateView: View {
/// 直播相册预览页面。
struct LiveAlbumPreviewView: View {
@Environment(LiveAPI.self) private var liveAPI
@Environment(ToastCenter.self) private var toastCenter
@Environment(\.liveAPI) private var liveAPI
@EnvironmentObject private var toastCenter: ToastCenter
@Environment(\.dismiss) private var dismiss
@State private var viewModel: LiveAlbumPreviewViewModel
@StateObject private var viewModel: LiveAlbumPreviewViewModel
@State private var showDeleteConfirm = false
init(folderId: Int, startIndex: Int, summary: LiveAlbumFolderItem?) {
_viewModel = State(initialValue: LiveAlbumPreviewViewModel(folderId: folderId, startIndex: startIndex, summary: summary))
_viewModel = StateObject(wrappedValue: LiveAlbumPreviewViewModel(folderId: folderId, startIndex: startIndex, summary: summary))
}
var body: some View {
VStack(spacing: 0) {
if viewModel.files.isEmpty {
ContentUnavailableView("没有可预览的素材", systemImage: "photo")
AppContentUnavailableView("没有可预览的素材", systemImage: "photo")
.frame(maxWidth: .infinity, maxHeight: .infinity)
.background(Color.black)
} else {
@ -459,12 +459,12 @@ struct LiveAlbumPreviewView: View {
private struct LiveAlbumPreviewPage: View {
let file: LiveAlbumFileItem
@Environment(ToastCenter.self) private var toastCenter
@State private var playbackViewModel: LivePlaybackViewModel
@EnvironmentObject private var toastCenter: ToastCenter
@StateObject private var playbackViewModel: LivePlaybackViewModel
init(file: LiveAlbumFileItem) {
self.file = file
_playbackViewModel = State(initialValue: LivePlaybackViewModel(urlString: file.url))
_playbackViewModel = StateObject(wrappedValue: LivePlaybackViewModel(urlString: file.url))
}
var body: some View {

30
suixinkan/Features/Live/Views/LiveManagementViews.swift
View File

@ -10,12 +10,12 @@ import SwiftUI
/// 直播管理首页，展示直播列表和控制入口。
struct LiveManagementView: View {
@Environment(AccountContext.self) private var accountContext
@Environment(LiveAPI.self) private var liveAPI
@Environment(ToastCenter.self) private var toastCenter
@EnvironmentObject private var accountContext: AccountContext
@Environment(\.liveAPI) private var liveAPI
@EnvironmentObject private var toastCenter: ToastCenter
@Environment(\.globalLoading) private var globalLoading
@State private var viewModel = LiveManagementViewModel()
@StateObject private var viewModel = LiveManagementViewModel()
@State private var showAddPage = false
var body: some View {
@ -24,7 +24,7 @@ struct LiveManagementView: View {
ScrollView {
LazyVStack(spacing: AppMetrics.Spacing.medium) {
if viewModel.items.isEmpty {
ContentUnavailableView("暂无直播", systemImage: "dot.radiowaves.left.and.right")
AppContentUnavailableView("暂无直播", systemImage: "dot.radiowaves.left.and.right")
.frame(maxWidth: .infinity, minHeight: 280)
} else {
ForEach(viewModel.items) { item in
@ -231,9 +231,9 @@ private struct LiveSmallAction: View {
/// 添加直播页面。
struct LiveAddView: View {
@Environment(AccountContext.self) private var accountContext
@Environment(LiveAPI.self) private var liveAPI
@Environment(ToastCenter.self) private var toastCenter
@EnvironmentObject private var accountContext: AccountContext
@Environment(\.liveAPI) private var liveAPI
@EnvironmentObject private var toastCenter: ToastCenter
@Environment(\.dismiss) private var dismiss
@State private var title = ""
@ -351,18 +351,18 @@ struct LiveAddView: View {
/// 直播详情页面，展示推流信息和控制动作。
struct LiveDetailView: View {
@Environment(LiveAPI.self) private var liveAPI
@Environment(ToastCenter.self) private var toastCenter
@Environment(\.liveAPI) private var liveAPI
@EnvironmentObject private var toastCenter: ToastCenter
@Environment(\.globalLoading) private var globalLoading
@State private var viewModel: LiveDetailViewModel
@State private var playbackViewModel: LivePlaybackViewModel
@State private var pushReadinessViewModel = LivePushReadinessViewModel()
@StateObject private var viewModel: LiveDetailViewModel
@StateObject private var playbackViewModel: LivePlaybackViewModel
@StateObject private var pushReadinessViewModel = LivePushReadinessViewModel()
@State private var copied = false
let onChanged: () -> Void
init(initialDetail: LiveEntity, onChanged: @escaping () -> Void) {
_viewModel = State(initialValue: LiveDetailViewModel(detail: initialDetail))
_playbackViewModel = State(initialValue: LivePlaybackViewModel(live: initialDetail))
_viewModel = StateObject(wrappedValue: LiveDetailViewModel(detail: initialDetail))
_playbackViewModel = StateObject(wrappedValue: LivePlaybackViewModel(live: initialDetail))
self.onChanged = onChanged
}