从 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

@ -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("当前登录账号下没有其他可切换账号。")

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()

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())
}
}

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) }
}
}

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 {