refactor: [StatusItemManager] shared singleton

Caldis · Sep 12, 2022 · c90b495 · c90b495
1 parent 32b44ad
commit c90b495
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/Mos/Managers/StatusItemManager.swift b/Mos/Managers/StatusItemManager.swift
@@ -18,11 +18,16 @@ class StatusItemManager: NSMenu, NSMenuDelegate {
  // 状态栏类型
  let TYPE = STATUS_ITEM_TYPE.menu
 
+
+ // 单例
+ static let shared = StatusItemManager()
+
  // 状态栏引用
- static let statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
- let item = StatusItemManager.statusItem
+ let item = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
 
+ // 初始化
  override func awakeFromNib() {
+ NSLog("Module initialized: StatusItemManager")
  // 设置图标
  item.image = #imageLiteral(resourceName: "AppStatusBarIcon")
  // 设置事件响应
@@ -135,19 +140,19 @@ extension StatusItemManager {
  **/
 extension StatusItemManager {
  // 显示状态栏图标
- class func showStatusItem() {
+ func showStatusItem() {
  if #available(OSX 10.12, *) {
- self.statusItem.isVisible = true
+ item.isVisible = true
  } else {
- self.statusItem.length = NSStatusItem.variableLength
+ item.length = NSStatusItem.variableLength
  }
  }
  // 隐藏状态栏图标
- class func hideStatusItem() {
+ func hideStatusItem() {
  if #available(OSX 10.12, *) {
- self.statusItem.isVisible = false
+ item.isVisible = false
  } else {
- self.statusItem.length = 0.0
+ item.length = 0.0
  }
  }
 }
diff --git a/Mos/Utils/Constants.swift b/Mos/Utils/Constants.swift
@@ -78,7 +78,7 @@ class OPTIONS_GENERAL_DEFAULT {
  }
  // 隐藏
  var hideStatusItem = false {
- willSet {newValue ? StatusItemManager.hideStatusItem() : StatusItemManager.showStatusItem()}
+ willSet {newValue ? StatusItemManager.shared.hideStatusItem() : StatusItemManager.shared.showStatusItem()}
  didSet {Options.shared.saveOptions()}
  }
  // 例外