Merge pull request #43 from jayfunc/dev

v1.0.17.0

.github/workflows/releases-to-discord.yml

@@ -13,8 +13,8 @@ jobs:
         with:
           webhook_url: ${{ secrets.WEBHOOK_URL }}
           color: "2105893"
-          username: "Release Changelog"
-          avatar_url: "https://cdn.discordapp.com/avatars/487431320314576937/bd64361e4ba6313d561d54e78c9e7171.png"
+          username: "GitHub"
+          avatar_url: "https://github.githubassets.com/assets/GitHub-Mark-ea2971cee799.png"
           content: "||@everyone||"
           footer_title: "Changelog"
           reduce_headings: true

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.14.0" />
+	  Version="1.0.16.0" />
 
 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj

@@ -51,6 +51,7 @@
 		<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4188" />
 		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250606001" />
+		<PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
 		<PackageReference Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
 		<PackageReference Include="NTextCat" Version="0.3.65" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/AlbumArtChangedEventArgs.cs

@@ -8,9 +8,9 @@ using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Events
 {
-    public class AlbumArtChangedEventArgs : EventArgs
+    public class AlbumArtChangedEventArgs(SoftwareBitmap? albumArtSwBitmap, Color? albumArtAccentColor) : EventArgs
     {
-        public SoftwareBitmap? AlbumArtSwBitmap { get; set; } = null;
-        public Color? AlbumArtAccentColor { get; set; } = null;
+        public SoftwareBitmap? AlbumArtSwBitmap { get; set; } = albumArtSwBitmap;
+        public Color? AlbumArtAccentColor { get; set; } = albumArtAccentColor;
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/DockModeHelper.cs

@@ -22,12 +22,14 @@ namespace BetterLyrics.WinUI3.Helper
 
         public static void Disable(Window window)
         {
+            IntPtr hwnd = WindowNative.GetWindowHandle(window);
+
+            if (!_registered.Contains(hwnd)) return;
+
             window.SetIsShownInSwitchers(true);
             window.ExtendsContentIntoTitleBar = true;
             window.SetIsAlwaysOnTop(false);
 
-            IntPtr hwnd = WindowNative.GetWindowHandle(window);
-
             UnregisterAppBar(hwnd);
             RefreshWorkArea();
 
@@ -130,7 +132,7 @@ namespace BetterLyrics.WinUI3.Helper
             };
 
             Shell32.SHAppBarMessage(Shell32.ABM.ABM_REMOVE, ref abd);
-            
+
             _registered.Remove(hwnd);
         }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ImageHelper.cs

@@ -167,9 +167,11 @@ namespace BetterLyrics.WinUI3.Helper
         public static async Task<byte[]> ToByteArrayAsync(IRandomAccessStreamReference streamRef)
         {
             using IRandomAccessStream stream = await streamRef.OpenReadAsync();
-            using var memoryStream = new MemoryStream();
-            await stream.AsStreamForRead().CopyToAsync(memoryStream);
-            return memoryStream.ToArray();
+            using var reader = new DataReader(stream);
+            await reader.LoadAsync((uint)stream.Size);
+            byte[] buffer = new byte[stream.Size];
+            reader.ReadBytes(buffer);
+            return buffer;
         }
 
         public static float GetAverageLuminance(CanvasBitmap bitmap)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LatestOnlyTaskRunner.cs

@@ -1,4 +1,5 @@
-using System;
+using Nito.AsyncEx;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,23 +10,34 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public class LatestOnlyTaskRunner
     {
-        private CancellationTokenSource? _cts;
+        private readonly AsyncLock _mutex = new();
+        private CancellationTokenSource _cts;
 
-        public async Task RunAsync(Func<CancellationToken, Task> func)
+        public async Task RunAsync(Func<CancellationToken, Task> action)
         {
-            _cts?.Cancel();
-            _cts = new CancellationTokenSource();
-            var token = _cts.Token;
+            CancellationTokenSource oldCts;
+
+            // 使用 AsyncLock 保证线程安全
+            using (await _mutex.LockAsync())
+            {
+                // 取消旧的
+                oldCts = _cts;
+                _cts = new CancellationTokenSource();
+            }
+
+            oldCts?.Cancel();
+            oldCts?.Dispose();
+
+            CancellationToken token = _cts.Token;
+
             try
             {
-                await func(token);
+                await action(token);
+            }
+            catch (OperationCanceledException)
+            {
+                // 可以选择忽略取消异常
             }
-            catch (OperationCanceledException) { }
-        }
-
-        public void Cancel()
-        {
-            _cts?.Cancel();
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LyricsParser.cs

@@ -48,6 +48,7 @@ namespace BetterLyrics.WinUI3.Helper
                 }
             }
             PostProcessLyricsLines(durationMs.Value);
+            _lyricsDataArr.Add(new LyricsData()); // 为机翻预留
             return _lyricsDataArr;
         }
 
