From 23850ef24e614c2051e072fafdb673ccb8129c30 Mon Sep 17 00:00:00 2001 From: Junhui Chen Date: Fri, 19 Sep 2025 00:09:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0SVGKit=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E5=B9=B6=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=92=8CUI=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wake.xcodeproj/project.pbxproj | 4 ++++ wake/Features/BlindBox/View/BlindOutCome.swift | 2 ++ wake/View/Login/Login.swift | 4 +++- wake/View/Owner/AccountView.swift | 4 ++-- wake/WakeApp.swift | 12 +++++------- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/wake.xcodeproj/project.pbxproj b/wake.xcodeproj/project.pbxproj index 682dbbb..81bc9bf 100644 --- a/wake.xcodeproj/project.pbxproj +++ b/wake.xcodeproj/project.pbxproj @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 0DE4253B2E78470700B519F0 /* SVGKit in Frameworks */ = {isa = PBXBuildFile; productRef = AB6693C92E65C94400BCAAC1 /* SVGKit */; }; + 0DE4253C2E78470700B519F0 /* SVGKitSwift in Frameworks */ = {isa = PBXBuildFile; productRef = AB6693CB2E65C94400BCAAC1 /* SVGKitSwift */; }; AB6695272E67015600BCAAC1 /* WaterfallGrid in Frameworks */ = {isa = PBXBuildFile; productRef = AB6695262E67015600BCAAC1 /* WaterfallGrid */; }; AB8773632E4E04400071CB53 /* .gitignore in Resources */ = {isa = PBXBuildFile; fileRef = AB8773622E4E040E0071CB53 /* .gitignore */; }; ABC150C12E5DB39A00A1F970 /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = ABC150C02E5DB39A00A1F970 /* Lottie */; }; @@ -76,6 +78,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 0DE4253C2E78470700B519F0 /* SVGKitSwift in Frameworks */, + 0DE4253B2E78470700B519F0 /* SVGKit in Frameworks */, ABE8998E2E533A7100CD7BA6 /* Alamofire in Frameworks */, AB6695272E67015600BCAAC1 /* WaterfallGrid in Frameworks */, ABC150C12E5DB39A00A1F970 /* Lottie in Frameworks */, diff --git a/wake/Features/BlindBox/View/BlindOutCome.swift b/wake/Features/BlindBox/View/BlindOutCome.swift index 16d4b8d..d6852ee 100644 --- a/wake/Features/BlindBox/View/BlindOutCome.swift +++ b/wake/Features/BlindBox/View/BlindOutCome.swift @@ -125,6 +125,8 @@ struct BlindOutcomeView: View { } } .navigationBarHidden(true) + + .navigationBarBackButtonHidden(true) .overlay( JoinModal(isPresented: $showIPListModal, onClose: { onContinue() }) diff --git a/wake/View/Login/Login.swift b/wake/View/Login/Login.swift index 248b4ca..fc7554c 100644 --- a/wake/View/Login/Login.swift +++ b/wake/View/Login/Login.swift @@ -72,7 +72,9 @@ struct LoginView: View { let nonce = String.randomURLSafeString(length: 32) self.currentNonce = nonce request.nonce = self.sha256(nonce) - request.requestedScopes = [.fullName, .email] + // 不请求任何可识别个人信息的范围，遵循最小化数据收集原则 + // 若业务未来确有需要，可根据功能在提交审核前按需开启 + // request.requestedScopes = [.fullName, .email] print(" 登录请求配置完成，nonce 已设置") } onCompletion: { result in print(" 收到 Apple 登录回调") diff --git a/wake/View/Owner/AccountView.swift b/wake/View/Owner/AccountView.swift index e477128..2d70a92 100644 --- a/wake/View/Owner/AccountView.swift +++ b/wake/View/Owner/AccountView.swift @@ -131,11 +131,11 @@ struct AccountView: View { }) { Text("Confirm") - .foregroundColor(.themeTextWhite) + .foregroundColor(.white) .font(.system(size: 12)) .frame(maxWidth: .infinity) .padding() - .background(Color.themeTextWhiteSecondary) + .background(Color.gray) .cornerRadius(32) } } diff --git a/wake/WakeApp.swift b/wake/WakeApp.swift index 5b1f2f1..92e28aa 100644 --- a/wake/WakeApp.swift +++ b/wake/WakeApp.swift @@ -46,15 +46,10 @@ struct WakeApp: App { if authState.isAuthenticated { // 已登录：显示主页面 NavigationStack(path: $router.path) { - // FIXME 调回来 BlindBoxView(mediaType: .all) .navigationDestination(for: AppRoute.self) { route in route.view } - // UserInfo() - // .navigationDestination(for: AppRoute.self) { route in - // route.view - // } } } else { // 未登录：显示登录界面 @@ -104,10 +99,13 @@ struct WakeApp: App { // 检查token是否有效 if TokenManager.shared.isTokenValid(token) { authState.isAuthenticated = true + } else { + // 跳转到登录页面 + authState.isAuthenticated = false } - // 2秒后自动隐藏启动页 - DispatchQueue.main.asyncAfter(deadline: .now() + 2) { + // 自动隐藏启动页 + DispatchQueue.main.asyncAfter(deadline: .now()) { withAnimation { showSplash = false }