From ea604e8007bd8db15b3af9bc8c74b3bbfdbeeba5 Mon Sep 17 00:00:00 2001 From: aryecatcher <516371385@qq.com> Date: Mon, 31 Aug 2026 21:50:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(ui):=20Wallpaper=20=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=AB=8B=E5=8D=B3=E5=8F=8D=E9=A6=88=E9=AB=98?= =?UTF-8?q?=E4=BA=AE=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electron/src/renderer/App.tsx | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/electron/src/renderer/App.tsx b/electron/src/renderer/App.tsx index 791b056..0cfc00c 100644 --- a/electron/src/renderer/App.tsx +++ b/electron/src/renderer/App.tsx @@ -104,6 +104,7 @@ function AmadeusApp() { const handleToggleWallpaper = useCallback(async () => { const next = !wallpaperActive setPage('chat') + setWallpaperActive(next) if (next) { if (renderActive) { @@ -112,14 +113,14 @@ function AmadeusApp() { setRenderActive(false) setRenderAssetUrl('') } - try { - const res = await send('wallpaper.start', ELECTRON_SLICE_START_PARAMS) - setWallpaperActive(res?.status !== 'error') - if (res?.status !== 'error') await syncElectronSliceHost(res) - } catch { - setWallpaperActive(false) - } - } else { + try { + const res = await send('wallpaper.start', ELECTRON_SLICE_START_PARAMS) + if (res?.status === 'error') setWallpaperActive(false) // 失败回退 + else await syncElectronSliceHost(res) + } catch { + setWallpaperActive(false) // 失败回退 + } + } else { try { await send('wallpaper.stop', {}) } catch {} await window.amadeus?.closeElectronSlice() setWallpaperActive(false) From 0a5edb4fe23b0abc01094611b5b753cc9a2dc02f Mon Sep 17 00:00:00 2001 From: aryecatcher <516371385@qq.com> Date: Tue, 1 Sep 2026 20:58:07 +0800 Subject: [PATCH 2/2] style(ui): unify handleToggleWallpaper indentation --- electron/src/renderer/App.tsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/electron/src/renderer/App.tsx b/electron/src/renderer/App.tsx index 0cfc00c..2bf6601 100644 --- a/electron/src/renderer/App.tsx +++ b/electron/src/renderer/App.tsx @@ -113,14 +113,14 @@ function AmadeusApp() { setRenderActive(false) setRenderAssetUrl('') } - try { - const res = await send('wallpaper.start', ELECTRON_SLICE_START_PARAMS) - if (res?.status === 'error') setWallpaperActive(false) // 失败回退 - else await syncElectronSliceHost(res) - } catch { - setWallpaperActive(false) // 失败回退 - } - } else { + try { + const res = await send('wallpaper.start', ELECTRON_SLICE_START_PARAMS) + if (res?.status === 'error') setWallpaperActive(false) // 失败回退 + else await syncElectronSliceHost(res) + } catch { + setWallpaperActive(false) // 失败回退 + } + } else { try { await send('wallpaper.stop', {}) } catch {} await window.amadeus?.closeElectronSlice() setWallpaperActive(false)