@@ -113,8 +114,7 @@ namespace BetterLyrics.WinUI3.Helper
 
             // 初始化每种语言的歌词列表
             _lyricsDataArr.Clear();
-            for (int i = 0; i < languageCount; i++)
-                _lyricsDataArr.Add(new LyricsData());
+            for (int i = 0; i < languageCount; i++) _lyricsDataArr.Add(new LyricsData());
 
             // 遍历每个时间分组
             foreach (var group in grouped)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsData.cs

@@ -71,7 +71,7 @@ namespace BetterLyrics.WinUI3.Models
                 }
                 else
                 {
-                    line.DisplayedText = $"{line.OriginalText}{StringHelper.NewLine}({translationArr[i]})";
+                    line.DisplayedText = $"{line.OriginalText}{StringHelper.NewLine}{translationArr[i]}";
                 }
                 i++;
             }
@@ -85,6 +85,30 @@ namespace BetterLyrics.WinUI3.Models
             }
         }
 
+        public LyricsData CreateLyricsDataFrom(string translation)
+        {
+            var result = new LyricsData(LyricsLines.Select(line => new LyricsLine
+            {
+                StartMs = line.StartMs,
+                EndMs = line.EndMs,
+            }).ToList());
+            List<string> translationArr = translation.Split(StringHelper.NewLine).ToList();
+            int i = 0;
+            foreach (var line in result.LyricsLines)
+            {
+                if (i >= translationArr.Count)
+                {
+                    break;
+                }
+                else
+                {
+                    line.OriginalText = translationArr[i];
+                }
+                i++;
+            }
+            return result;
+        }
+
         public static LyricsData GetNotfoundPlaceholder(int durationMs)
         {
             return new LyricsData([new LyricsLine

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/AlbumArtSearchService.cs

@@ -123,7 +123,6 @@ namespace BetterLyrics.WinUI3.Services
 
                         if (fetched != null && fetched.Length > 0)
                         {
-                            fetched = ImageHelper.MakeSquareWithThemeColor(fetched);
                             // Write to cache
                             FileHelper.WriteAlbumArtCache(artist, album, fetched, format, PathHelper.iTunesAlbumArtCacheDirectory);
                             return fetched;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/IPlaybackService.cs

@@ -19,6 +19,8 @@ namespace BetterLyrics.WinUI3.Services
         Task PauseAsync();
         Task PreviousAsync();
         Task NextAsync();
-            
+
+        bool IsPlaying { get; }
+
     }
 }

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

@@ -13,6 +13,7 @@ using Microsoft.UI.Dispatching;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Text.Json;
@@ -34,17 +35,18 @@ namespace BetterLyrics.WinUI3.Services
 
         private readonly string _lxMusicId = "cn.toside.music.desktop";
 
+        private bool _cachedIsPlaying = false;
+
         private EventSourceReader? _sse = null;
 
         private readonly MediaManager _mediaManager = new();
 
-        private readonly LatestOnlyTaskRunner _AlbumArtRefreshRunner = new();
-        private readonly LatestOnlyTaskRunner _OnAnyMediaPropertyChangedRunner = new();
+        private readonly LatestOnlyTaskRunner _albumArtRefreshRunner = new();
+        private readonly LatestOnlyTaskRunner _onAnyMediaPropertyChangedRunner = new();
 
         private SongInfo? _cachedSongInfo;
         private List<MediaSourceProviderInfo> _mediaSourceProvidersInfo;
         private byte[]? _SMTCAlbumArtBytes = null;
-        private AlbumArtChangedEventArgs _albumArtChangedEventArgs = new();
 
         public event EventHandler<IsPlayingChangedEventArgs>? IsPlayingChanged;
         public event EventHandler<PositionChangedEventArgs>? PositionChanged;
@@ -61,6 +63,8 @@ namespace BetterLyrics.WinUI3.Services
             InitMediaManager();
         }
 
+        public bool IsPlaying => _cachedIsPlaying;
+
         private bool IsMediaSourceEnabled(string id)
         {
             return _mediaSourceProvidersInfo.FirstOrDefault(s => s.Provider == id)?.IsEnabled ?? true;
@@ -88,7 +92,7 @@ namespace BetterLyrics.WinUI3.Services
             }
             else
             {
-                _dispatcherQueue.TryEnqueue(async () =>
+                Task.Run(async () =>
                 {
                     try
                     {
@@ -96,11 +100,7 @@ namespace BetterLyrics.WinUI3.Services
                         MediaManager_OnAnyMediaPropertyChanged(mediaSession, props);
                         MediaManager_OnAnyPlaybackStateChanged(mediaSession, mediaSession.ControlSession.GetPlaybackInfo());
                     }
-                    catch (Exception ex)
-                    {
-                        _logger.LogWarning(ex, "TryGetMediaPropertiesAsync failed");
-                        SendNullMessages();
-                    }
+                    catch (Exception) { }
                 });
             }
         }
@@ -123,31 +123,41 @@ namespace BetterLyrics.WinUI3.Services
             RecordMediaSourceProviderInfo(mediaSession);
             if (!IsMediaSourceEnabled(mediaSession.ControlSession.SourceAppUserModelId) || mediaSession != _mediaManager.GetFocusedSession()) return;
 
+            _cachedIsPlaying = playbackInfo.PlaybackStatus switch
+            {
+                GlobalSystemMediaTransportControlsSessionPlaybackStatus.Playing => true,
+                _ => false,
+            };
+
             _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.High,
                 () =>
                 {
-                    IsPlayingChanged?.Invoke(this, new IsPlayingChangedEventArgs(playbackInfo.PlaybackStatus switch
-                    {
-                        GlobalSystemMediaTransportControlsSessionPlaybackStatus.Playing => true,
-                        _ => false,
-                    }));
+                    IsPlayingChanged?.Invoke(this, new IsPlayingChangedEventArgs(_cachedIsPlaying));
                 }
             );
         }
 
