feat: 升级版本至1.0.1并添加外部显示器支持

- 更新版本号至1.0.1
- 添加外部显示器检测功能
- 更新README文档说明新特性
- 移除临时Applications链接

PowerBar.xcodeproj/project.pbxproj

@@ -250,6 +250,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
@@ -259,12 +260,13 @@
 				ENABLE_PREVIEWS = YES;
 				ENABLE_USER_SELECTED_FILES = readonly;
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_KEY_LSUIElement = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = me.leo12025.PowerBar;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;
@@ -274,7 +276,6 @@
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
 				SWIFT_VERSION = 5.0;
-				INFOPLIST_KEY_LSUIElement = YES;
 			};
 			name = Debug;
 		};
@@ -283,6 +284,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
@@ -292,12 +294,13 @@
 				ENABLE_PREVIEWS = YES;
 				ENABLE_USER_SELECTED_FILES = readonly;
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_KEY_LSUIElement = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = me.leo12025.PowerBar;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;
@@ -307,7 +310,6 @@
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
 				SWIFT_VERSION = 5.0;
-				INFOPLIST_KEY_LSUIElement = YES;
 			};
 			name = Release;
 		};

PowerBar/AppState.swift

@@ -3,6 +3,7 @@ import Combine
 import IOKit.pwr_mgt
 import ServiceManagement
 import AppKit
