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/Profile/API/ProfileAPI.swift
View File

@ -6,13 +6,12 @@
//
import Foundation
import Observation
import Combine
@MainActor
@Observable
/// 个人信息 API，封装“我的”页面需要的用户资料和资料更新接口。
final class ProfileAPI {
@ObservationIgnored private let client: APIClient
private let client: APIClient
/// 初始化个人信息 API，并注入共享网络客户端。
init(client: APIClient) {

15
suixinkan/Features/Profile/ViewModels/AccountSwitchViewModel.swift
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? {

23
suixinkan/Features/Profile/ViewModels/ProfileViewModel.swift
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) ?? "未设置昵称"

43
suixinkan/Features/Profile/ViewModels/RealNameAuthViewModel.swift
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 {

22
suixinkan/Features/Profile/Views/AccountSwitchView.swift
View File

@ -9,19 +9,19 @@ import SwiftUI
/// 账号切换页面，展示当前登录主体下可进入的景区账号和门店账号。
struct AccountSwitchView: View {
@Environment(AppSession.self) private var appSession
@Environment(AccountContext.self) private var accountContext
@Environment(PermissionContext.self) private var permissionContext
@Environment(AppRouter.self) private var appRouter
@Environment(ProfileAPI.self) private var profileAPI
@Environment(AuthAPI.self) private var authAPI
@Environment(AccountContextAPI.self) private var accountContextAPI
@Environment(AuthSessionCoordinator.self) private var authSessionCoordinator
@Environment(ToastCenter.self) private var toastCenter
@EnvironmentObject private var appSession: AppSession
@EnvironmentObject private var accountContext: AccountContext
@EnvironmentObject private var permissionContext: PermissionContext
@EnvironmentObject private var appRouter: AppRouter
@Environment(\.profileAPI) private var profileAPI
@Environment(\.authAPI) private var authAPI
@Environment(\.accountContextAPI) private var accountContextAPI
@Environment(\.authSessionCoordinator) private var authSessionCoordinator
@EnvironmentObject private var toastCenter: ToastCenter
@Environment(\.globalLoading) private var globalLoading
@Environment(\.dismiss) private var dismiss
@State private var viewModel = AccountSwitchViewModel()
@StateObject private var viewModel = AccountSwitchViewModel()
private var selectedAccount: AccountSwitchAccount? {
viewModel.selectedAccount
@ -43,7 +43,7 @@ struct AccountSwitchView: View {
@ViewBuilder
private var accountList: some View {
if viewModel.accounts.isEmpty && !viewModel.loading {
ContentUnavailableView(
AppContentUnavailableView(
"暂无可切换账号",
systemImage: "person.crop.circle.badge.exclamationmark",
description: Text("当前登录账号下没有其他可切换账号。")

6
suixinkan/Features/Profile/Views/DebugHomeMenuPreviewView.swift
View File

@ -10,9 +10,9 @@ import SwiftUI
/// 首页菜单调试预览页，展示所有已知菜单入口并跳过权限过滤。
struct DebugHomeMenuPreviewView: View {
@Environment(AppRouter.self) private var appRouter
@Environment(RouterPath.self) private var router
@Environment(ToastCenter.self) private var toastCenter
@EnvironmentObject private var appRouter: AppRouter
@EnvironmentObject private var router: RouterPath
@EnvironmentObject private var toastCenter: ToastCenter
private let items = HomeMenuRouter.debugAllMenuItems()

44
suixinkan/Features/Profile/Views/ProfileView.swift
View File

@ -11,20 +11,20 @@ import UIKit
/// 个人信息页视图，展示用户资料、账号状态、实名认证状态和退出登录入口。
struct ProfileView: View {
@Environment(AppSession.self) private var appSession
@Environment(AccountContext.self) private var accountContext
@Environment(PermissionContext.self) private var permissionContext
@Environment(ScenicSpotContext.self) private var scenicSpotContext
@Environment(AppRouter.self) private var appRouter
@Environment(RouterPath.self) private var router
@Environment(ProfileAPI.self) private var profileAPI
@Environment(OSSUploadService.self) private var ossUploadService
@Environment(ToastCenter.self) private var toastCenter
@Environment(AuthSessionCoordinator.self) private var authSessionCoordinator
@EnvironmentObject private var appSession: AppSession
@EnvironmentObject private var accountContext: AccountContext
@EnvironmentObject private var permissionContext: PermissionContext
@EnvironmentObject private var scenicSpotContext: ScenicSpotContext
@EnvironmentObject private var appRouter: AppRouter
@EnvironmentObject private var router: RouterPath
@Environment(\.profileAPI) private var profileAPI
@Environment(\.ossUploadService) private var ossUploadService
@EnvironmentObject private var toastCenter: ToastCenter
@Environment(\.authSessionCoordinator) private var authSessionCoordinator
@Environment(\.globalLoading) private var globalLoading
@Environment(\.horizontalSizeClass) private var horizontalSizeClass
@State private var viewModel = ProfileViewModel()
@StateObject private var viewModel = ProfileViewModel()
@State private var showsPasswordSheet = false
@State private var showsLogoutConfirm = false
@State private var pickedAvatarItem: PhotosPickerItem?
@ -74,13 +74,13 @@ struct ProfileView: View {
}
Button("取消", role: .cancel) {}
}
.onChange(of: viewModel.isEditingProfile) { _, isEditing in
.onChange(of: viewModel.isEditingProfile) { isEditing in
guard isEditing else { return }
DispatchQueue.main.asyncAfter(deadline: .now() + 0.15) {
nicknameFocused = true
}
}
.onChange(of: pickedAvatarItem) { _, item in
.onChange(of: pickedAvatarItem) { item in
Task { await prepareAvatarImage(from: item) }
}
}
@ -662,14 +662,14 @@ private struct PasswordUpdateSheet: View {
#Preview {
NavigationStack {
ProfileView()
.environment(AppSession())
.environment(AccountContext())
.environment(PermissionContext())
.environment(ScenicSpotContext())
.environment(AppRouter())
.environment(ToastCenter())
.environment(ProfileAPI(client: APIClient()))
.environment(OSSUploadService(configService: UploadAPI(client: APIClient())))
.environment(AuthSessionCoordinator())
.environmentObject(AppSession())
.environmentObject(AccountContext())
.environmentObject(PermissionContext())
.environmentObject(ScenicSpotContext())
.environmentObject(AppRouter())
.environmentObject(ToastCenter())
.environment(\.profileAPI, ProfileAPI(client: APIClient()))
.environment(\.ossUploadService, OSSUploadService(configService: UploadAPI(client: APIClient())))
.environment(\.authSessionCoordinator, AuthSessionCoordinator())
}
}

14
suixinkan/Features/Profile/Views/RealNameAuthView.swift
View File

@ -11,12 +11,12 @@ import UIKit
/// 实名认证页面，展示审核状态并允许提交基础实名资料。
struct RealNameAuthView: View {
@Environment(AccountContext.self) private var accountContext
@Environment(ProfileAPI.self) private var profileAPI
@Environment(OSSUploadService.self) private var ossUploadService
@Environment(ToastCenter.self) private var toastCenter
@EnvironmentObject private var accountContext: AccountContext
@Environment(\.profileAPI) private var profileAPI
@Environment(\.ossUploadService) private var ossUploadService
@EnvironmentObject private var toastCenter: ToastCenter
@Environment(\.globalLoading) private var globalLoading
@State private var viewModel = RealNameAuthViewModel()
@StateObject private var viewModel = RealNameAuthViewModel()
@State private var pickedFrontItem: PhotosPickerItem?
@State private var pickedBackItem: PhotosPickerItem?
@ -38,10 +38,10 @@ struct RealNameAuthView: View {
.task {
await loadInfo()
}
.onChange(of: pickedFrontItem) { _, item in
.onChange(of: pickedFrontItem) { item in
Task { await prepareIdentityImage(from: item, side: .front) }
}
.onChange(of: pickedBackItem) { _, item in
.onChange(of: pickedBackItem) { item in
Task { await prepareIdentityImage(from: item, side: .back) }
}
}

2
suixinkan/Features/Profile/Views/SettingsFlowViews.swift
View File

@ -53,7 +53,7 @@ enum SettingsDisplayPolicy {
/// 设置中心页面，展示关于我们、版本、下载链接和协议入口。
struct SettingsCenterView: View {
@Environment(RouterPath.self) private var router
@EnvironmentObject private var router: RouterPath
@State private var copiedDownloadLink = false
private var versionText: String {