-        private void MediaManager_OnAnyMediaPropertyChanged(MediaManager.MediaSession mediaSession, GlobalSystemMediaTransportControlsSessionMediaProperties mediaProperties)
+        private async void MediaManager_OnAnyMediaPropertyChanged(MediaManager.MediaSession mediaSession, GlobalSystemMediaTransportControlsSessionMediaProperties mediaProperties)
         {
-            _ = _OnAnyMediaPropertyChangedRunner.RunAsync(async token =>
+            string id = mediaSession.ControlSession.SourceAppUserModelId;
+
+            RecordMediaSourceProviderInfo(mediaSession);
+            if (!IsMediaSourceEnabled(id) || mediaSession != _mediaManager.GetFocusedSession()) return;
+
+            _cachedSongInfo = new SongInfo
+            {
+                Title = mediaProperties.Title,
+                Artist = mediaProperties.Artist,
+                Album = mediaProperties.AlbumTitle,
+                DurationMs = mediaSession.ControlSession.GetTimelineProperties().EndTime.TotalMilliseconds,
+                SourceAppUserModelId = id,
+            };
+
+            await _onAnyMediaPropertyChangedRunner.RunAsync(async token =>
             {
                 _logger.LogInformation("Media properties changed: Title: {Title}, Artist: {Artist}, Album: {Album}",
                     mediaProperties.Title, mediaProperties.Artist, mediaProperties.AlbumTitle);
 
-                RecordMediaSourceProviderInfo(mediaSession);
-                string id = mediaSession.ControlSession.SourceAppUserModelId;
-                if (!IsMediaSourceEnabled(id) || mediaSession != _mediaManager.GetFocusedSession()) return;
-
-                token.ThrowIfCancellationRequested();
-
                 if (id == _lxMusicId)
                 {
                     StartSSE();
@@ -157,30 +167,24 @@ namespace BetterLyrics.WinUI3.Services
                     StopSSE();
                 }
 
-                _cachedSongInfo = new SongInfo
-                {
-                    Title = mediaProperties.Title,
-                    Artist = mediaProperties.Artist,
-                    Album = mediaProperties.AlbumTitle,
-                    DurationMs = mediaSession.ControlSession.GetTimelineProperties().EndTime.TotalMilliseconds,
-                    SourceAppUserModelId = id,
-                };
-
                 if (mediaProperties.Thumbnail is IRandomAccessStreamReference streamReference)
                 {
                     _SMTCAlbumArtBytes = await ImageHelper.ToByteArrayAsync(streamReference);
                     token.ThrowIfCancellationRequested();
                 }
+                else
+                {
+                    _SMTCAlbumArtBytes = null;
+                }
 
-                _ = _AlbumArtRefreshRunner.RunAsync(async tokne =>
+                await _albumArtRefreshRunner.RunAsync(async tokne =>
                 {
                     await UpdateAlbumArtRelated(tokne);
                 });
 
                 if (!token.IsCancellationRequested)
                 {
-                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.High,
-                    () =>
+                    _dispatcherQueue.TryEnqueue(() =>
                     {
                         SongInfoChanged?.Invoke(this, new SongInfoChangedEventArgs(_cachedSongInfo));
                     });
@@ -225,8 +229,9 @@ namespace BetterLyrics.WinUI3.Services
             () =>
             {
                 _cachedSongInfo = null;
+                _cachedIsPlaying = false;
                 SongInfoChanged?.Invoke(this, new SongInfoChangedEventArgs(_cachedSongInfo));
-                IsPlayingChanged?.Invoke(this, new IsPlayingChangedEventArgs(false));
+                IsPlayingChanged?.Invoke(this, new IsPlayingChangedEventArgs(_cachedIsPlaying));
                 PositionChanged?.Invoke(this, new PositionChangedEventArgs(TimeSpan.Zero));
             });
         }
@@ -253,6 +258,8 @@ namespace BetterLyrics.WinUI3.Services
                 token.ThrowIfCancellationRequested();
             }
 
+            bytes = ImageHelper.MakeSquareWithThemeColor(bytes);
+
             using var stream = new InMemoryRandomAccessStream();
             await stream.WriteAsync(bytes.AsBuffer());
             token.ThrowIfCancellationRequested();
@@ -260,23 +267,34 @@ namespace BetterLyrics.WinUI3.Services
             var decoder = await BitmapDecoder.CreateAsync(stream);
             token.ThrowIfCancellationRequested();
 
-            _albumArtChangedEventArgs.AlbumArtSwBitmap = await decoder.GetSoftwareBitmapAsync(BitmapPixelFormat.Rgba8, BitmapAlphaMode.Premultiplied);
+            var _albumArtSwBitmap = await decoder.GetSoftwareBitmapAsync(BitmapPixelFormat.Rgba8, BitmapAlphaMode.Premultiplied);
             token.ThrowIfCancellationRequested();
 
-            _albumArtChangedEventArgs.AlbumArtAccentColor = ImageHelper.GetAccentColorsFromByte(bytes).FirstOrDefault();
+            var _albumArtAccentColor = ImageHelper.GetAccentColorsFromByte(bytes).FirstOrDefault();
 
-            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.High,
-            () =>
+            _dispatcherQueue.TryEnqueue(() =>
             {
-                AlbumArtChangedChanged?.Invoke(this, _albumArtChangedEventArgs);
+                AlbumArtChangedChanged?.Invoke(this, new AlbumArtChangedEventArgs(_albumArtSwBitmap, _albumArtAccentColor));
             });
         }
 
         private void StartSSE()
         {
-            _sse = new EventSourceReader(new Uri($"{_settingsService.LXMusicServer}/subscribe-player-status?filter=progress")).Start();
-            _sse.MessageReceived += Sse_MessageReceived;
-            _sse.Disconnected += Sse_Disconnected;
+            try
+            {
+                _sse = new EventSourceReader(new Uri($"{_settingsService.LXMusicServer}/subscribe-player-status?filter=progress")).Start();
+                _sse.MessageReceived += Sse_MessageReceived;
+                _sse.Disconnected += Sse_Disconnected;
+            }
+            catch (Exception)
+            {
+                _logger.LogError("Failed to start SSE connection for LX Music.");
+                _dispatcherQueue.TryEnqueue(() =>
+                {
+                    App.Current.LyricsWindowNotificationPanel?.Notify(App.ResourceLoader!.GetString("FailToStartLXMusicServer"), Microsoft.UI.Xaml.Controls.InfoBarSeverity.Error);
+                });
+                StopSSE();
+            }
         }
 
         private void StopSSE()
@@ -361,7 +379,7 @@ namespace BetterLyrics.WinUI3.Services
             }
         }
 
