From 16cb06f5d1048582582a47def2ba636fc08ae0ad Mon Sep 17 00:00:00 2001 From: anlicheng <244108715@qq.com> Date: Fri, 17 Apr 2026 15:24:37 +0800 Subject: [PATCH] fix models --- punchnet/App/AppContext.swift | 6 +++--- punchnet/App/AppRootView.swift | 2 +- .../Network/ViewModels/NetworkModel.swift | 18 +++++++++--------- .../Features/Network/Views/NetworkView.swift | 6 +++--- .../Settings/Views/SettingsAboutView.swift | 4 ++-- .../Upgrade/ViewModels/AppUpdateManager.swift | 2 +- .../Features/Upgrade/Views/AppUpdateView.swift | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/punchnet/App/AppContext.swift b/punchnet/App/AppContext.swift index 4cbfacc..e9ec307 100644 --- a/punchnet/App/AppContext.swift +++ b/punchnet/App/AppContext.swift @@ -45,12 +45,12 @@ class AppContext { } enum Credit { - case token(token: String, session: SDLAPIClient.NetworkSession) - case accountAndPasword(account: String, password: String, session: SDLAPIClient.NetworkSession) + case token(token: String, session: NetworkSession) + case accountAndPasword(account: String, password: String, session: NetworkSession) } @ObservationIgnored - var networkSession: SDLAPIClient.NetworkSession? { + var networkSession: NetworkSession? { guard let loginCredit = self.loginCredit else { return nil } diff --git a/punchnet/App/AppRootView.swift b/punchnet/App/AppRootView.swift index 111893a..1751a68 100644 --- a/punchnet/App/AppRootView.swift +++ b/punchnet/App/AppRootView.swift @@ -61,7 +61,7 @@ struct AppRootView: View { // 将遮罩抽离，保持 body 清爽 @ViewBuilder - private func updateOverlay(info: SDLAPIClient.AppUpgradeInfo) -> some View { + private func updateOverlay(info: AppUpgradeInfo) -> some View { ZStack { Color.black.opacity(0.4) .ignoresSafeArea() diff --git a/punchnet/Features/Network/ViewModels/NetworkModel.swift b/punchnet/Features/Network/ViewModels/NetworkModel.swift index 28d666d..e6e4108 100644 --- a/punchnet/Features/Network/ViewModels/NetworkModel.swift +++ b/punchnet/Features/Network/ViewModels/NetworkModel.swift @@ -21,12 +21,12 @@ final class NetworkModel { var showMode: NetworkShowMode = .resource var phase: NetworkConnectionPhase = .disconnected - var networkSession: SDLAPIClient.NetworkSession? - var networkContext: SDLAPIClient.NetworkContext? + var networkSession: NetworkSession? + var networkContext: NetworkContext? var selectedExitNodeIp: String? var selectedNodeId: Int? - private(set) var nodeResourcesById: [Int: [SDLAPIClient.NetworkContext.Resource]] = [:] + private(set) var nodeResourcesById: [Int: [NetworkContext.Resource]] = [:] private(set) var loadingNodeIDs: Set = [] private(set) var isUpdatingExitNode: Bool = false private(set) var errorMessage: String? @@ -57,15 +57,15 @@ final class NetworkModel { self.phase == .connected } - var resourceList: [SDLAPIClient.NetworkContext.Resource] { + var resourceList: [NetworkContext.Resource] { self.networkContext?.resourceList ?? [] } - var nodeList: [SDLAPIClient.NetworkContext.Node] { + var nodeList: [NetworkContext.Node] { self.networkContext?.nodeList ?? [] } - var selectedNode: SDLAPIClient.NetworkContext.Node? { + var selectedNode: NetworkContext.Node? { self.networkContext?.getNode(id: self.selectedNodeId) } @@ -258,7 +258,7 @@ final class NetworkModel { } } - func resources(for nodeId: Int) -> [SDLAPIClient.NetworkContext.Resource] { + func resources(for nodeId: Int) -> [NetworkContext.Resource] { self.nodeResourcesById[nodeId] ?? [] } @@ -378,7 +378,7 @@ final class NetworkModel { self.syncSharedStateFromAppContext() } - private func applyNetworkContext(_ newContext: SDLAPIClient.NetworkContext?) async { + private func applyNetworkContext(_ newContext: NetworkContext?) async { let contextChanged = self.contextIdentity(self.networkContext) != self.contextIdentity(newContext) self.networkContext = newContext @@ -407,7 +407,7 @@ final class NetworkModel { } } - private func contextIdentity(_ context: SDLAPIClient.NetworkContext?) -> String? { + private func contextIdentity(_ context: NetworkContext?) -> String? { guard let context else { return nil } diff --git a/punchnet/Features/Network/Views/NetworkView.swift b/punchnet/Features/Network/Views/NetworkView.swift index 3c16057..b3f1753 100644 --- a/punchnet/Features/Network/Views/NetworkView.swift +++ b/punchnet/Features/Network/Views/NetworkView.swift @@ -366,7 +366,7 @@ struct NetworkDeviceGroupView: View { // MARK: - 子组件 struct NetworkNodeHeadView: View { - var node: SDLAPIClient.NetworkContext.Node + var node: NetworkContext.Node var body: some View { HStack(spacing: 10) { @@ -389,7 +389,7 @@ struct NetworkNodeHeadView: View { struct NetworkNodeDetailView: View { var model: NetworkModel - var node: SDLAPIClient.NetworkContext.Node + var node: NetworkContext.Node var body: some View { List { @@ -428,7 +428,7 @@ struct NetworkNodeDetailView: View { } struct ResourceItemCard: View { - let resource: SDLAPIClient.NetworkContext.Resource + let resource: NetworkContext.Resource @State private var isHovered = false var body: some View { diff --git a/punchnet/Features/Settings/Views/SettingsAboutView.swift b/punchnet/Features/Settings/Views/SettingsAboutView.swift index f576060..d6ed5d7 100644 --- a/punchnet/Features/Settings/Views/SettingsAboutView.swift +++ b/punchnet/Features/Settings/Views/SettingsAboutView.swift @@ -10,12 +10,12 @@ struct SettingsAboutView: View { @Environment(\.openURL) private var openURL @State private var isShowingFeedbackSheet = false - @State private var appPoliciesInfo: SDLAPIClient.AppPoliciesInfo? + @State private var appPoliciesInfo: AppPoliciesInfo? // 检查更新逻辑 @State private var updateManager = AppUpdateManager.shared @State private var showNoUpdateAlert = false - @State private var manualUpdateInfo: SDLAPIClient.AppUpgradeInfo? + @State private var manualUpdateInfo: AppUpgradeInfo? var body: some View { ScrollView(.vertical, showsIndicators: false) { diff --git a/punchnet/Features/Upgrade/ViewModels/AppUpdateManager.swift b/punchnet/Features/Upgrade/ViewModels/AppUpdateManager.swift index 64fe2c0..0cfa286 100644 --- a/punchnet/Features/Upgrade/ViewModels/AppUpdateManager.swift +++ b/punchnet/Features/Upgrade/ViewModels/AppUpdateManager.swift @@ -11,7 +11,7 @@ import Observation class AppUpdateManager { static let shared = AppUpdateManager() - var updateInfo: SDLAPIClient.AppUpgradeInfo? + var updateInfo: AppUpgradeInfo? var isChecking = false var showUpdateOverlay = false // 用于启动时的全局遮罩 diff --git a/punchnet/Features/Upgrade/Views/AppUpdateView.swift b/punchnet/Features/Upgrade/Views/AppUpdateView.swift index cbedd23..ae3e7e5 100644 --- a/punchnet/Features/Upgrade/Views/AppUpdateView.swift +++ b/punchnet/Features/Upgrade/Views/AppUpdateView.swift @@ -7,7 +7,7 @@ import SwiftUI struct AppUpdateView: View { - let info: SDLAPIClient.AppUpgradeInfo + let info: AppUpgradeInfo var dismissAction: () -> Void var body: some View {