From 02bfe4758e409dff6ff62024021f891c40162621 Mon Sep 17 00:00:00 2001 From: spark Date: Tue, 14 Jan 2025 21:03:35 +0800 Subject: [PATCH] =?UTF-8?q?refactor(app):=20=E8=B0=83=E6=95=B4=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=89=98=E7=9B=98=E5=88=9B=E5=BB=BA=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=B9=B6=E6=9B=B4=E6=96=B0=E5=BA=94=E7=94=A8=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将系统托盘创建逻辑从 main.go 移动到 app.go 中的 startup 方法- 更新应用配置,添加生产环境日志级别配置 - 移除 main.go 中的冗余注释 --- app.go | 8 ++++++++ main.go | 53 +++++++++++++++++++++++------------------------------ 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/app.go b/app.go index 6ef6cd6..c16cfc4 100644 --- a/app.go +++ b/app.go @@ -39,6 +39,14 @@ func NewApp() *App { func (a *App) startup(ctx context.Context) { // Perform your setup here a.ctx = ctx + + // 创建系统托盘 + go systray.Run(func() { + onReady(a) + }, func() { + onExit(a) + }) + } // domReady is called after front-end resources have been loaded diff --git a/main.go b/main.go index 6ff4c24..557a18b 100644 --- a/main.go +++ b/main.go @@ -4,7 +4,6 @@ import ( "embed" "encoding/json" "github.com/duke-git/lancet/v2/convertor" - "github.com/getlantern/systray" "github.com/wailsapp/wails/v2" "github.com/wailsapp/wails/v2/pkg/logger" "github.com/wailsapp/wails/v2/pkg/menu" @@ -84,37 +83,31 @@ func main() { // runtime.Quit(app.ctx) //}) - // 创建系统托盘 - go systray.Run(func() { - onReady(app) - }, func() { - onExit(app) - }) - // Create application with options err := wails.Run(&options.App{ - Title: "go-stock", - Width: 1366, - Height: 920, - MinWidth: 1024, - MinHeight: 768, - MaxWidth: 1280, - MaxHeight: 960, - DisableResize: false, - Fullscreen: false, - Frameless: true, - StartHidden: false, - HideWindowOnClose: false, - BackgroundColour: &options.RGBA{R: 255, G: 255, B: 255, A: 255}, - Assets: assets, - Menu: AppMenu, - Logger: nil, - LogLevel: logger.DEBUG, - OnStartup: app.startup, - OnDomReady: app.domReady, - OnBeforeClose: app.beforeClose, - OnShutdown: app.shutdown, - WindowStartState: options.Normal, + Title: "go-stock", + Width: 1366, + Height: 920, + MinWidth: 1024, + MinHeight: 768, + MaxWidth: 1280, + MaxHeight: 960, + DisableResize: false, + Fullscreen: false, + Frameless: true, + StartHidden: false, + HideWindowOnClose: false, + BackgroundColour: &options.RGBA{R: 255, G: 255, B: 255, A: 255}, + Assets: assets, + Menu: AppMenu, + Logger: nil, + LogLevel: logger.DEBUG, + LogLevelProduction: logger.ERROR, + OnStartup: app.startup, + OnDomReady: app.domReady, + OnBeforeClose: app.beforeClose, + OnShutdown: app.shutdown, + WindowStartState: options.Normal, Bind: []interface{}{ app, },