From a51f7f3be76496e45332d982faa34001df868ba7 Mon Sep 17 00:00:00 2001 From: shikong <919411476@qq.com> Date: Sun, 12 May 2024 18:29:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=89=98=E7=9B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 2 ++ go.sum | 6 ++++++ pkg/core/app.go | 14 ++++++++++++++ pkg/systray/systray.go | 40 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 62 insertions(+) create mode 100644 pkg/systray/systray.go diff --git a/go.mod b/go.mod index 897f9f9..c7bfce6 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module skapp go 1.18 require ( + github.com/energye/systray v1.0.2 github.com/gin-contrib/gzip v0.0.6 github.com/gin-gonic/gin v1.9.1 github.com/go-playground/locales v0.14.1 @@ -54,6 +55,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/rivo/uniseg v0.4.4 // indirect github.com/samber/lo v1.38.1 // indirect + github.com/tevino/abool v0.0.0-20220530134649-2bfc934cb23c // indirect github.com/tkrajina/go-reflector v0.5.6 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.11 // indirect diff --git a/go.sum b/go.sum index 2af54a3..ced766d 100644 --- a/go.sum +++ b/go.sum @@ -14,6 +14,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/energye/systray v1.0.2 h1:63R4prQkANtpM2CIA4UrDCuwZFt+FiygG77JYCsNmXc= +github.com/energye/systray v1.0.2/go.mod h1:sp7Q/q/I4/w5ebvpSuJVep71s9Bg7L9ZVp69gBASehM= github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= github.com/gin-contrib/gzip v0.0.6 h1:NjcunTcGAj5CO1gn4N8jHOSIeRFHIbn51z6K+xaN4d4= @@ -47,6 +49,7 @@ github.com/go-playground/validator/v10 v10.18.0/go.mod h1:dbuPbCMFw/DrkbEynArYaC github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= @@ -148,6 +151,8 @@ github.com/swaggo/gin-swagger v1.6.0 h1:y8sxvQ3E20/RCyrXeFfg60r6H0Z+SwpTjMYsMm+z github.com/swaggo/gin-swagger v1.6.0/go.mod h1:BG00cCEy294xtVpyIAHG6+e2Qzj/xKlRdOqDkvq0uzo= github.com/swaggo/swag v1.16.3 h1:PnCYjPCah8FK4I26l2F/KQ4yz3sILcVUN3cTlBFA9Pg= github.com/swaggo/swag v1.16.3/go.mod h1:DImHIuOFXKpMFAQjcC7FG4m3Dg4+QuUgUzJmKjI/gRk= +github.com/tevino/abool v0.0.0-20220530134649-2bfc934cb23c h1:coVla7zpsycc+kA9NXpcvv2E4I7+ii6L5hZO2S6C3kw= +github.com/tevino/abool v0.0.0-20220530134649-2bfc934cb23c/go.mod h1:qc66Pna1RiIsPa7O4Egxxs9OqkuxDX55zznh9K07Tzg= github.com/tkrajina/go-reflector v0.5.6 h1:hKQ0gyocG7vgMD2M3dRlYN6WBBOmdoOzJ6njQSepKdE= github.com/tkrajina/go-reflector v0.5.6/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= @@ -212,6 +217,7 @@ golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/pkg/core/app.go b/pkg/core/app.go index 82f15aa..895470d 100644 --- a/pkg/core/app.go +++ b/pkg/core/app.go @@ -3,6 +3,7 @@ package core import ( "context" "fmt" + "github.com/energye/systray" "github.com/wailsapp/wails/v2/pkg/runtime" "go.uber.org/zap/zapcore" "golang.design/x/hotkey" @@ -10,6 +11,7 @@ import ( "net/http" "os" "skapp/pkg/config" + st "skapp/pkg/systray" "skapp/pkg/config/toml" "skapp/pkg/global" @@ -88,6 +90,18 @@ func (a *App) Startup(ctx context.Context) { a.ctx = ctx + st.Init(func() { + mainMenuItem := systray.AddMenuItem("主页面", "显示主页面") + mainMenuItem.Click(func() { + runtime.WindowShow(ctx) + }) + systray.AddSeparator() + quitMenuItem := systray.AddMenuItem("退出", "退出程序") + quitMenuItem.Click(func() { + a.ForceClose() + }) + }) + hotKeys = append(hotKeys, hk.Register([]hotkey.Modifier{hotkey.ModShift, hotkey.ModCtrl, hotkey.ModAlt}, hotkey.KeyX, func() { logger.Log.Info("热键触发: Ctrl+Shift+Alt+X") }, nil)) diff --git a/pkg/systray/systray.go b/pkg/systray/systray.go new file mode 100644 index 0000000..05e7f8a --- /dev/null +++ b/pkg/systray/systray.go @@ -0,0 +1,40 @@ +package systray + +import ( + "fmt" + "github.com/energye/systray" + "github.com/energye/systray/icon" +) + +var DefaultIcon = icon.Data + +func Init(init func()) { + systray.Run(func() { + systray.SetIcon(icon.Data) + systray.SetTitle("wails-app-dock") + + systray.SetOnClick(func(menu systray.IMenu) { + fmt.Println("SetOnClick") + }) + systray.SetOnDClick(func(menu systray.IMenu) { + fmt.Println("SetOnDClick") + }) + systray.SetOnRClick(func(menu systray.IMenu) { + fmt.Println("SetOnRClick") + err := menu.ShowMenu() + if err != nil { + fmt.Println(err.Error()) + return + } + + }) + + if init != nil { + init() + } + }, onExit) +} + +func onExit() { + +}