From 0cd9cd40b4da79bef375d77886cfe5b1bdc2f8d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=9D=E5=B0=98?= <237809796@qq.com> Date: Tue, 26 May 2026 12:29:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=8A=B6=E6=80=81=E5=90=AF=E5=8A=A8=E4=B8=8D?= =?UTF-8?q?=E7=94=9F=E6=95=88+=E7=9B=B8=E5=86=8C=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - body class 改用 {{BODY_CLASSES}} 模板变量替换，修复隐藏状态在启动时未应用 - 相册组件添加显示/隐藏开关 --- config.go | 1 + photo.go | 2 +- settings.go | 12 ++++++++++++ wallpaper.go | 7 ++++++- web/overlay.html | 3 ++- web/settings.html | 6 +++++- 6 files changed, 27 insertions(+), 4 deletions(-) diff --git a/config.go b/config.go index 78ba95b..26a7149 100644 --- a/config.go +++ b/config.go @@ -63,6 +63,7 @@ type Config struct { ShowSeconds bool `json:"showSeconds"` PhotoDir string `json:"photoDir"` PhotoInterval int `json:"photoInterval"` + HidePhoto bool `json:"hidePhoto"` KnowledgeKeyword string `json:"knowledgeKeyword"` KnowledgePrompt string `json:"knowledgePrompt"` HideKnowledge bool `json:"hideKnowledge"` diff --git a/photo.go b/photo.go index f62d37b..d73a7bb 100644 --- a/photo.go +++ b/photo.go @@ -93,7 +93,7 @@ func pushCurrentPhoto(interval int) { func startPhotoLoop() { cfg := loadConfig() - if cfg.PhotoDir == "" { + if cfg.PhotoDir == "" || cfg.HidePhoto { return } diff --git a/settings.go b/settings.go index 5629943..54b32cf 100644 --- a/settings.go +++ b/settings.go @@ -140,6 +140,7 @@ func openSettingsWindow() { "ainewsCard": !cfg.HideAINews, "photoDir": cfg.PhotoDir, "photoInterval": cfg.PhotoInterval, + "photoCard": !cfg.HidePhoto, }) return string(data) }) @@ -178,6 +179,17 @@ func openSettingsWindow() { cfg.ShowSeconds = v evalJS(fmt.Sprintf("if(window.setShowSeconds) setShowSeconds(%v)", v)) } + if v, ok := data["photoCard"]; ok { + cfg.HidePhoto = !v + evalJS(fmt.Sprintf("if(window.setCardVisible) setCardVisible('photo',%v)", v)) + if cfg.PhotoDir != "" { + if v { + restartPhotoLoop() + } else { + stopPhotoLoop() + } + } + } saveConfig(cfg) return "" }) diff --git a/wallpaper.go b/wallpaper.go index 8c79662..f66d6fd 100644 --- a/wallpaper.go +++ b/wallpaper.go @@ -106,9 +106,14 @@ func buildWallpaperHTML(cfg *Config) string { if cfg.HideKnowledge { bodyClasses = append(bodyClasses, "hide-knowledge") } + if cfg.HidePhoto { + bodyClasses = append(bodyClasses, "hide-photo") + } if len(bodyClasses) > 0 { cls := strings.Join(bodyClasses, " ") - html = strings.Replace(html, `layout-`+string(cfg.Layout), `layout-`+string(cfg.Layout)+" "+cls, 1) + html = strings.Replace(html, "{{BODY_CLASSES}}", cls, 1) + } else { + html = strings.Replace(html, " {{BODY_CLASSES}}", "", 1) } // 注入自定义文字 diff --git a/web/overlay.html b/web/overlay.html index 2ceadbe..612bc2a 100644 --- a/web/overlay.html +++ b/web/overlay.html @@ -367,6 +367,7 @@ body.hide-ainews #card-ainews, body.hide-ainews #info .ainews-section { display: none !important; } body.hide-knowledge #card-knowledge, body.hide-knowledge #info .knowledge-section { display: none !important; } +body.hide-photo #card-photo { display: none !important; } /* ===== 相册 ===== */ #card-photo { @@ -418,7 +419,7 @@ body.hide-knowledge #info .knowledge-section { display: none !important; } } - + {{BACKGROUND}} diff --git a/web/settings.html b/web/settings.html index f0e0cff..165ecaa 100644 --- a/web/settings.html +++ b/web/settings.html @@ -334,6 +334,10 @@ input[type="text"]:focus { border-color: var(--input-border-focus); }
相册
+
+
相册展示
+ +
未选择目录
@@ -393,7 +397,7 @@ input[type="text"]:focus { border-color: var(--input-border-focus); }
u-desktop v1.0