Merge pull request #53 from jayfunc/dev

fix

BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest

@@ -12,7 +12,7 @@
 	<Identity
 	  Name="37412.BetterLyrics"
 	  Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
-	  Version="1.0.21.0" />
+	  Version="1.0.22.0" />
 
 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ForegroundWindowWatcher.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
+using CommunityToolkit.WinUI;
 using Microsoft.UI.Xaml;
 using Vanara.PInvoke;
 using Windows.System;
@@ -16,6 +17,7 @@ namespace BetterLyrics.WinUI3.Helper
         private readonly List<User32.HWINEVENTHOOK> _hooks = new();
         private HWND _currentForeground = HWND.NULL;
         private readonly IntPtr _selfHwnd;
+        private readonly ThrottleHelper _winEventProcThrottle = new(TimeSpan.FromSeconds(1));
 
         public delegate void WindowChangedHandler(HWND hwnd);
         private readonly WindowChangedHandler _onWindowChanged;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/SystemVolumeHelper.cs

@@ -63,7 +63,7 @@ namespace BetterLyrics.WinUI3.Helper
             {
                 var data = pNotify.ToStructure<AUDIO_VOLUME_NOTIFICATION_DATA>();
                 _masterVolume = (int)(data.fMasterVolume * 100);
-                _dispatcherQueue.TryEnqueue(() =>
+                _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
                 {
                     VolumeChanged?.Invoke(_masterVolume);
                 });

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ThrottleHelper.cs

@@ -0,0 +1,37 @@
+using System;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public class ThrottleHelper
+    {
+        private DateTime _lastTriggerTime = DateTime.MinValue;
+        private readonly TimeSpan _interval;
+
+        public ThrottleHelper(TimeSpan interval)
+        {
+            _interval = interval;
+        }
+
+        /// <summary>
+        /// 判断是否可以触发（距离上次触发已超过设定间隔），如果可以则更新时间戳并返回 true，否则返回 false。
+        /// </summary>
+        public bool CanTrigger()
+        {
+            var now = DateTime.Now;
+            if ((now - _lastTriggerTime) >= _interval)
+            {
+                _lastTriggerTime = now;
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 重置触发时间
+        /// </summary>
+        public void Reset()
+        {
+            _lastTriggerTime = DateTime.MinValue;
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LibWatcherService.cs

@@ -6,18 +6,17 @@ using System.IO;
 using System.Linq;
 using BetterLyrics.WinUI3.Events;
 using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.ViewModels;
+using Microsoft.UI.Dispatching;
 
 namespace BetterLyrics.WinUI3.Services
 {
-    public class LibWatcherService : IDisposable, ILibWatcherService
+    public class LibWatcherService : BaseViewModel, IDisposable, ILibWatcherService
     {
-        private readonly ISettingsService _settingsService;
-
         private readonly Dictionary<string, FileSystemWatcher> _watchers = [];
 
-        public LibWatcherService(ISettingsService settingsService)
+        public LibWatcherService(ISettingsService settingsService) : base(settingsService)
         {
-            _settingsService = settingsService;
             UpdateWatchers(_settingsService.LocalMediaFolders);
         }
 
@@ -69,16 +68,13 @@ namespace BetterLyrics.WinUI3.Services
 
         private void OnChanged(string folder, FileSystemEventArgs e)
         {
-            App.DispatcherQueue!.TryEnqueue(
-                Microsoft.UI.Dispatching.DispatcherQueuePriority.High,
-                () =>
-                {
-                    MusicLibraryFilesChanged?.Invoke(
-                        this,
-                        new LibChangedEventArgs(folder, e.FullPath, e.ChangeType)
-                    );
-                }
-            );
+            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+            {
+                MusicLibraryFilesChanged?.Invoke(
+                    this,
+                    new LibChangedEventArgs(folder, e.FullPath, e.ChangeType)
+                );
+            });
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/PlaybackService.cs

@@ -110,10 +110,8 @@ namespace BetterLyrics.WinUI3.Services
         {
             if (!IsMediaSourceEnabled(mediaSession.ControlSession.SourceAppUserModelId) || mediaSession != _mediaManager.GetFocusedSession()) return;
 
-            _dispatcherQueue.TryEnqueue(
-                DispatcherQueuePriority.High,
-                () =>
-                {
+            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+            {
                     PositionChanged?.Invoke(this, new PositionChangedEventArgs(timelineProperties.Position));
                 }
             );
@@ -130,9 +128,8 @@ namespace BetterLyrics.WinUI3.Services
                 _ => false,
             };
 
-            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.High,
-                () =>
-                {
+            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+            {
                     IsPlayingChanged?.Invoke(this, new IsPlayingChangedEventArgs(_cachedIsPlaying));
                 }
             );
@@ -187,7 +184,7 @@ namespace BetterLyrics.WinUI3.Services
 
                 if (!token.IsCancellationRequested)
                 {
-                    _dispatcherQueue.TryEnqueue(() =>
+                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
                     {
                         SongInfoChanged?.Invoke(this, new SongInfoChangedEventArgs(_cachedSongInfo));
                     });
@@ -218,8 +215,7 @@ namespace BetterLyrics.WinUI3.Services
             {
                 _mediaSourceProvidersInfo.Add(new MediaSourceProviderInfo(id, true));
                 _settingsService.MediaSourceProvidersInfo = _mediaSourceProvidersInfo;
-                _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.High,
-                () =>
+                _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
                 {
                     MediaSourceProvidersInfoChanged?.Invoke(this, new MediaSourceProvidersInfoEventArgs(_mediaSourceProvidersInfo));
                 });
@@ -228,8 +224,7 @@ namespace BetterLyrics.WinUI3.Services
 
         private void SendNullMessages()
         {
-            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.High,
-            () =>
+            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
             {
                 _cachedSongInfo = null;
                 _cachedIsPlaying = false;
@@ -275,7 +270,7 @@ namespace BetterLyrics.WinUI3.Services
 
             var _albumArtAccentColor = ImageHelper.GetAccentColorsFromByte(bytes).FirstOrDefault();
 
-            _dispatcherQueue.TryEnqueue(() =>
+            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
             {
                 AlbumArtChangedChanged?.Invoke(this, new AlbumArtChangedEventArgs(_albumArtSwBitmap, _albumArtAccentColor));
             });
@@ -292,7 +287,7 @@ namespace BetterLyrics.WinUI3.Services
             catch (Exception)
             {
                 _logger.LogError("Failed to start SSE connection for LX Music.");
-                _dispatcherQueue.TryEnqueue(() =>
+                _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
                 {
                     App.Current.LyricsWindowNotificationPanel?.Notify(App.ResourceLoader!.GetString("FailToStartLXMusicServer"), Microsoft.UI.Xaml.Controls.InfoBarSeverity.Error);
                 });

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/TranslateService.cs

@@ -3,6 +3,7 @@ using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Serialization;
 using BetterLyrics.WinUI3.ViewModels;
 using Lyricify.Lyrics.Helpers.General;
+using Microsoft.UI.Dispatching;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -46,7 +47,7 @@ namespace BetterLyrics.WinUI3.Services
 
             if (string.IsNullOrEmpty(_settingsService.LibreTranslateServer))
             {
-                _dispatcherQueue.TryEnqueue(() =>
+                _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
                 {
                     App.Current.LyricsWindowNotificationPanel?.Notify(
                         App.ResourceLoader!.GetString("TranslateServerNotSet"),

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/BaseViewModel.cs

@@ -7,22 +7,20 @@ using Microsoft.UI.Dispatching;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
-    public partial class BaseViewModel : ObservableRecipient, IDisposable
+    public partial class BaseViewModel : ObservableRecipient
     {
-        private protected readonly DispatcherQueue _dispatcherQueue =
-            DispatcherQueue.GetForCurrentThread();
+        private protected readonly DispatcherQueue _dispatcherQueue;
+
+        private protected readonly DispatcherQueueTimer _dispatcherQueueTimer;
 
         private protected readonly ISettingsService _settingsService;
 
         public BaseViewModel(ISettingsService settingsService)
         {
             IsActive = true;
+            _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
+            _dispatcherQueueTimer = _dispatcherQueue.CreateTimer();
             _settingsService = settingsService;
         }
-
-        public void Dispose()
-        {
-            GC.SuppressFinalize(this);
-        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsPageViewModel.cs

@@ -9,6 +9,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.Mvvm.Messaging.Messages;
+using CommunityToolkit.WinUI;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 using System;
@@ -24,6 +25,7 @@ namespace BetterLyrics.WinUI3.ViewModels
         IRecipient<PropertyChangedMessage<TimeSpan>>
     {
         private readonly IPlaybackService _playbackService;
+        private readonly ThrottleHelper _timelineThrottle = new(TimeSpan.FromSeconds(1));
 
         public LyricsPageViewModel(ISettingsService settingsService, IPlaybackService playbackService) : base(settingsService)
         {
@@ -256,10 +258,13 @@ namespace BetterLyrics.WinUI3.ViewModels
             {
                 if (message.PropertyName == nameof(LyricsRendererViewModel.TotalTime))
                 {
-                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+                    if (_timelineThrottle.CanTrigger())
                     {
-                        TimelinePositionSeconds = message.NewValue.TotalSeconds;
-                    });
+                        _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+                        {
+                            TimelinePositionSeconds = message.NewValue.TotalSeconds;
+                        });
+                    }
                 }
             }
         }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel.Messages.cs

@@ -91,20 +91,23 @@ namespace BetterLyrics.WinUI3.ViewModels
                 {
                     _isDockMode = message.NewValue;
                     UpdateColorConfig();
+                    UpdateImmersiveBackgroundOpacity();
                 }
                 else if (message.PropertyName == nameof(LyricsWindowViewModel.IsDesktopMode))
                 {
                     _isDesktopMode = message.NewValue;
                     UpdateColorConfig();
+                    UpdateImmersiveBackgroundOpacity();
                 }
                 else if (message.PropertyName == nameof(LyricsWindowViewModel.IsLyricsWindowLocked))
                 {
                     _isLyricsWindowLocked = message.NewValue;
+                    UpdateImmersiveBackgroundOpacity();
                 }
                 else if (message.PropertyName == nameof(LyricsWindowViewModel.IsMouseWithinWindow))
                 {
                     _isMouseWithinWindow = message.NewValue;
-                    _immersiveBgOpacityTransition.StartTransition(_isDesktopMode ? (_isMouseWithinWindow ? 1f : 0f) : 1f);
+                    UpdateImmersiveBackgroundOpacity();
                 }
             }
             else if (message.Sender is LyricsPageViewModel)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel.Update.cs

@@ -411,5 +411,33 @@ namespace BetterLyrics.WinUI3.ViewModels
                 line.HighlightOpacityTransition.Update(_elapsedTime);
             }
         }
+
+        private void UpdateImmersiveBackgroundOpacity()
+        {
+            float targetOpacity;
+            if (_isDesktopMode)
+            {
+                if (_isLyricsWindowLocked)
+                {
+                    targetOpacity = 0;
+                }
+                else
+                {
+                    if (_isMouseWithinWindow)
+                    {
+                        targetOpacity = 1f;
+                    }
+                    else
+                    {
+                        targetOpacity = 0f;
+                    }
+                }
+            }
+            else
+            {
+                targetOpacity = 1f;
+            }
+            _immersiveBgOpacityTransition.StartTransition(targetOpacity);
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowViewModel.cs

@@ -11,6 +11,7 @@ using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.Mvvm.Messaging.Messages;
+using CommunityToolkit.WinUI;
 using Microsoft.UI;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
@@ -231,11 +232,14 @@ namespace BetterLyrics.WinUI3
                 hwnd,
                 onWindowChanged =>
                 {
-                    if (_ignoreFullscreenWindow && window.AppWindow.Presenter is OverlappedPresenter presenter)
+                    _dispatcherQueueTimer.Debounce(() =>
                     {
-                        presenter.IsAlwaysOnTop = true;
-                    }
-                    UpdateAccentColor(hwnd);
+                        if (_ignoreFullscreenWindow && window.AppWindow.Presenter is OverlappedPresenter presenter)
+                        {
+                            presenter.IsAlwaysOnTop = true;
+                        }
+                        UpdateAccentColor(hwnd);
+                    }, TimeSpan.FromMilliseconds(300));
                 }
             );
             _windowWatcher.Start();

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryViewModel.cs

@@ -5,6 +5,7 @@ using BetterLyrics.WinUI3.Services;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.Mvvm.Messaging.Messages;
+using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml.Controls;
 using System;
 using System.Collections.Generic;
@@ -94,7 +95,7 @@ namespace BetterLyrics.WinUI3.ViewModels
                         foreach (var file in Directory.GetFiles(folder.Path, $"*.*", SearchOption.AllDirectories))
                         {
                             Track track = new(file);
-                            _dispatcherQueue.TryEnqueue(() =>
+                            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
                             {
                                 Tracks.Add(track);
                             });
@@ -102,7 +103,7 @@ namespace BetterLyrics.WinUI3.ViewModels
                     }
                 }
 
-                _dispatcherQueue.TryEnqueue(() =>
+                _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
                 {
                     IsDataLoading = false;
                 });

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SettingsPageViewModel.cs

@@ -7,6 +7,7 @@ using BetterLyrics.WinUI3.Services;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System;
@@ -16,7 +17,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using Windows.ApplicationModel;
 using Windows.Globalization;
-using Windows.System;
 using Windows.UI;
 using WinRT.Interop;
 using MetadataHelper = BetterLyrics.WinUI3.Helper.MetadataHelper;
@@ -102,7 +102,7 @@ namespace BetterLyrics.WinUI3.ViewModels
 
             Task.Run(async () =>
             {
-                BuildDate = (await Helper.MetadataHelper.GetBuildDate()).ToString("(yyyy/MM/dd HH:mm:ss)");
+                BuildDate = (await MetadataHelper.GetBuildDate()).ToString("(yyyy/MM/dd HH:mm:ss)");
             });
         }
 
@@ -258,7 +258,7 @@ namespace BetterLyrics.WinUI3.ViewModels
         public partial int LyricsVerticalEdgeOpacity { get; set; }
 
         [ObservableProperty]
-        public partial object NavViewSelectedItemTag { get; set; }
+        public partial object NavViewSelectedItemTag { get; set; } = "App";
 
         [ObservableProperty]
         [NotifyPropertyChangedRecipients]
@@ -411,13 +411,13 @@ namespace BetterLyrics.WinUI3.ViewModels
         [RelayCommand]
         private async Task LaunchProjectGitHubPageAsync()
         {
-            await Launcher.LaunchUriAsync(new Uri(MetadataHelper.GithubUrl));
+            await Windows.System.Launcher.LaunchUriAsync(new Uri(MetadataHelper.GithubUrl));
         }
 
         [RelayCommand]
         private static async Task OpenCacheFolderAsync()
         {
-            await Launcher.LaunchFolderPathAsync(PathHelper.CacheFolder);
+            await Windows.System.Launcher.LaunchFolderPathAsync(PathHelper.CacheFolder);
         }
 
         [RelayCommand]
@@ -456,7 +456,7 @@ namespace BetterLyrics.WinUI3.ViewModels
                 {
                     string targetLangCode = LanguageHelper.SupportedTargetLanguages[SelectedTargetLanguageIndex].Code;
                     string result = await _libreTranslateService.TranslateTextAsync("Hello, world!", targetLangCode, null);
-                    _dispatcherQueue.TryEnqueue(() =>
+                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
                     {
                         App.Current.SettingsWindowNotificationPanel?.Notify(App.ResourceLoader!.GetString("SettingsPageServerTestSuccessInfo"), Microsoft.UI.Xaml.Controls.InfoBarSeverity.Success);
                         IsLibreTranslateServerTesting = false;
@@ -464,7 +464,7 @@ namespace BetterLyrics.WinUI3.ViewModels
                 }
                 catch (Exception)
                 {
-                    _dispatcherQueue.TryEnqueue(() =>
+                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
                     {
                         App.Current.SettingsWindowNotificationPanel?.Notify(App.ResourceLoader!.GetString("SettingsPageServerTestFailedInfo"), Microsoft.UI.Xaml.Controls.InfoBarSeverity.Error);
                         IsLibreTranslateServerTesting = false;
@@ -480,7 +480,7 @@ namespace BetterLyrics.WinUI3.ViewModels
             Task.Run(async () =>
             {
                 bool testResult = await NetHelper.CheckConnectivity($"{LXMusicServer}/status");
-                _dispatcherQueue.TryEnqueue(() =>
+                _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
                 {
                     App.Current.SettingsWindowNotificationPanel?.Notify(
                         App.ResourceLoader!.GetString($"SettingsPageServerTest{(testResult ? "Success" : "Failed")}Info"),

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SystemTrayViewModel.cs

@@ -5,6 +5,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.Mvvm.Messaging.Messages;
+using Microsoft.UI.Xaml;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
@@ -39,7 +40,7 @@ namespace BetterLyrics.WinUI3.ViewModels
             {
                 DockModeHelper.Disable(lyricsWindow);
             }
-            App.Current.Exit();
+            Application.Current.Exit();
         }
 
         [RelayCommand]

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml

@@ -26,6 +26,7 @@
         <Grid
             x:Name="TopCommandGrid"
             VerticalAlignment="Top"
+            Background="Transparent"
             Opacity="{x:Bind ViewModel.TopCommandGridOpacity, Mode=OneWay}"
             PointerEntered="TopCommandGrid_PointerEntered"
             PointerExited="TopCommandGrid_PointerExited">

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs

@@ -270,7 +270,7 @@ namespace BetterLyrics.WinUI3.Views
         private void CloseButton_Click(object sender, RoutedEventArgs e)
         {
             DockModeHelper.Disable(this);
-            App.Current.Exit();
+            Application.Current.Exit();
         }
 
         private void MaximiseButton_Click(object sender, RoutedEventArgs e)

README.md

@@ -90,7 +90,7 @@ Watch our introduction video (uploaded on 7 July 2025) on Bilibili [here](https:
   - Make sure you have set timeline threshold to around 600 ms in settings (Go to "Settings" - "Advanced option" to change), otherwise, the lyrics will be moving forward and afterward constantly.
 - foobar2000
   - Make sure you have https://github.com/dumbie/foo_mediacontrol installed with it
-- Spofity
+- Spotify
 - QQ Music
 - PotPlayer
 - Media Player (System)