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

11
suixinkan/Features/Live/ViewModels/LivePlaybackViewModel.swift
View File

@ -7,7 +7,7 @@
import AVFoundation
import Foundation
import Observation
import Combine
/// 直播播放地址解析器，避免把 RTMP 推流地址误当作播放地址。
enum LivePlaybackURLResolver {
@ -44,13 +44,12 @@ enum LivePlaybackState: Equatable {
}
@MainActor
@Observable
/// 直播播放器 ViewModel，管理系统播放器的 URL、播放和释放状态。
final class LivePlaybackViewModel {
var state: LivePlaybackState = .empty
var errorMessage: String?
final class LivePlaybackViewModel: ObservableObject {
@Published var state: LivePlaybackState = .empty
@Published var errorMessage: String?
@ObservationIgnored private(set) var player: AVPlayer?
@Published private(set) var player: AVPlayer?
var playableURL: URL? {
switch state {

25
suixinkan/Features/Live/ViewModels/LivePushReadinessViewModel.swift
View File

@ -8,7 +8,7 @@
import AVFoundation
import Foundation
import Network
import Observation
import Combine
/// 直播推流权限状态。
enum LivePushPermissionState: Equatable {
@ -158,23 +158,22 @@ final class SystemLiveNetworkMonitor: LiveNetworkMonitoring {
}
@MainActor
@Observable
/// 推流准备 ViewModel，检查权限、网络和默认 SDK 可用性。
final class LivePushReadinessViewModel {
var cameraPermission: LivePushPermissionState = .unknown
var microphonePermission: LivePushPermissionState = .unknown
var networkState: LivePushNetworkState = .unknown
var prepared = false
var running = false
var errorMessage: String?
final class LivePushReadinessViewModel: ObservableObject {
@Published var cameraPermission: LivePushPermissionState = .unknown
@Published var microphonePermission: LivePushPermissionState = .unknown
@Published var networkState: LivePushNetworkState = .unknown
@Published var prepared = false
@Published var running = false
@Published var errorMessage: String?
let adapterName: String
let sdkStatusText: String
@ObservationIgnored private let permissionProvider: any LivePermissionProviding
@ObservationIgnored private let networkMonitor: any LiveNetworkMonitoring
@ObservationIgnored private let adapter: any LivePushAdapter
@ObservationIgnored private var pushURL: URL?
private let permissionProvider: any LivePermissionProviding
private let networkMonitor: any LiveNetworkMonitoring
private let adapter: any LivePushAdapter
@Published private var pushURL: URL?
init(
permissionProvider: any LivePermissionProviding = SystemLivePermissionProvider(),

83
suixinkan/Features/Live/ViewModels/LiveViewModels.swift
View File

@ -6,22 +6,21 @@
//
import Foundation
import Observation
import Combine
@MainActor
@Observable
/// 直播管理 ViewModel，负责直播列表、详情、创建和控制动作。
final class LiveManagementViewModel {
var items: [LiveEntity] = []
var detail: LiveEntity?
var loading = false
var loadingMore = false
var hasMore = false
var page = 1
var errorMessage: String?
final class LiveManagementViewModel: ObservableObject {
@Published var items: [LiveEntity] = []
@Published var detail: LiveEntity?
@Published var loading = false
@Published var loadingMore = false
@Published var hasMore = false
@Published var page = 1
@Published var errorMessage: String?
@ObservationIgnored private let pageSize = 10
@ObservationIgnored private var total = 0
private let pageSize = 10
@Published private var total = 0
/// 进行中的直播数量。
var liveRunningCount: Int {
@ -136,13 +135,12 @@ final class LiveManagementViewModel {
}
@MainActor
@Observable
/// 直播详情 ViewModel，负责直播详情页动作后的详情刷新。
final class LiveDetailViewModel {
var detail: LiveEntity
var loading = false
var actionInFlight = false
var errorMessage: String?
final class LiveDetailViewModel: ObservableObject {
@Published var detail: LiveEntity
@Published var loading = false
@Published var actionInFlight = false
@Published var errorMessage: String?
init(detail: LiveEntity) {
self.detail = detail
@ -192,20 +190,19 @@ final class LiveDetailViewModel {
}
@MainActor
@Observable
/// 直播相册 ViewModel，负责相册列表、筛选、新建和删除。
final class LiveAlbumViewModel {
var folders: [LiveAlbumFolderItem] = []
var startDate: Date?
var endDate: Date?
var loading = false
var loadingMore = false
var hasMore = false
var page = 1
var errorMessage: String?
final class LiveAlbumViewModel: ObservableObject {
@Published var folders: [LiveAlbumFolderItem] = []
@Published var startDate: Date?
@Published var endDate: Date?
@Published var loading = false
@Published var loadingMore = false
@Published var hasMore = false
@Published var page = 1
@Published var errorMessage: String?
@ObservationIgnored private let pageSize = 10
@ObservationIgnored private var total = 0
private let pageSize = 10
@Published private var total = 0
/// 设置开始时间并校验时间顺序。
func setStartDate(_ date: Date) throws {
@ -301,14 +298,13 @@ final class LiveAlbumViewModel {
}
@MainActor
@Observable
/// 新建直播相册 ViewModel，负责本地素材上传和创建相册。
final class LiveAlbumCreateViewModel {
var name = ""
var localFiles: [LiveAlbumLocalUploadFile] = []
var submitting = false
var uploadProgress = 0
var errorMessage: String?
final class LiveAlbumCreateViewModel: ObservableObject {
@Published var name = ""
@Published var localFiles: [LiveAlbumLocalUploadFile] = []
@Published var submitting = false
@Published var uploadProgress = 0
@Published var errorMessage: String?
/// 添加本地待上传素材。
func addLocalFiles(_ files: [LiveAlbumLocalUploadFile]) {
@ -368,15 +364,14 @@ final class LiveAlbumCreateViewModel {
}
@MainActor
@Observable
/// 直播相册预览 ViewModel，负责加载相册详情和删除当前素材。
final class LiveAlbumPreviewViewModel {
final class LiveAlbumPreviewViewModel: ObservableObject {
let folderId: Int
var folder: LiveAlbumFolderItem?
var files: [LiveAlbumFileItem] = []
var currentIndex: Int
var loading = false
var errorMessage: String?
@Published var folder: LiveAlbumFolderItem?
@Published var files: [LiveAlbumFileItem] = []
@Published var currentIndex: Int
@Published var loading = false
@Published var errorMessage: String?
init(folderId: Int, startIndex: Int = 0, summary: LiveAlbumFolderItem? = nil) {
self.folderId = folderId