anlicheng/punchnet-macos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix device

Browse Source
This commit is contained in:
anlicheng 2026-03-20 00:13:03 +08:00
parent 82c02739b8
commit 5ab94163a6
5 changed files with 117 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
punchnet/Views/AppContext.swift
View File

@ -12,6 +12,9 @@ import Observation
class AppContext {
var noticePort: Int
// 调用 "/connect" 之后的网络信息
var networkContext: NetworkContext?
init(noticePort: Int) {
self.noticePort = noticePort
}

5
punchnet/Views/Network/NetworkModel.swift
View File

@ -53,6 +53,7 @@ struct Node: Codable {
struct NetworkContext: Codable {
let ip: String
let maskLen: UInt8
// 主机名称
let hostname: String
let identityId: UInt32
let resourceList: [Resource]
@ -110,13 +111,15 @@ class NetworkModel {
}
}
func connect(networkSession: UserContext.NetworkSession) async throws {
func connect(networkSession: UserContext.NetworkSession) async throws -> NetworkContext {
let params: [String: Any] = [
"client_id": SystemConfig.getClientId(),
"access_token": networkSession.accessToken
]
self.networkContext = try await SDLAPIClient.doPost(path: "/connect", params: params, as: NetworkContext.self)
return self.networkContext
}
}

6
punchnet/Views/Network/NetworkView.swift
View File

@ -190,9 +190,11 @@ extension NetworkView {
return
}
try await networkModel.connect(networkSession: session)
let context = try await networkModel.connect(networkSession: session)
// 登陆后需要保存到app的上线文
self.appContext.networkContext = context
let context = networkModel.networkContext
if let options = SystemConfig.getOptions(
networkId: UInt32(session.networkId),
networkDomain: session.networkDomain,

125
punchnet/Views/Settings/SettingsDeviceView.swift
View File

@ -8,36 +8,115 @@
import SwiftUI
struct SettingsDeviceView: View {
@Environment(AppContext.self) var appContext: AppContext
var body: some View {
VStack(alignment: .leading) {
Text("设备")
HStack {
Text("设备名称")
Text("史蒂夫的air")
ScrollView(.vertical, showsIndicators: false) {
VStack(alignment: .leading, spacing: 28) {
Button {
// MARK: - 设备概览标题
HStack(spacing: 16) {
Image(systemName: "laptopcomputer")
.font(.system(size: 36))
.foregroundStyle(.blue.gradient)
.frame(width: 60, height: 60)
.background(Color.blue.opacity(0.1))
.cornerRadius(12)
} label: {
Text("修改")
VStack(alignment: .leading, spacing: 4) {
Text(self.appContext.networkContext?.hostname ?? "为定义")
.font(.title3.bold())
Text(SystemConfig.systemInfo)
.font(.subheadline)
.foregroundColor(.secondary)
}
}
.padding(.horizontal, 4)
// MARK: - 详细参数卡片
VStack(alignment: .leading, spacing: 0) {
// 设备名称行
DevicePropertyRow(title: "设备名称", value: self.appContext.networkContext?.hostname ?? "为定义") {
Button {
// 修改逻辑
} label: {
Text("修改")
.font(.subheadline.bold())
.padding(.horizontal, 12)
.padding(.vertical, 4)
.background(Capsule().fill(Color.blue.opacity(0.1)))
.foregroundColor(.blue)
}
.buttonStyle(.plain)
}
Divider().padding(.leading, 16)
// IPv4 行
DevicePropertyRow(title: "虚拟 IPv4", value: self.appContext.networkContext?.ip ?? "0.0.0.0") {
Image(systemName: "info.circle")
.foregroundColor(.secondary)
}
Divider().padding(.leading, 16)
// // IPv6 行
// DevicePropertyRow(title: "虚拟 IPv6", value: "fe80::ab:ef:1") {
// Text("已加密")
// .font(.caption2.bold())
// .padding(.horizontal, 6)
// .padding(.vertical, 2)
// .background(Color.green.opacity(0.1))
// .foregroundColor(.green)
// .cornerRadius(4)
// }
}
.background(Color.primary.opacity(0.03))
.cornerRadius(12)
.overlay(RoundedRectangle(cornerRadius: 12).stroke(Color.primary.opacity(0.05), lineWidth: 1))
// MARK: - 底部说明
Text("此设备在虚拟网络中是唯一的，修改名称不会影响连接标识。")
.font(.caption)
.foregroundColor(.secondary)
.padding(.horizontal, 4)
Spacer()
}
HStack {
Text("虚拟IPv4")
Text("192.168.1.1")
}
HStack {
Text("虚拟IPv6")
Text("ab:ef:1")
}
Spacer()
.padding(32)
.frame(maxWidth: 600, alignment: .leading)
}
}
}
#Preview {
SettingsDeviceView()
// MARK: - 子组件：设备属性行
struct DevicePropertyRow<Content: View>: View {
let title: String
let value: String
let trailingContent: () -> Content
init(title: String, value: String, @ViewBuilder trailingContent: @escaping () -> Content) {
self.title = title
self.value = value
self.trailingContent = trailingContent
}
var body: some View {
HStack {
Text(title)
.foregroundColor(.secondary)
.frame(width: 100, alignment: .leading)
Text(value)
.fontWeight(.medium)
.font(.system(.body, design: .monospaced)) // 使用等宽字体显示 IP 更专业
Spacer()
trailingContent()
}
.padding(.horizontal, 16)
.padding(.vertical, 14)
}
}

6
punchnet/punchnetApp.swift
View File

@ -50,8 +50,7 @@ struct punchnetApp: App {
var body: some Scene {
WindowGroup(id: "main") {
// RootView()
SettingsView()
RootView()
.navigationTitle("")
.environment(self.appContext)
.environment(self.userContext)
@ -72,6 +71,7 @@ struct punchnetApp: App {
Window("设置", id: "settings") {
SettingsView()
.environment(self.userContext)
.environment(self.appContext)
}
.defaultSize(width: 800, height: 500)
.defaultPosition(.center)
@ -79,6 +79,7 @@ struct punchnetApp: App {
Window("重置密码", id: "resetPassword") {
ResetPasswordRootView()
.environment(self.userContext)
.environment(self.appContext)
}
.defaultSize(width: 800, height: 500)
.defaultPosition(.center)
@ -86,6 +87,7 @@ struct punchnetApp: App {
Window("注册", id: "register") {
ResetPasswordRootView()
.environment(self.userContext)
.environment(self.appContext)
}
.defaultSize(width: 800, height: 500)
.defaultPosition(.center)