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

5
suixinkan/Features/ScenicSettlement/API/ScenicSettlementAPI.swift
View File

@ -6,7 +6,7 @@
//
import Foundation
import Observation
import Combine
/// 景区结算服务协议，定义结算申请提交能力。
@MainActor
@ -16,10 +16,9 @@ protocol ScenicSettlementServing {
}
@MainActor
@Observable
/// 景区结算 API，封装结算申请提交网络请求。
final class ScenicSettlementAPI {
@ObservationIgnored private let client: APIClient
private let client: APIClient
/// 初始化景区结算 API，并注入共享网络客户端。
init(client: APIClient) {

42
suixinkan/Features/ScenicSettlement/ViewModels/ScenicSettlementViewModels.swift
View File

@ -6,24 +6,23 @@
//
import Foundation
import Observation
import Combine
import SwiftUI
@MainActor
@Observable
/// 景区结算申请 ViewModel，管理可申请景区、多选、金额备注和提交。
final class ScenicSettlementViewModel {
var existingScenics: [BusinessScope] = []
var options: [ScenicSettlementOption] = []
var amountText = ""
var remarkText = ""
var isLoading = false
var isSubmitting = false
var loadFailed = false
var loadFailureReason: String?
var message: String?
final class ScenicSettlementViewModel: ObservableObject {
@Published var existingScenics: [BusinessScope] = []
@Published var options: [ScenicSettlementOption] = []
@Published var amountText = ""
@Published var remarkText = ""
@Published var isLoading = false
@Published var isSubmitting = false
@Published var loadFailed = false
@Published var loadFailureReason: String?
@Published var message: String?
private var selectedIds = Set<Int>()
@Published private var selectedIds = Set<Int>()
/// 已选择景区数量。
var selectedCount: Int {
@ -176,16 +175,15 @@ enum ScenicSettlementAmountValidation: Equatable {
}
@MainActor
@Observable
/// 景区结算审核 ViewModel，聚合景区申请和权限申请审核记录。
final class ScenicSettlementReviewViewModel {
var scenicApplications: [ScenicApplicationPendingResponse] = []
var roleApplications: [RoleApplyPendingResponse] = []
var isLoading = false
var message: String?
var loadFailedAll = false
var scenicLoadFailed = false
var roleLoadFailed = false
final class ScenicSettlementReviewViewModel: ObservableObject {
@Published var scenicApplications: [ScenicApplicationPendingResponse] = []
@Published var roleApplications: [RoleApplyPendingResponse] = []
@Published var isLoading = false
@Published var message: String?
@Published var loadFailedAll = false
@Published var scenicLoadFailed = false
@Published var roleLoadFailed = false
/// 待审核记录数量。
var pendingCount: Int {

24
suixinkan/Features/ScenicSettlement/Views/ScenicSettlementViews.swift
View File

@ -9,11 +9,11 @@ import SwiftUI
/// 景区结算申请页，支持选择未开通结算的景区并提交金额。
struct ScenicSettlementView: View {
@Environment(AccountContext.self) private var accountContext
@Environment(ScenicPermissionAPI.self) private var scenicPermissionAPI
@Environment(ScenicSettlementAPI.self) private var scenicSettlementAPI
@Environment(ToastCenter.self) private var toastCenter
@State private var viewModel = ScenicSettlementViewModel()
@EnvironmentObject private var accountContext: AccountContext
@Environment(\.scenicPermissionAPI) private var scenicPermissionAPI
@Environment(\.scenicSettlementAPI) private var scenicSettlementAPI
@EnvironmentObject private var toastCenter: ToastCenter
@StateObject private var viewModel = ScenicSettlementViewModel()
@State private var showScenicApplication = false
var body: some View {
@ -45,7 +45,7 @@ struct ScenicSettlementView: View {
ScenicApplicationView()
}
}
.onChange(of: viewModel.message) { _, message in
.onChange(of: viewModel.message) { message in
guard let message else { return }
toastCenter.show(message)
viewModel.message = nil
@ -92,7 +92,7 @@ struct ScenicSettlementView: View {
.frame(maxWidth: .infinity, minHeight: 120)
} else if viewModel.loadFailed {
VStack(spacing: AppMetrics.Spacing.xSmall) {
ContentUnavailableView(
AppContentUnavailableView(
"可申请景区加载失败",
systemImage: "exclamationmark.triangle",
description: Text(viewModel.loadFailureReason ?? "请检查网络后重试")
@ -195,9 +195,9 @@ struct ScenicSettlementView: View {
/// 景区结算审核记录页，展示景区申请和权限申请审核状态。
struct ScenicSettlementReviewView: View {
@Environment(ScenicPermissionAPI.self) private var scenicPermissionAPI
@Environment(ToastCenter.self) private var toastCenter
@State private var viewModel = ScenicSettlementReviewViewModel()
@Environment(\.scenicPermissionAPI) private var scenicPermissionAPI
@EnvironmentObject private var toastCenter: ToastCenter
@StateObject private var viewModel = ScenicSettlementReviewViewModel()
var body: some View {
ScrollView {
@ -221,7 +221,7 @@ struct ScenicSettlementReviewView: View {
.refreshable {
await viewModel.load(api: scenicPermissionAPI)
}
.onChange(of: viewModel.message) { _, message in
.onChange(of: viewModel.message) { message in
guard let message else { return }
toastCenter.show(message)
viewModel.message = nil
@ -230,7 +230,7 @@ struct ScenicSettlementReviewView: View {
private var fullFailureView: some View {
VStack(spacing: AppMetrics.Spacing.small) {
ContentUnavailableView(
AppContentUnavailableView(
"审核记录加载失败",
systemImage: "exclamationmark.triangle",
description: Text("景区申请与权限申请均未加载成功，请检查网络后重试")