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>

suixinkan/Features/Payment/API/PaymentAPI.swift

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import Observation
+import Combine
 
 /// 收款模块服务协议，定义收款码和收款记录接口能力。
 @MainActor
@@ -19,10 +19,9 @@ protocol PaymentServing {
 }
 
 @MainActor
-@Observable
 /// 收款 API，封装首页“收款”模块需要的网络请求。
 final class PaymentAPI {
-    @ObservationIgnored private let client: APIClient
+    private let client: APIClient
 
     /// 初始化收款 API，并注入共享网络客户端。
     init(client: APIClient) {

suixinkan/Features/Payment/ViewModels/PaymentViewModel.swift

@@ -8,25 +8,24 @@
 import CoreImage
 import CoreImage.CIFilterBuiltins
 import Foundation
-import Observation
+import Combine
 import UIKit
 
 @MainActor
-@Observable
 /// 收款页 ViewModel，管理收款码加载、动态金额二维码和到账轮询。
-final class PaymentCollectionViewModel {
-    var staticPayUrl = ""
-    var dynamicPayUrl = ""
-    var amountText = ""
-    var remarkText = ""
-    var currentPayUrl = ""
-    var qrImage: UIImage?
-    var isLoading = false
-    var isPolling = false
-    var errorMessage: String?
-    var status: PaymentCollectionStatus = .idle
+final class PaymentCollectionViewModel: ObservableObject {
+    @Published var staticPayUrl = ""
+    @Published var dynamicPayUrl = ""
+    @Published var amountText = ""
+    @Published var remarkText = ""
+    @Published var currentPayUrl = ""
+    @Published var qrImage: UIImage?
+    @Published var isLoading = false
+    @Published var isPolling = false
+    @Published var errorMessage: String?
+    @Published var status: PaymentCollectionStatus = .idle
 
-    private var knownRecordIDs = Set<String>()
+    @Published private var knownRecordIDs = Set<String>()
     private let context = CIContext()
     private let qrFilter = CIFilter.qrCodeGenerator()
 
@@ -191,12 +190,11 @@ private extension String {
 }
 
 @MainActor
-@Observable
 /// 收款记录 ViewModel，管理收款记录加载、日期分组和汇总兜底。
-final class PaymentCollectionRecordViewModel {
-    var groups: [PaymentCollectionRecordGroup] = []
-    var isLoading = false
-    var errorMessage: String?
+final class PaymentCollectionRecordViewModel: ObservableObject {
+    @Published var groups: [PaymentCollectionRecordGroup] = []
+    @Published var isLoading = false
+    @Published var errorMessage: String?
 
     /// 加载当前景区收款记录，无景区时不请求接口。
     func load(api: PaymentServing, scenicId: Int?) async {

suixinkan/Features/Payment/Views/PaymentCollectionView.swift

@@ -11,12 +11,12 @@ import SwiftUI
 
 /// 收款页，展示静态收款码、动态金额收款和收款记录入口。
 struct PaymentCollectionView: View {
-    @Environment(AccountContext.self) private var accountContext
-    @Environment(PaymentAPI.self) private var paymentAPI
-    @Environment(ToastCenter.self) private var toastCenter
+    @EnvironmentObject private var accountContext: AccountContext
+    @Environment(\.paymentAPI) private var paymentAPI
+    @EnvironmentObject private var toastCenter: ToastCenter
     @Environment(\.globalLoading) private var globalLoading
 
-    @State private var viewModel = PaymentCollectionViewModel()
+    @StateObject private var viewModel = PaymentCollectionViewModel()
     @State private var showingAmountSheet = false
     @State private var pollingTask: Task<Void, Never>?
     @State private var speaker = PaymentVoiceSpeaker()
@@ -56,12 +56,12 @@ struct PaymentCollectionView: View {
         .onDisappear {
             pollingTask?.cancel()
         }
-        .onChange(of: viewModel.errorMessage) { _, message in
+        .onChange(of: viewModel.errorMessage) { message in
             if let message {
                 toastCenter.show(message)
             }
         }
-        .onChange(of: viewModel.status) { _, status in
+        .onChange(of: viewModel.status) { status in
             if case .success(let item) = status {
                 speaker.speak("收款到账\(item.orderAmount)元")
             }
@@ -256,11 +256,11 @@ struct PaymentCollectionView: View {
 
 /// 收款记录页，按日期展示扫码收款明细。
 struct PaymentCollectionRecordView: View {
-    @Environment(AccountContext.self) private var accountContext
-    @Environment(PaymentAPI.self) private var paymentAPI
-    @Environment(ToastCenter.self) private var toastCenter
+    @EnvironmentObject private var accountContext: AccountContext
+    @Environment(\.paymentAPI) private var paymentAPI
+    @EnvironmentObject private var toastCenter: ToastCenter
     @Environment(\.globalLoading) private var globalLoading
-    @State private var viewModel = PaymentCollectionRecordViewModel()
+    @StateObject private var viewModel = PaymentCollectionRecordViewModel()
 
     var body: some View {
         List {
@@ -304,7 +304,7 @@ struct PaymentCollectionRecordView: View {
                 await viewModel.load(api: paymentAPI, scenicId: accountContext.currentScenic?.id)
             }
         }
-        .onChange(of: viewModel.errorMessage) { _, message in
+        .onChange(of: viewModel.errorMessage) { message in
             if let message {
                 toastCenter.show(message)
             }
@@ -314,9 +314,8 @@ struct PaymentCollectionRecordView: View {
 
 /// 收款语音播报服务，使用系统 TTS 播报到账提示。
 @MainActor
-@Observable
 final class PaymentVoiceSpeaker {
-    @ObservationIgnored private let synthesizer = AVSpeechSynthesizer()
+    private let synthesizer = AVSpeechSynthesizer()
 
     /// 播报指定中文文案。
     func speak(_ text: String) {