lujiuyin/suixinkan_ios_new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate from iOS 17 Observation to iOS 16-compatible Combine architecture.

Browse Source 
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>
This commit is contained in:
汉秋
2026-06-26 10:16:35 +08:00
parent c32a610ee0
commit 26f4d0e671
127 changed files with 2320 additions and 1465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
suixinkan/Features/Auth/Views/AccountSelectionView.swift
View File

@ -44,7 +44,7 @@ struct AccountSelectionView: View {
@ViewBuilder
private var accountList: some View {
if payload.accounts.isEmpty {
ContentUnavailableView(
AppContentUnavailableView(
"暂无可用账号",
systemImage: "person.crop.circle.badge.exclamationmark",
description: Text("当前账号没有可用的景区账号或门店账号，请联系管理员。")

38
suixinkan/Features/Auth/Views/LoginView.swift
View File

@ -9,17 +9,17 @@ import SwiftUI
/// 登录页视图，负责展示登录表单、协议确认和多账号选择入口。
struct LoginView: View {
@Environment(AppSession.self) private var appSession
@Environment(AccountContext.self) private var accountContext
@Environment(PermissionContext.self) private var permissionContext
@Environment(ToastCenter.self) private var toastCenter
@Environment(AuthAPI.self) private var authAPI
@Environment(ProfileAPI.self) private var profileAPI
@Environment(AccountContextAPI.self) private var accountContextAPI
@Environment(AuthSessionCoordinator.self) private var authSessionCoordinator
@EnvironmentObject private var appSession: AppSession
@EnvironmentObject private var accountContext: AccountContext
@EnvironmentObject private var permissionContext: PermissionContext
@EnvironmentObject private var toastCenter: ToastCenter
@Environment(\.authAPI) private var authAPI
@Environment(\.profileAPI) private var profileAPI
@Environment(\.accountContextAPI) private var accountContextAPI
@Environment(\.authSessionCoordinator) private var authSessionCoordinator
@Environment(\.globalLoading) private var globalLoading
@Environment(\.horizontalSizeClass) private var horizontalSizeClass
@State private var viewModel = LoginViewModel()
@StateObject private var viewModel = LoginViewModel()
@FocusState private var focusedField: LoginField?
private var contentMaxWidth: CGFloat {
@ -76,11 +76,11 @@ struct LoginView: View {
)
}
}
.onChange(of: viewModel.username) { _, _ in
.onChange(of: viewModel.username) { _ in
viewModel.normalizeUsernameCountryCodeIfNeeded()
dismissLoginToastIfNeeded()
}
.onChange(of: viewModel.password) { _, _ in
.onChange(of: viewModel.password) { _ in
dismissLoginToastIfNeeded()
}
.task {
@ -462,12 +462,12 @@ private struct LoginAgreementConsentSheet: View {
#Preview {
LoginView()
.environment(AppSession())
.environment(AccountContext())
.environment(PermissionContext())
.environment(ToastCenter())
.environment(AuthAPI(client: APIClient()))
.environment(ProfileAPI(client: APIClient()))
.environment(AccountContextAPI(client: APIClient()))
.environment(AuthSessionCoordinator())
.environmentObject(AppSession())
.environmentObject(AccountContext())
.environmentObject(PermissionContext())
.environmentObject(ToastCenter())
.environment(\.authAPI, AuthAPI(client: APIClient()))
.environment(\.profileAPI, ProfileAPI(client: APIClient()))
.environment(\.accountContextAPI, AccountContextAPI(client: APIClient()))
.environment(\.authSessionCoordinator, AuthSessionCoordinator())
}