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>
This commit is contained in:
2026-06-26 10:16:35 +08:00
parent c32a610ee0
commit 26f4d0e671
127 changed files with 2320 additions and 1465 deletions

View File

@ -6,17 +6,16 @@
//
import Foundation
import Observation
import Combine
@MainActor
@Observable
/// ViewModel
final class AccountSwitchViewModel {
private(set) var accounts: [AccountSwitchAccount] = []
var selectedAccountId: String?
private(set) var loading = false
private(set) var switching = false
private var didLoad = false
final class AccountSwitchViewModel: ObservableObject {
@Published private(set) var accounts: [AccountSwitchAccount] = []
@Published var selectedAccountId: String?
@Published private(set) var loading = false
@Published private(set) var switching = false
@Published private var didLoad = false
///
var selectedAccount: AccountSwitchAccount? {

View File

@ -6,21 +6,20 @@
//
import Foundation
import Observation
import Combine
@MainActor
@Observable
/// ViewModel
final class ProfileViewModel {
var userInfo: UserInfoResponse?
var realNameInfo: RealNameInfo?
var isLoading = false
var isSaving = false
var isEditingProfile = false
var editingNickname = ""
private(set) var pendingAvatarData: Data?
private(set) var pendingAvatarFileName: String?
private(set) var avatarUploadProgress: Int?
final class ProfileViewModel: ObservableObject {
@Published var userInfo: UserInfoResponse?
@Published var realNameInfo: RealNameInfo?
@Published var isLoading = false
@Published var isSaving = false
@Published var isEditingProfile = false
@Published var editingNickname = ""
@Published private(set) var pendingAvatarData: Data?
@Published private(set) var pendingAvatarFileName: String?
@Published private(set) var avatarUploadProgress: Int?
var displayNickname: String {
nonEmpty(userInfo?.nickname) ?? "未设置昵称"

View File

@ -6,31 +6,30 @@
//
import Foundation
import Observation
import Combine
@MainActor
@Observable
/// ViewModel
final class RealNameAuthViewModel {
private(set) var info: RealNameInfo?
var realName = ""
var idCardNo = ""
var smsCode = ""
var startDate = Date()
var endDate = Calendar.current.date(byAdding: .year, value: 10, to: Date()) ?? Date()
var isLongValid = false
var frontUrl = ""
var backUrl = ""
private(set) var pendingFrontImageData: Data?
private(set) var pendingBackImageData: Data?
private(set) var frontUploadProgress: Int?
private(set) var backUploadProgress: Int?
private var pendingFrontFileName: String?
private var pendingBackFileName: String?
private(set) var loading = false
private(set) var sendingCode = false
private(set) var submitting = false
var statusMessage: String?
final class RealNameAuthViewModel: ObservableObject {
@Published private(set) var info: RealNameInfo?
@Published var realName = ""
@Published var idCardNo = ""
@Published var smsCode = ""
@Published var startDate = Date()
@Published var endDate = Calendar.current.date(byAdding: .year, value: 10, to: Date()) ?? Date()
@Published var isLongValid = false
@Published var frontUrl = ""
@Published var backUrl = ""
@Published private(set) var pendingFrontImageData: Data?
@Published private(set) var pendingBackImageData: Data?
@Published private(set) var frontUploadProgress: Int?
@Published private(set) var backUploadProgress: Int?
@Published private var pendingFrontFileName: String?
@Published private var pendingBackFileName: String?
@Published private(set) var loading = false
@Published private(set) var sendingCode = false
@Published private(set) var submitting = false
@Published var statusMessage: String?
///
func load(api: ProfileAPI) async throws {