从 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

@ -6,7 +6,7 @@
//
import Foundation
import Observation
import Combine
@MainActor
/// 便
@ -34,25 +34,24 @@ enum WalletLedgerTab: String, CaseIterable, Identifiable {
}
@MainActor
@Observable
/// ViewModel
final class WalletViewModel {
var summary: WalletSummaryResponse?
var pointsOverview: PointOverviewResponse?
var selectedTab: WalletLedgerTab = .earnings
var selectedFilter: WalletDateFilter = .last30
var earningsGroups: [WalletEarningDetailGroup] = []
var withdrawRecords: [WalletWithdrawRecord] = []
var isLoadingSummary = false
var isLoadingList = false
var isCheckingWithdraw = false
var errorMessage: String?
final class WalletViewModel: ObservableObject {
@Published var summary: WalletSummaryResponse?
@Published var pointsOverview: PointOverviewResponse?
@Published var selectedTab: WalletLedgerTab = .earnings
@Published var selectedFilter: WalletDateFilter = .last30
@Published var earningsGroups: [WalletEarningDetailGroup] = []
@Published var withdrawRecords: [WalletWithdrawRecord] = []
@Published var isLoadingSummary = false
@Published var isLoadingList = false
@Published var isCheckingWithdraw = false
@Published var errorMessage: String?
private let pageSize = 20
private var earningsPage = 1
private var earningsTotal = 0
private var withdrawPage = 1
private var withdrawTotal = 0
@Published private var earningsPage = 1
@Published private var earningsTotal = 0
@Published private var withdrawPage = 1
@Published private var withdrawTotal = 0
///
var withdrawableText: String {
@ -225,16 +224,15 @@ final class WalletViewModel {
}
@MainActor
@Observable
/// ViewModel
final class WithdrawApplyViewModel {
var info: WithdrawInfoResponse?
var amountText = ""
var smsCode = ""
var isLoading = false
var isSubmitting = false
var smsCountdown = 0
var errorMessage: String?
final class WithdrawApplyViewModel: ObservableObject {
@Published var info: WithdrawInfoResponse?
@Published var amountText = ""
@Published var smsCode = ""
@Published var isLoading = false
@Published var isSubmitting = false
@Published var smsCountdown = 0
@Published var errorMessage: String?
///
func load(api: WalletServing) async {
@ -294,28 +292,27 @@ final class WithdrawApplyViewModel {
}
@MainActor
@Observable
/// ViewModel
final class WithdrawalSettingsViewModel {
var bankCard: WalletBankCardInfo?
var banks: [String] = []
var areas: [AreaNode] = []
var realName = ""
var cardNumber = ""
var bankName = ""
var branchName = ""
var provinceCode = ""
var cityCode = ""
var smsCode = ""
var frontImageData: Data?
var backImageData: Data?
var frontImageURL = ""
var backImageURL = ""
var uploadProgress = 0
var isLoading = false
var isSubmitting = false
var smsCountdown = 0
var errorMessage: String?
final class WithdrawalSettingsViewModel: ObservableObject {
@Published var bankCard: WalletBankCardInfo?
@Published var banks: [String] = []
@Published var areas: [AreaNode] = []
@Published var realName = ""
@Published var cardNumber = ""
@Published var bankName = ""
@Published var branchName = ""
@Published var provinceCode = ""
@Published var cityCode = ""
@Published var smsCode = ""
@Published var frontImageData: Data?
@Published var backImageData: Data?
@Published var frontImageURL = ""
@Published var backImageURL = ""
@Published var uploadProgress = 0
@Published var isLoading = false
@Published var isSubmitting = false
@Published var smsCountdown = 0
@Published var errorMessage: String?
///
func load(api: WalletServing) async {
@ -440,19 +437,18 @@ final class WithdrawalSettingsViewModel {
}
@MainActor
@Observable
/// ViewModel
final class PointsRedemptionViewModel {
var overview = PointOverviewResponse()
var records: [PointWithdrawItem] = []
var pointsText = ""
var isLoading = false
var isSubmitting = false
var errorMessage: String?
final class PointsRedemptionViewModel: ObservableObject {
@Published var overview = PointOverviewResponse()
@Published var records: [PointWithdrawItem] = []
@Published var pointsText = ""
@Published var isLoading = false
@Published var isSubmitting = false
@Published var errorMessage: String?
private let pageSize = 20
private var page = 1
private var total = 0
@Published private var page = 1
@Published private var total = 0
///
var canLoadMore: Bool {