From e3958d7d92aaba2815b8aeee04b512b763dbbc14 Mon Sep 17 00:00:00 2001
From: anlicheng <244108715@qq.com>
Date: Tue, 26 May 2026 17:25:13 +0800
Subject: [PATCH] fix env support

---
 punchnet/App/punchnetApp.swift                    | 12 ++++--------
 punchnet/Features/MenuBar/Views/MainMenuBar.swift |  9 +++++----
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/punchnet/App/punchnetApp.swift b/punchnet/App/punchnetApp.swift
index 1ab1bc0..6e59dc6 100644
--- a/punchnet/App/punchnetApp.swift
+++ b/punchnet/App/punchnetApp.swift
@@ -42,7 +42,7 @@ struct punchnetApp: App {
     }
     
     var body: some Scene {
-        Window("Punchnet", id: "main") {
+        Window("Punchnet", id: "main-\(SystemConfig.env.rawValue)") {
             AppRootView()
                 .navigationTitle("")
                 .environment(self.appContext)
@@ -65,7 +65,7 @@ struct punchnetApp: App {
         .defaultPosition(.center)
         .windowStyle(.hiddenTitleBar)
         
-        Window("settings", id: "settings") {
+        Window("settings", id: "settings-\(SystemConfig.env.rawValue)") {
             SettingsView()
                 .environment(self.appContext)
                 .frame(width: 750, height: 450)
@@ -74,7 +74,7 @@ struct punchnetApp: App {
         .defaultPosition(.center)
         .windowStyle(.hiddenTitleBar)
 
-        MenuBarExtra("Punchnet", image: "logo_32") {
+        MenuBarExtra("Punchnet-\(SystemConfig.env.rawValue)", image: "logo_32") {
             MainMenuBar()
                 .environment(appContext)
         }
@@ -87,11 +87,7 @@ struct punchnetApp: App {
 class AppDelegate: NSObject, NSApplicationDelegate {
     
     func applicationWillFinishLaunching(_ notification: Notification) {
-//        let settings = SCDynamicStoreCopyProxies(nil)
-//        let proxies = settings as? [String: Any] ?? [:]
-//        for (key, value) in proxies {
-//            print("\(key): \(value)")
-//        }
+        
     }
     
     func applicationShouldTerminate(_ sender: NSApplication) -> NSApplication.TerminateReply {
diff --git a/punchnet/Features/MenuBar/Views/MainMenuBar.swift b/punchnet/Features/MenuBar/Views/MainMenuBar.swift
index e19af03..e823469 100644
--- a/punchnet/Features/MenuBar/Views/MainMenuBar.swift
+++ b/punchnet/Features/MenuBar/Views/MainMenuBar.swift
@@ -48,14 +48,15 @@ struct MainMenuBar: View {
             Divider()
             
             Button("打开控制面板") {
-                openWindow(id: "main")
+                openWindow(id: "main-\(SystemConfig.env.rawValue)")
                 NSApp.activate(ignoringOtherApps: true)
+                print("call me open main")
             }
             
-            SettingsLink {
-                Text("设置")
+            Button("设置") {
+                openWindow(id: "settings-\(SystemConfig.env.rawValue)")
+                NSApp.activate(ignoringOtherApps: true)
             }
-            .buttonStyle(.plain)
             
             Divider()