-        public void Receive(PropertyChangedMessage<ObservableCollection<AlbumArtSearchProviderInfo>> message)
+        public async void Receive(PropertyChangedMessage<ObservableCollection<AlbumArtSearchProviderInfo>> message)
         {
             if (message.Sender is SettingsPageViewModel)
             {
@@ -369,7 +387,7 @@ namespace BetterLyrics.WinUI3.Services
                 {
                     // Album art search providers info changed, re-fetch album art
                     _logger.LogInformation("Album art search providers info changed, refreshing album art.");
-                    _ = _AlbumArtRefreshRunner.RunAsync(async tokne =>
+                    await _albumArtRefreshRunner.RunAsync(async tokne =>
                     {
                         await UpdateAlbumArtRelated(tokne);
                     });

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw

@@ -772,4 +772,7 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageFAQ.Header" xml:space="preserve">
     <value>Frequently asked questions</value>
   </data>
+  <data name="FailToStartLXMusicServer" xml:space="preserve">
+    <value>Unable to connect to LX Music server, please go to Settings - Advanced options to check if the link is entered correctly</value>
+  </data>
 </root>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw

@@ -772,4 +772,7 @@
   <data name="SettingsPageFAQ.Header" xml:space="preserve">
     <value>よくある質問</value>
   </data>
+  <data name="FailToStartLXMusicServer" xml:space="preserve">
+    <value>LX Music Serverに接続できない場合は、設定に移動してください。リンクが正しく入力されているかどうかを確認するための高度なオプションに移動してください</value>
+  </data>
 </root>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw

@@ -772,4 +772,7 @@
   <data name="SettingsPageFAQ.Header" xml:space="preserve">
     <value>자주 묻는 질문</value>
   </data>
+  <data name="FailToStartLXMusicServer" xml:space="preserve">
+    <value>LX Music Server에 연결할 수 없습니다. 설정으로 이동하십시오 - 고급 옵션이 링크가 올바르게 입력되었는지 확인하십시오.</value>
+  </data>
 </root>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw

@@ -772,4 +772,7 @@
   <data name="SettingsPageFAQ.Header" xml:space="preserve">
     <value>常见问题与解答</value>
   </data>
+  <data name="FailToStartLXMusicServer" xml:space="preserve">
+    <value>无法连接到 LX 音乐服务器，请转到设置 - 高级选项以检查是否正确输入链接</value>
+  </data>
 </root>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw

@@ -772,4 +772,7 @@
   <data name="SettingsPageFAQ.Header" xml:space="preserve">
     <value>常見問題與解答</value>
   </data>
+  <data name="FailToStartLXMusicServer" xml:space="preserve">
+    <value>無法連接到 LX 音樂服務器，請轉到設置 - 高級選項以檢查是否正確輸入鏈接</value>
+  </data>
 </root>

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

@@ -10,6 +10,7 @@ using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.Mvvm.Messaging.Messages;
 using Microsoft.UI.Xaml;
+using System.Numerics;
 using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.ViewModels
@@ -36,6 +37,8 @@ namespace BetterLyrics.WinUI3.ViewModels
             _playbackService = playbackService;
             _playbackService.SongInfoChanged += PlaybackService_SongInfoChanged;
             _playbackService.IsPlayingChanged += PlaybackService_IsPlayingChanged;
+
+            IsSongPlaying = _playbackService.IsPlaying;
         }
 
         //private void SystemVolumeHelper_VolumeChanged(int volume)
@@ -60,6 +63,9 @@ namespace BetterLyrics.WinUI3.ViewModels
         //[ObservableProperty]
         //public partial int Volume { get; set; }
 
+        [ObservableProperty]
+        public partial Vector3 BottomCenterCommandGridTranslation { get; set; } = new Vector3(0, 0, 0);
+
         [ObservableProperty]
         public partial bool IsImmersiveMode { get; set; }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel.Draw.cs

@@ -443,7 +443,8 @@ namespace BetterLyrics.WinUI3.ViewModels
                     else
                     {
                         float height = 0f;
-                        var regions = textLayout.GetCharacterRegions(0, string.Join("", line.LyricsChars.Select(x => x.Text)).Length);
+                        //var regions = textLayout.GetCharacterRegions(0, string.Join("", line.LyricsChars.Select(x => x.Text)).Length);
+                        var regions = textLayout.GetCharacterRegions(0, line.OriginalText.Length);
                         if (regions.Length > 0)
                         {
                             height = (float)regions[^1].LayoutBounds.Bottom - (float)regions[0].LayoutBounds.Top;

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

@@ -195,7 +195,7 @@ namespace BetterLyrics.WinUI3.ViewModels
         {
             for (int i = 0; i < _lyricsDataArr.ElementAtOrDefault(_langIndex)?.LyricsLines.Count; i++)
             {
-                var line = _lyricsDataArr.ElementAtOrDefault(_langIndex)?.LyricsLines[i];
+                var line = _lyricsDataArr.ElementAtOrDefault(_langIndex)?.LyricsLines.ElementAtOrDefault(i);
                 if (line == null) continue;
                 var nextLine = _lyricsDataArr.ElementAtOrDefault(_langIndex)?.LyricsLines.ElementAtOrDefault(i + 1);
                 var totalMs = _totalTime.TotalMilliseconds + _positionOffset.TotalMilliseconds;
@@ -283,11 +283,21 @@ namespace BetterLyrics.WinUI3.ViewModels
             }
             else
             {
-                // 没有逐字时间轴，直接线性，模拟逐字高亮
+                // 没有逐字时间轴，均匀分配每个字的高亮时间
+                int textLength = line.OriginalText.Length;
+                if (textLength == 0) return;
+
                 float lineProgress = (now - line.StartMs) / (lineEndMs - line.StartMs);
-                charStartIndex = (int)(lineProgress * line.OriginalText.Length);
-                charProgress = lineProgress - (int)(lineProgress);
+                lineProgress = Math.Clamp(lineProgress, 0f, 1f);
+
+                // 计算当前高亮到第几个字
+                float charFloatIndex = lineProgress * textLength;
+                int charIndex = (int)charFloatIndex;
+                charStartIndex = Math.Clamp(charIndex, 0, textLength - 1);
                 charLength = 1;
+
+                // 当前字的进度（0~1）
+                charProgress = charFloatIndex - charIndex;
             }
         }
 
@@ -345,6 +355,7 @@ namespace BetterLyrics.WinUI3.ViewModels
                 _songInfoOpacityTransition.StartTransition(1f);
 
                 _logger.LogInformation("Song info changed: Title={Title}, Artist={Artist}, refreshing lyrics...", _songTitle, _songArtist);
+                Debug.WriteLine($"Song info changed: Title={_songTitle}, Artist={_songArtist}");
                 _ = _refreshLyricsRunner.RunAsync(async token =>
                 {
                     await RefreshLyricsAsync(token);
@@ -433,9 +444,9 @@ namespace BetterLyrics.WinUI3.ViewModels
                         token.ThrowIfCancellationRequested();
                         if (_showTranslationOnly)
                         {
-                            // TODO
-                            _lyricsDataArr[0].SetDisplayedTextAlongWith(translated);
-                            _langIndex = 0;
+                            _lyricsDataArr[^1] = _lyricsDataArr[0].CreateLyricsDataFrom(translated);
+                            _lyricsDataArr[^1].SetDisplayedTextInOriginalText();
+                            _langIndex = _lyricsDataArr.Count - 1;
                         }
                         else
                         {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml

@@ -18,7 +18,7 @@
     xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
-    <Grid x:Name="RootGrid">
+    <Grid x:Name="RootGrid" SizeChanged="RootGrid_SizeChanged">
         <!--  Lyrics area  -->
         <renderer:LyricsRenderer />
 
@@ -140,14 +140,15 @@
             <Grid
                 Padding="3"
                 HorizontalAlignment="Center"
-                Style="{StaticResource CardGridStyle}">
+                Style="{StaticResource CardGridStyle}"
+                Translation="{x:Bind ViewModel.BottomCenterCommandGridTranslation, Mode=OneWay}">
+                <Grid.TranslationTransition>
+                    <Vector3Transition />
+                </Grid.TranslationTransition>
                 <StackPanel
                     x:Name="BottomCenterCommandStackPanel"
                     Orientation="Horizontal"
                     Spacing="3">
-                    <StackPanel.OpacityTransition>
-                        <ScalarTransition />
-                    </StackPanel.OpacityTransition>
                     <Button
                         Command="{x:Bind ViewModel.PreviousSongCommand}"
                         Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml.cs

@@ -14,7 +14,7 @@ namespace BetterLyrics.WinUI3.Views
     public sealed partial class LyricsPage : Page
     {
         private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
-        
+
         public LyricsPage()
         {
             this.InitializeComponent();
@@ -82,5 +82,17 @@ namespace BetterLyrics.WinUI3.Views
         {
             TranslationFlyout.ShowAt(BottomRightCommandStackPanel);
         }
+
+        private void RootGrid_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            if (e.NewSize.Width < 500)
+            {
+                ViewModel.BottomCenterCommandGridTranslation = new System.Numerics.Vector3(0, -48, 0);
+            }
+            else
+            {
+                ViewModel.BottomCenterCommandGridTranslation = new System.Numerics.Vector3(0, 0, 0);
+            }
+        }
     }
 }

README.CN.md

@@ -93,7 +93,7 @@ BetterLyrics
 
 > **最便捷**的获取方式，提供**无限制**免费试用或购买（免费版与付费版**功能完全一致**，购买视为对开发者的支持）
 
-或通过 Google Drive 获取（链接见[发布页](https://github.com/jayfunc/BetterLyrics/releases/latest)）
+或通过 Google Drive 获取（链接见[发布页](https://github.com/jayfunc/BetterLyrics/releases)）
 
 > 下载的是 ".zip" 压缩包，安装指南请参阅[此文档](How2Install/How2Install.md)
 

README.md

@@ -93,7 +93,7 @@ Watch our introduction video (uploaded on 7 July 2025) on Bilibili [here](https:
 
 > **Easiest** way to get it. **Unlimited** free trail or purchase (there is **no difference** between free and paid version, if you like you can purchase to support me)
 
-Or alternatively get it from Google Drive (see [release](https://github.com/jayfunc/BetterLyrics/releases/latest) page for the link)
+Or alternatively get it from Google Drive (see [release](https://github.com/jayfunc/BetterLyrics/releases) page for the link)
 
 > Please note you are downloading ".zip" file, for guide on how to install it, please kindly follow [this doc](How2Install/How2Install.md).