Mac 后台常驻(隐藏 Dock + 关窗续跑):引擎 / 监听上移 App 级
实现②隐藏 Dock 图标 + ③可靠后台刷新,交付单窗口、可后台常驻的 App。 - 新增 MacBackgroundController(@MainActor App 级单例):持有 engine + auth(脱离窗口 @State,生命周期与 App 一致)。把引擎离屏 WebView 挂常驻隐藏 NSWindow(始终在窗口层级、避 WebKit 无窗口挂起,且脱离主窗口生命周期——关主窗口引擎不销毁,SSE / presence / 传输 / 剪贴板续跑)+ App 级 ProcessInfo.beginActivity 防 App Nap + 按登录态启停剪贴板 monitor / 全局热键。observeAuth(withObservationTracking 桥 Observation→命令式)观察 auth.session 驱动 start/stop - 新增 MacAppDelegate(@NSApplicationDelegateAdaptor):applicationDidFinishLaunching 应用 Dock 策略 + bootstrap 后台运行时;applicationShouldTerminateAfterLastWindowClosed=false——关最后一个窗口不退出,菜单栏常驻续跑 - CommilitiaDropMacApp:engine / auth 改由 MacBackgroundController 持有(不再窗口 @State);MacAppRoot 只做登录门界面切换、不挂引擎生命周期。MacRootView 移除内嵌 EngineWebView + 移除窗口 onAppear/onDisappear 的 monitor/hotkey(全上移 controller)——关窗引擎 / 同步 / 热键不再停 - 设置加「后台」区:隐藏 Dock 图标开关(@AppStorage macHideDock → NSApp.setActivationPolicy .accessory/.regular,默认 regular 显示)+ 后台常驻说明;剪贴板自动同步开关改调 controller.refreshClipboardMonitor;登出只 auth.logout(引擎复位交 controller 随会话变 nil 统一处理)。菜单栏「打开主窗口」先 NSApp.activate 再 openWindow(accessory / 关窗后窗口可前置可见) - 三项能力齐备:①菜单栏图标(既有 MenuBarExtra)②隐藏 Dock(新增,可设置切换)③可靠后台刷新(新增:引擎 / monitor / 热键 App 级持有 + 隐藏窗口托 WebView + App 级 App Nap 防护 + 关窗不退出续跑) - 验证:just mac-build(CommilitiaDropMac.app)+ iOS 模拟器(CommilitiaDrop.app)均 BUILD SUCCEEDED;ad-hoc 启动冒烟通过(进程存活、无崩溃报告、干净退出)。运行期后台同步须用户登录后自测(Broker OAuth 需账号)
This commit is contained in:
@@ -10,7 +10,6 @@ struct MacRootView: View
|
||||
{
|
||||
@Environment(EngineController.self) private var engine
|
||||
@Environment(AuthManager.self) private var auth
|
||||
@AppStorage("macClipboardAutoSync") private var autoSync = true
|
||||
@State private var quickSend = MacQuickSend.shared
|
||||
@State private var selection: MacSection = .transfers
|
||||
|
||||
@@ -44,24 +43,14 @@ struct MacRootView: View
|
||||
detail
|
||||
}
|
||||
}
|
||||
// 离屏无头引擎 WebView:零尺寸不可见,仅保持存活(登录后随本视图出现即 boot)。同 iOS RootView。
|
||||
.background
|
||||
{
|
||||
EngineWebView(controller: engine, auth: auth)
|
||||
.frame(width: 0, height: 0)
|
||||
.opacity(0)
|
||||
.allowsHitTesting(false)
|
||||
}
|
||||
// 引擎离屏 WebView 已由 App 级 MacBackgroundController 挂在常驻隐藏窗口后台续跑(脱离本窗口
|
||||
// 生命周期),故关主窗口引擎不销毁;本视图只呈现引擎状态、不再内嵌 WebView。剪贴板 monitor /
|
||||
// 全局热键 / App Nap 防护同样上移到 MacBackgroundController(按登录态启停,不随本视图显隐)。
|
||||
// 瞬时通知横幅(吊销 / 改名 / 剪贴板 / 登录审批反馈)覆盖窗口顶部。同 iOS RootView。
|
||||
.overlay(alignment: .top)
|
||||
{
|
||||
NoticeOverlay()
|
||||
}
|
||||
// 剪贴板自动同步(上行):登录进壳即按开关启停;开关变化即时生效;登出(本视图消失)停。
|
||||
// 同时注册 / 注销 Quick Send 全局热键(⌃⌥⌘S)。
|
||||
.onAppear { syncClipboardMonitor(); MacHotkey.shared.register() }
|
||||
.onChange(of: autoSync) { syncClipboardMonitor() }
|
||||
.onDisappear { MacClipboardMonitor.shared.stop(); MacHotkey.shared.unregister() }
|
||||
// Quick Send(热键 / 菜单栏触发):有待发文件即切到「传输」并弹发送表单。
|
||||
.onChange(of: quickSend.pending)
|
||||
{ _, urls in
|
||||
@@ -81,12 +70,6 @@ struct MacRootView: View
|
||||
}
|
||||
}
|
||||
|
||||
private func syncClipboardMonitor()
|
||||
{
|
||||
if autoSync { MacClipboardMonitor.shared.start { engine.uploadClipboardText($0) } }
|
||||
else { MacClipboardMonitor.shared.stop() }
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
private var detail: some View
|
||||
{
|
||||
@@ -231,6 +214,7 @@ struct MacSettingsView: View
|
||||
@Environment(AuthManager.self) private var auth
|
||||
@AppStorage("macClipboardAutoSync") private var autoSync = true
|
||||
@AppStorage("macDownloadDir") private var downloadDirPath = ""
|
||||
@AppStorage("macHideDock") private var hideDock = false
|
||||
@State private var nameDraft = DeviceNameStore.value
|
||||
|
||||
private var signalingLabel: String
|
||||
@@ -256,16 +240,25 @@ struct MacSettingsView: View
|
||||
}
|
||||
Button("登出", role: .destructive)
|
||||
{
|
||||
engine.reset()
|
||||
// 引擎复位由 App 级 MacBackgroundController 随登出(会话变 nil)统一处理,此处只登出。
|
||||
auth.logout()
|
||||
}
|
||||
}
|
||||
Section("云剪贴板")
|
||||
{
|
||||
Toggle("自动同步本机复制(上行)", isOn: $autoSync)
|
||||
.onChange(of: autoSync) { MacBackgroundController.shared.refreshClipboardMonitor() }
|
||||
Button("上传本机剪贴板") { engine.uploadClipboard() }
|
||||
Button("拉取云剪贴板到本机") { engine.pullClipboard() }
|
||||
}
|
||||
Section("后台")
|
||||
{
|
||||
Toggle("隐藏 Dock 图标(仅菜单栏常驻)", isOn: $hideDock)
|
||||
.onChange(of: hideDock) { MacBackgroundController.shared.applyDockPolicy() }
|
||||
Text("关闭主窗口后仍在菜单栏后台运行、持续同步;点菜单栏图标可重开窗口。")
|
||||
.font(.caption)
|
||||
.foregroundStyle(.secondary)
|
||||
}
|
||||
Section("接收")
|
||||
{
|
||||
LabeledContent("保存到", value: downloadDirDisplay)
|
||||
|
||||
Reference in New Issue
Block a user