从 iOS 17 Observation 迁移至 iOS 16 兼容的 Combine 架构

将最低部署版本降至 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

View File

@ -5,7 +5,7 @@
// Created by Codex on 2026/6/18.
//
import Observation
import Combine
///
struct AccountProfile: Codable, Equatable {
@ -58,14 +58,13 @@ struct BusinessScope: Codable, Equatable, Identifiable {
}
@MainActor
@Observable
/// /
final class AccountContext {
private(set) var profile: AccountProfile?
private(set) var scenicScopes: [BusinessScope] = []
private(set) var storeScopes: [BusinessScope] = []
var currentScenic: BusinessScope?
var currentStore: BusinessScope?
final class AccountContext: ObservableObject {
@Published private(set) var profile: AccountProfile?
@Published private(set) var scenicScopes: [BusinessScope] = []
@Published private(set) var storeScopes: [BusinessScope] = []
@Published var currentScenic: BusinessScope?
@Published var currentStore: BusinessScope?
///
func applyLogin(profile: AccountProfile? = nil) {

View File

@ -6,7 +6,7 @@
//
import Foundation
import Observation
import Combine
///
enum AuthPhase: Equatable {
@ -16,11 +16,10 @@ enum AuthPhase: Equatable {
}
@MainActor
@Observable
/// token
final class AppSession {
private(set) var phase: AuthPhase = .loggedOut
private(set) var token: String?
final class AppSession: ObservableObject {
@Published private(set) var phase: AuthPhase = .loggedOut
@Published private(set) var token: String?
var isLoggedIn: Bool {
phase == .loggedIn

View File

@ -6,15 +6,14 @@
//
import Foundation
import Observation
import Combine
@MainActor
@Observable
/// 退
final class AuthSessionCoordinator {
@ObservationIgnored private let tokenStore: SessionTokenStore
@ObservationIgnored private let snapshotStore: AccountSnapshotStore
@ObservationIgnored private let preferencesStore: AppPreferencesStore
private let tokenStore: SessionTokenStore
private let snapshotStore: AccountSnapshotStore
private let preferencesStore: AppPreferencesStore
/// token
init(

View File

@ -6,15 +6,14 @@
//
import Foundation
import Observation
import Combine
@MainActor
@Observable
/// URI
final class PermissionContext {
private(set) var rolePermissions: [RolePermissionResponse] = []
private(set) var permissionURIs: Set<String> = []
var currentRole: RoleInfo?
final class PermissionContext: ObservableObject {
@Published private(set) var rolePermissions: [RolePermissionResponse] = []
@Published private(set) var permissionURIs: Set<String> = []
@Published var currentRole: RoleInfo?
/// ID
func replaceRolePermissions(_ rolePermissions: [RolePermissionResponse], currentRoleId: Int? = nil) {

View File

@ -6,7 +6,7 @@
//
import Foundation
import Observation
import Combine
///
enum ScenicSpotLoadState: Equatable {
@ -17,12 +17,11 @@ enum ScenicSpotLoadState: Equatable {
}
@MainActor
@Observable
///
final class ScenicSpotContext {
private(set) var scenicId: Int?
private(set) var spots: [ScenicSpotItem] = []
private(set) var loadState: ScenicSpotLoadState = .idle
final class ScenicSpotContext: ObservableObject {
@Published private(set) var scenicId: Int?
@Published private(set) var spots: [ScenicSpotItem] = []
@Published private(set) var loadState: ScenicSpotLoadState = .idle
/// ID
func reload(scenicId: Int?, api: AccountContextServing) async {

View File

@ -6,14 +6,13 @@
//
import Foundation
import Observation
import Combine
@MainActor
@Observable
/// token
final class SessionBootstrapper {
@ObservationIgnored private let tokenStore: SessionTokenStore
@ObservationIgnored private let snapshotStore: AccountSnapshotStore
private let tokenStore: SessionTokenStore
private let snapshotStore: AccountSnapshotStore
private var didAttemptRestore = false
/// token

View File

@ -5,17 +5,16 @@
// Created by Codex on 2026/6/18.
//
import Observation
import Combine
import SwiftUI
@MainActor
@Observable
/// Toast
final class ToastCenter {
fileprivate var message: String?
@ObservationIgnored private let autoDismissNanoseconds: UInt64
@ObservationIgnored private var dismissTask: Task<Void, Never>?
@ObservationIgnored private var displayToken: UInt64 = 0
final class ToastCenter: ObservableObject {
@Published fileprivate var message: String?
private let autoDismissNanoseconds: UInt64
@Published private var dismissTask: Task<Void, Never>?
@Published private var displayToken: UInt64 = 0
/// Toast 2.2
init(autoDismissNanoseconds: UInt64 = 2_200_000_000) {
@ -65,7 +64,7 @@ final class ToastCenter {
/// Toast Toast
private struct GlobalToastOverlay: ViewModifier {
@Environment(ToastCenter.self) private var toastCenter
@EnvironmentObject private var toastCenter: ToastCenter
func body(content: Content) -> some View {
content