+import UserNotifications
 
 // MARK: - App State Manager
 class AppState: ObservableObject {
@@ -11,24 +12,25 @@ class AppState: ObservableObject {
     // 功能的总开关
     @Published var isFunctionEnabled: Bool = false
     
-    // 用户当前是否空闲
-    @Published var isUserIdle: Bool = false
-    
     // 自动启动设置
     @Published var isLaunchAtLogin: Bool = false
     
     // 内部属性
-    private var monitorTimer: Timer?
     private var caffeinateProcess: Process? // 直接使用Process对象，但简化实现
-    
-    // 配置参数
-    private let idleThreshold: TimeInterval = 300 // 5分钟无操作视为空闲
-    private let checkInterval: TimeInterval = 10  // 每10秒检查一次
+    private var displayCountObserver: AnyCancellable? // 监听显示器数量变化
+    private var wasAutomaticallyEnabled: Bool = false // 记录是否是自动启用的
+    private var currentDisplayCount: Int = NSScreen.screens.count // 当前显示器数量
     
     // 初始化方法
     init() {
         // 检查并设置初始的自动启动状态
         checkLaunchAtLoginStatus()
+        
+        // 请求通知权限
+        requestNotificationPermission()
+        
+        // 设置显示器数量变化监听
+        setupDisplayCountObserver()
     }
 
     // MARK: - Public Methods
@@ -37,52 +39,11 @@ class AppState: ObservableObject {
     func toggleFunction() {
         isFunctionEnabled.toggle()
         if isFunctionEnabled {
-            // 开启功能，立即开始一轮检查，并设置定时器
-            performCheck()
-            startMonitoringTimer()
-        } else {
-            // 关闭功能，停止一切
-            stopMonitoringTimer()
-            stopCaffeinate()
-            updateUserIdleStatus(false) // 重置状态
-        }
-    }
-    
-    // MARK: - Monitoring Logic
-    
-    private func startMonitoringTimer() {
-        guard monitorTimer == nil else { return }
-        print("开始监控...")
-        // 使用 weak self 避免循环引用
-        monitorTimer = Timer.scheduledTimer(withTimeInterval: checkInterval, repeats: true) { [weak self] _ in
-            self?.performCheck()
-        }
-    }
-
-    private func stopMonitoringTimer() {
-        monitorTimer?.invalidate()
-        monitorTimer = nil
-        print("监控已停止。")
-    }
-
-    private func performCheck() {
-        // 1. 获取系统空闲时间
-        let idleTime = getSystemIdleTime()
-        
-        // 2. 判断是否空闲
-        let isIdleNow = (idleTime >= idleThreshold)
-
-        // 3. 如果用户状态发生了变化，则采取行动
-        if isIdleNow != isUserIdle {
-            updateUserIdleStatus(isIdleNow)
-            
-            if isIdleNow {
-                // 从“活动中”变为“空闲”
-                stopCaffeinate()
-            } else {
-                // 从“空闲”变为“活动中”
+            // 开启功能，直接启动caffeinate，不检查用户活动
             startCaffeinate()
-            }
+        } else {
+            // 关闭功能，停止caffeinate
+            stopCaffeinate()
         }
     }
 
@@ -125,7 +86,7 @@ class AppState: ObservableObject {
         // 简化实现，直接启动 caffeinate 进程
         caffeinateProcess = Process()
         caffeinateProcess?.executableURL = URL(fileURLWithPath: "/usr/bin/caffeinate")
-        caffeinateProcess?.arguments = ["-d"] // -d 指示系统不要关闭显示屏
+        caffeinateProcess?.arguments = ["-i", "-s", "-d"] // -i 防止用户不活动导致睡眠，-s 防止系统进入睡眠，-d 防止显示屏关闭
         
         // 配置输出，避免产生不必要的输出
         let outputPipe = Pipe()
@@ -155,14 +116,7 @@ class AppState: ObservableObject {
         print("已重置 caffeinate 进程引用")
     }
     
-    // MARK: - UI State Update
 
-    /// 在主线程更新用户空闲状态
-    private func updateUserIdleStatus(_ isIdle: Bool) {
-        DispatchQueue.main.async {
-            self.isUserIdle = isIdle
-        }
-    }
     
     // MARK: - Launch at Login Management
     
@@ -248,11 +202,122 @@ class AppState: ObservableObject {
         }
     }
     
+    // MARK: - Display Monitoring and Auto-enable
+    
+    /// 请求通知权限
+    private func requestNotificationPermission() {
+        let center = UNUserNotificationCenter.current()
+        center.requestAuthorization(options: [.alert, .sound, .badge]) { granted, error in
+            if granted {
+                print("通知权限已授予")
+            } else if let error = error {
+                print("请求通知权限失败: \(error)")
+            }
+        }
+    }
+    
+    /// 设置显示器数量变化监听
+    private func setupDisplayCountObserver() {
+        // 使用 Combine 监听 NSScreen.screens.count 的变化
+        // 这里使用定时器定期检查，因为没有直接的通知可以监听
+        displayCountObserver = Timer.publish(every: 5, on: .main, in: .common)
+            .autoconnect()
+            .sink { [weak self] _ in
+                self?.checkDisplayCount()
+            }
+    }
+    
+    /// 检查显示器数量变化
+    private func checkDisplayCount() {
+        let newDisplayCount = NSScreen.screens.count
+        
+        // 如果显示器数量变化
+        if newDisplayCount != currentDisplayCount {
+            if newDisplayCount > 1 {
+                // 外部显示器连接
+                handleExternalDisplayConnected()
+            } else {
+                // 外部显示器断开
+                handleExternalDisplayDisconnected()
+            }
+            currentDisplayCount = newDisplayCount
+        }
+    }
+    
+    /// 处理外部显示器连接
+    private func handleExternalDisplayConnected() {
+        if !isFunctionEnabled {
+            // 自动启用保持亮屏
+            wasAutomaticallyEnabled = true
+            toggleFunction()
+            
+            // 发送通知
+            sendNotification(title: "PowerBar", body: "检测到外部显示器，已自动打开保持亮屏功能")
+        }
+    }
+    
+    /// 处理外部显示器断开
+    private func handleExternalDisplayDisconnected() {
+        if wasAutomaticallyEnabled && isFunctionEnabled {
+            // 发送通知询问是否关闭保持亮屏
+            sendNotificationWithAction(title: "PowerBar", body: "外部显示器已断开，是否关闭保持亮屏功能？")
+        }
+    }
+    
+    /// 发送普通通知
+    private func sendNotification(title: String, body: String) {
+        let content = UNMutableNotificationContent()
+        content.title = title
+        content.body = body
+        content.sound = UNNotificationSound.default
+        
+        let request = UNNotificationRequest(identifier: UUID().uuidString, content: content, trigger: nil)
+        UNUserNotificationCenter.current().add(request) { error in
+            if let error = error {
+                print("发送通知失败: \(error)")
+            }
+        }
+    }
+    
+    /// 发送带操作的通知
+    private func sendNotificationWithAction(title: String, body: String) {
+        let content = UNMutableNotificationContent()
+        content.title = title
+        content.body = body
+        content.sound = UNNotificationSound.default
+        content.categoryIdentifier = "displayDisconnected"
+        
+        // 注册通知类别和操作
+        let cancelAction = UNNotificationAction(identifier: "cancel", title: "取消", options: [])
+        let disableAction = UNNotificationAction(identifier: "disable", title: "关闭", options: [])
+        let category = UNNotificationCategory(identifier: "displayDisconnected", actions: [disableAction, cancelAction], intentIdentifiers: [])
+        UNUserNotificationCenter.current().setNotificationCategories([category])
+        
+        let request = UNNotificationRequest(identifier: UUID().uuidString, content: content, trigger: nil)
+        UNUserNotificationCenter.current().add(request) { error in
+            if let error = error {
+                print("发送通知失败: \(error)")
+            }
+        }
+    }
+    
+    /// 处理通知操作
+    func handleNotificationResponse(identifier: String) {
+        if identifier == "disable" {
+            // 用户选择关闭保持亮屏
+            wasAutomaticallyEnabled = false
+            toggleFunction()
+        } else if identifier == "cancel" {
+            // 用户选择取消，保持当前状态
+            wasAutomaticallyEnabled = false
+        }
+    }
+    
     // MARK: - Deinitializer
     
     deinit {
         // 确保 App 退出时清理资源
-        stopMonitoringTimer()
         stopCaffeinate()
+        displayCountObserver?.cancel()
     }
 }

PowerBar/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,51 +1,61 @@
 {
   "images" : [
     {
+      "filename" : "icon_16x16.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "16x16"
     },
     {
+      "filename" : "icon_16x16@2x.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "16x16"
     },
     {
+      "filename" : "icon_32x32.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "32x32"
     },
     {
+      "filename" : "icon_32x32@2x.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "32x32"
     },
     {
+      "filename" : "icon_128x128.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "128x128"
     },
     {
+      "filename" : "icon_128x128@2x.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "128x128"
     },
     {
+      "filename" : "icon_256x256.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "256x256"
     },
     {
+      "filename" : "icon_256x256@2x.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "256x256"
     },
     {
+      "filename" : "icon_512x512.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "512x512"
     },
     {
+      "filename" : "icon_512x512@2x.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "512x512"

PowerBar/PowerBarApp.swift

@@ -1,5 +1,6 @@
 import SwiftUI
 import AppKit
+import UserNotifications
 
 @main
 struct PowerBarApp: App {
@@ -26,6 +27,30 @@ struct PowerBarApp: App {
                     .foregroundColor(appState.isFunctionEnabled ? .green : .gray)
             }
         }
+        .onChange(of: ScenePhase.active) {
+            // 当应用变为活动状态时，设置通知中心代理
+            UNUserNotificationCenter.current().delegate = NotificationDelegate.shared
+            NotificationDelegate.shared.appState = appState
+        }
+    }
+}
+
+// 通知代理，处理通知响应
+class NotificationDelegate: NSObject, UNUserNotificationCenterDelegate {
+    static let shared = NotificationDelegate()
+    weak var appState: AppState?
+    
+    private override init() { super.init() }
+    
+    // 当通知在前台收到时调用
+    func userNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification) async -> UNNotificationPresentationOptions {
+        return [.banner, .sound]
+    }
+    
+    // 当用户点击通知操作时调用
+    func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse) async {
+        let actionIdentifier = response.actionIdentifier
+        appState?.handleNotificationResponse(identifier: actionIdentifier)
     }
 }
 
@@ -55,12 +80,15 @@ struct MenuContent: View {
             // 主要操作按钮：切换功能
             Button(action: {
                 // 点击按钮，切换功能的开关状态
+                withAnimation(.easeInOut(duration: 0.3)) {
                     appState.toggleFunction()
+                }
             }) {
                 HStack(spacing: 12) {
                     Image(systemName: appState.isFunctionEnabled ? "stop.circle.fill" : "play.circle.fill")
                         .foregroundColor(appState.isFunctionEnabled ? .red : .green)
                         .font(.title2)
+                        .transition(.scale(scale: 0.8, anchor: .center))
                     VStack(alignment: .leading, spacing: 2) {
                         Text(appState.isFunctionEnabled ? "关闭常亮" : "开启常亮")
                             .font(.body)
@@ -74,6 +102,7 @@ struct MenuContent: View {
                 .background(
                     RoundedRectangle(cornerRadius: 8)
                         .fill(appState.isFunctionEnabled ? Color.red.opacity(0.1) : Color.green.opacity(0.1))
+                        .transition(.opacity)
                 )
             }
             .buttonStyle(.plain)
@@ -89,17 +118,10 @@ struct MenuContent: View {
                     if appState.isFunctionEnabled {
                         HStack(spacing: 6) {
                             Circle()
-                                .fill(appState.isUserIdle ? Color.orange : Color.green)
+                                .fill(Color.green)
                                 .frame(width: 8, height: 8)
-                            Text(appState.isUserIdle ? "空闲" : "活动中")
+                            Text("保护中")
                                 .font(.body)
-                            
-                            // 附加显示 caffeinate 状态
-                            if !appState.isUserIdle {
-                                Text("(保护中)")
-                                    .font(.caption2)
-                                    .foregroundColor(.secondary)
-                            }
                         }
                     } else {
                         HStack(spacing: 6) {
@@ -112,6 +134,7 @@ struct MenuContent: View {
                     }
                     Spacer()
                 }
+
             }
             .padding(8)
             .background(
@@ -122,7 +145,7 @@ struct MenuContent: View {
             Divider()
 
             // 权限管理
-            VStack(alignment: .leading, spacing: 4) {
+            VStack(alignment: .leading, spacing: 8) {
                 Text("权限管理")
                     .font(.caption)
                     .foregroundColor(.secondary)
@@ -147,9 +170,15 @@ struct MenuContent: View {
                             .font(.caption)
                             .foregroundColor(.blue)
                     }
+                    .padding(8)
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    .background(
+                        RoundedRectangle(cornerRadius: 8)
+                            .fill(Color.blue.opacity(0.05))
+                    )
                 }
                 .buttonStyle(.plain)
-                .padding(4)
+
                 
                 // 打开用户与群组设置，用于管理登录项
                 Button(action: {
@@ -164,11 +193,16 @@ struct MenuContent: View {
                             .font(.caption)
                             .foregroundColor(.blue)
                     }
+                    .padding(8)
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    .background(
+                        RoundedRectangle(cornerRadius: 8)
+                            .fill(Color.blue.opacity(0.05))
+                    )
                 }
                 .buttonStyle(.plain)
-                .padding(4)
             }
-            .padding(4)
+            .padding(8)
 
             Divider()
 
@@ -185,7 +219,7 @@ struct MenuContent: View {
             }
             .toggleStyle(.checkbox)
             .font(.caption)
-            .padding(4)
+            .padding(8)
 
             Divider()
 
@@ -197,7 +231,7 @@ struct MenuContent: View {
             .buttonStyle(.plain)
             .font(.caption)
             .foregroundColor(.secondary)
-            .padding(4)
+            .padding(8)
 
             Divider()
 
@@ -208,7 +242,7 @@ struct MenuContent: View {
             .buttonStyle(.plain)
             .font(.caption)
             .foregroundColor(.secondary)
-            .padding(4)
+            .padding(8)
         }
         .padding(12)
         .frame(minWidth: 280)
@@ -239,6 +273,8 @@ struct MenuContent: View {
         window.title = "PowerBar 使用指南"
         window.contentView = NSHostingView(rootView: GuideView())
         window.center()
+        
+        // 显示窗口
         window.makeKeyAndOrderFront(nil)
         
         // 记录已显示指引
@@ -246,16 +282,6 @@ struct MenuContent: View {
         
         // 保存窗口引用
         guideWindow = window
-        
-        // 添加窗口关闭通知监听
-        NotificationCenter.default.addObserver(
-            forName: NSWindow.willCloseNotification,
-            object: window,
-            queue: nil
-        ) { _ in
-            // 窗口关闭时清除引用
-            guideWindow = nil
-        }
     }
 }
 
@@ -308,7 +334,7 @@ struct GuideView: View {
                         }
                         
                         HStack(spacing: 12) {
-                            Image(systemName: "power.on.circle")
+                            Image(systemName: "power.circle")
                                 .font(.title)
                                 .foregroundColor(.orange)
                                 .frame(width: 40)
@@ -415,6 +441,8 @@ struct GuideView: View {
                         RoundedRectangle(cornerRadius: 8)
                             .fill(.blue)
                     )
+                    .transition(.scale(scale: 0.9, anchor: .center))
+                    .animation(.easeInOut(duration: 0.2), value: UUID())
             }
             .padding(.bottom, 20)
         }

README.md

@@ -1,11 +1,17 @@
 # PowerBar
 
-一个智能的macOS菜单栏应用，根据用户活动状态自动管理系统睡眠。
+一个智能的macOS菜单栏应用，根据用户活动状态和外部显示器连接状态自动管理系统睡眠。
+
+## 版本
+
+1.0.1
 
 ## 功能特性
 
 - 📊 **智能睡眠管理**：根据用户活动状态自动控制系统睡眠
-- 🔍 **空闲检测**：5分钟无操作自动视为空闲，停止阻止睡眠
+- 🖥️ **外部显示器检测**：自动检测外部显示器连接状态
+- 🚀 **自动控制**：外部显示器连接时自动开启保持亮屏
+- 📢 **通知提醒**：外部显示器连接/断开时发送通知
 - 🎯 **清晰的状态指示**：通过菜单栏图标直观显示当前状态
 - 🎨 **现代化UI**：简洁美观的菜单界面，易于操作
 - ⚡ **低资源消耗**：轻量级设计，几乎不占用系统资源

build_and_package.sh

@@ -7,7 +7,7 @@
 PROJECT_NAME="PowerBar"
 SCHEME="PowerBar"
 CONFIGURATION="Release"
-VERSION="1.0.0"
+VERSION="1.0.1"
 
 echo "=== PowerBar 打包脚本 v$VERSION ==="