更新保存数据

The Untamed Music Player/MainWindow.xaml.cs

@@ -1,15 +1,20 @@
+using System.Diagnostics;
 using System.Numerics;
+using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.Extensions.Logging;
 using Microsoft.UI.Dispatching;
+using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using The_Untamed_Music_Player.Helpers;
 using The_Untamed_Music_Player.Messages;
 using The_Untamed_Music_Player.Models;
+using The_Untamed_Music_Player.Services;
 using The_Untamed_Music_Player.ViewModels;
 using The_Untamed_Music_Player.Views;
 using Windows.UI.ViewManagement;
+using ZLogger;
 
 namespace The_Untamed_Music_Player;
 
@@ -17,6 +22,7 @@ public sealed partial class MainWindow : WindowEx, IRecipient<LogMessage>
 {
     private readonly DispatcherQueue dispatcherQueue;
     private readonly UISettings settings;
+    private readonly ILogger _logger = LoggingService.CreateLogger<MainWindow>();
     private InfoBarManager? _infoBarManager;
 
     public MainViewModel ViewModel { get; }
@@ -50,6 +56,9 @@ public sealed partial class MainWindow : WindowEx, IRecipient<LogMessage>
         StrongReferenceMessenger.Default.Register(this);
 
         ErrorInfoBar.Translation += new Vector3(0, 0, 40);
+
+        // 注册AppWindow.Closing事件来处理窗口关闭
+        AppWindow.Closing += AppWindow_Closing;
     }
 
     /// <summary>
@@ -94,6 +103,25 @@ public sealed partial class MainWindow : WindowEx, IRecipient<LogMessage>
         dispatcherQueue.TryEnqueue(TitleBarHelper.ApplySystemThemeToCaptionButtons);
     }
 
+    /// <summary>
+    /// 处理AppWindow关闭请求 - 在窗口实际关闭前处理数据保存
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="args"></param>
+    private async void AppWindow_Closing(AppWindow sender, AppWindowClosingEventArgs args)
+    {
+        try
+        {
+            await Data.MusicPlayer.SaveCurrentStateAsync();
+            await Data.PlaylistLibrary.SaveLibraryAsync();
+            Data.MusicPlayer.Dispose();
+        }
+        catch (Exception ex)
+        {
+            _logger.ZLogInformation(ex, $"保存应用程序数据失败");
+        }
+    }
+
     /// <summary>
     /// 窗口关闭时的清理工作
     /// </summary>
@@ -101,8 +129,20 @@ public sealed partial class MainWindow : WindowEx, IRecipient<LogMessage>
     /// <param name="args"></param>
     private void MainWindow_Closed(object sender, WindowEventArgs args)
     {
-        StrongReferenceMessenger.Default.Unregister<LogMessage>(this);
-        _infoBarManager?.Dispose();
-        _infoBarManager = null;
+        try
+        {
+            ViewModel.CleanupDynamicBackgroundService(); // 清理背景服务
+            ViewModel.CleanupSystemBackdrop(); // 清理系统背景
+            Data.DesktopLyricWindow?.Close(); // 关闭桌面歌词窗口
+            Data.DesktopLyricWindow?.Dispose();
+            StrongReferenceMessenger.Default.Unregister<LogMessage>(this); // 清理消息接收
+            _infoBarManager?.Dispose(); // 清理InfoBar管理器
+            _infoBarManager = null;
+            LoggingService.Shutdown(); // 关闭日志服务
+        }
+        catch (Exception ex)
+        {
+            _logger.ZLogInformation(ex, $"清理资源失败");
+        }
     }
 }

The Untamed Music Player/Models/MusicPlayer.cs

@@ -1420,7 +1420,7 @@ public partial class MusicPlayer
     /// <summary>
     /// 保存当前播放状态至设置存储
     /// </summary>
-    public async void SaveCurrentStateAsync()
+    public async Task SaveCurrentStateAsync()
     {
         await FileManager.SavePlayQueueDataAsync(PlayQueue, ShuffledPlayQueue);
         await _localSettingsService.SaveSettingAsync("PlayQueueIndex", PlayQueueIndex);

The Untamed Music Player/Models/PlaylistLibrary.cs

@@ -170,7 +170,7 @@ public partial class PlaylistLibrary : ObservableRecipient
         return candidateName;
     }
 
-    public async void SaveLibraryAsync()
+    public async Task SaveLibraryAsync()
     {
         await FileManager.SavePlaylistDataAsync(Playlists);
     }

The Untamed Music Player/ViewModels/MainViewModel.cs

@@ -46,7 +46,6 @@ public class MainViewModel
             );
         InitializeAsync();
         _mainMindow.Activated += MainWindow_Activated;
-        _mainMindow.Closed += MainWindow_Closed;
         ((FrameworkElement)_mainMindow.Content).ActualThemeChanged += Window_ThemeChanged;
         Data.MainViewModel = this;
     }
@@ -320,19 +319,23 @@ public class MainViewModel
         }
     }
 
-    private void MainWindow_Closed(object sender, WindowEventArgs args)
+    /// <summary>
+    /// 清理动态背景服务
+    /// </summary>
+    public void CleanupDynamicBackgroundService()
+    {
+        _dynamicBackgroundService?.Dispose();
+    }
+
+    /// <summary>
+    /// 清理系统背景
+    /// </summary>
+    public void CleanupSystemBackdrop()
     {
-        Data.MusicPlayer.SaveCurrentStateAsync();
-        Data.PlaylistLibrary.SaveLibraryAsync();
-        Data.MusicPlayer.Dispose();
         _mainMindow.SystemBackdrop = null;
         _currentBackdropController?.RemoveAllSystemBackdropTargets();
         _currentBackdropController?.Dispose();
-        _dynamicBackgroundService.Dispose();
         _mainMindow.Activated -= MainWindow_Activated;
-        Data.DesktopLyricWindow?.Close();
-        Data.DesktopLyricWindow?.Dispose();
-        LoggingService.Shutdown();
     }
 
     /// <summary>