Fix #104

2026-01-13 03:34:55 +08:00 · 2025-11-14 10:17:20 -05:00
parent f7f5e127a0
commit 4eeaf9aeec
14 changed files with 146 additions and 101 deletions
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/AmllTTmlDB.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/AmllTTmlDB.cs
@@ -2,8 +2,8 @@
 {
    public static class AmllTTmlDB
    {
-        private const string BaseUrl = "https://raw.githubusercontent.com/Steve-xmh/amll-ttml-db/refs/heads/main/";
-        public const string QueryPrefix = $"{BaseUrl}raw-lyrics/";
-        public const string Index = $"{BaseUrl}metadata/raw-lyrics-index.jsonl";
+        public const string BaseUrl = "https://raw.githubusercontent.com/Steve-xmh/amll-ttml-db/refs/heads/main";
+        public const string QueryPrefix = "raw-lyrics";
+        public const string IndexSuffix = "metadata/raw-lyrics-index.jsonl";
    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsEffectSettingsControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsEffectSettingsControl.xaml
@@ -47,10 +47,6 @@
                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsLineFadeEnabled, Mode=TwoWay}" />
                    </dev:SettingsCard>

-                    <dev:SettingsCard x:Uid="SettingsPageForceWordByWordEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8F0;}">
-                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsForceWordByWordEffect, Mode=TwoWay}" />
-                    </dev:SettingsCard>
-
                    <!--  高亮  -->
                    <dev:SettingsExpander x:Uid="SettingsPageLyricsHighlight" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7E6;}">
                        <dev:SettingsExpander.Items>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml
@@ -21,8 +21,64 @@
            <ColumnDefinition Width="*" />
            <ColumnDefinition Width="*" />
        </Grid.ColumnDefinitions>
-        <Grid Grid.Column="0">
-            <ScrollViewer Margin="0,72,0,0" Style="{StaticResource SettingsScrollViewerStyle}">
+
+        <Grid Grid.Column="0" RowSpacing="18">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <interactivity:Interaction.Behaviors>
+                <interactivity:DataTriggerBehavior
+                    Binding="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo.Count, Mode=OneWay}"
+                    ComparisonCondition="NotEqual"
+                    Value="0">
+                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
+                </interactivity:DataTriggerBehavior>
+                <interactivity:DataTriggerBehavior
+                    Binding="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo.Count, Mode=OneWay}"
+                    ComparisonCondition="Equal"
+                    Value="0">
+                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
+                </interactivity:DataTriggerBehavior>
+            </interactivity:Interaction.Behaviors>
+
+            <!--  播放源列表  -->
+            <ListView
+                x:Name="MediaSourceProvidersListView"
+                Grid.Row="0"
+                AllowDrop="True"
+                CanDragItems="True"
+                CanReorderItems="True"
+                DragItemsCompleted="MediaSourceProvidersListView_DragItemsCompleted"
+                ItemsSource="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo, Mode=OneWay}"
+                ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+                ScrollViewer.HorizontalScrollMode="Enabled"
+                ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                ScrollViewer.VerticalScrollMode="Disabled"
+                SelectedItem="{x:Bind ViewModel.SelectedMediaSourceProvider, Mode=TwoWay}">
+                <ListView.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <ItemsStackPanel Orientation="Horizontal" />
+                    </ItemsPanelTemplate>
+                </ListView.ItemsPanel>
+                <ListView.ItemTemplate>
+                    <DataTemplate x:DataType="models:MediaSourceProviderInfo">
+                        <StackPanel Orientation="Horizontal" Spacing="6">
+                            <FontIcon
+                                FontFamily="Segoe UI Symbol"
+                                FontSize="12"
+                                Glyph="&#x283F;" />
+                            <ImageIcon Height="16" Source="{Binding Provider, Converter={StaticResource MediaSourceProviderToLogoUriConverter}, Mode=OneWay}" />
+                            <TextBlock
+                                MaxWidth="200"
+                                Text="{Binding Provider, Converter={StaticResource MediaSourceProviderToDisplayedNameConverter}, Mode=OneWay}"
+                                TextWrapping="Wrap" />
+                        </StackPanel>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
+
+            <ScrollViewer Grid.Row="1" Style="{StaticResource SettingsScrollViewerStyle}">
                <Grid Style="{StaticResource SettingsGridStyle}">
                    <StackPanel Spacing="{StaticResource SettingsCardSpacing}">

@@ -34,6 +90,27 @@
                            <ToggleSwitch IsOn="{x:Bind ViewModel.SelectedMediaSourceProvider.IsLastFMTrackEnabled, Mode=TwoWay}" />
                        </dev:SettingsCard>

+                        <!--  LX music server  -->
+                        <dev:SettingsCard x:Uid="SettingsPageLXMusicServer" Visibility="{x:Bind ViewModel.SelectedMediaSourceProvider.IsLXMusic, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
+                            <Grid ColumnSpacing="6">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <TextBox
+                                    x:Uid="SettingsPageLXMusicServerInput"
+                                    Grid.Column="0"
+                                    IsEnabled="{x:Bind ViewModel.IsLXMusicServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
+                                    Text="{x:Bind ViewModel.AppSettings.GeneralSettings.LXMusicServer, Mode=TwoWay}"
+                                    TextWrapping="Wrap" />
+                                <Button
+                                    x:Uid="SettingsPageServerTestButton"
+                                    Grid.Column="1"
+                                    Command="{x:Bind ViewModel.LXMusicServerTestCommand}"
+                                    IsEnabled="{x:Bind ViewModel.IsLXMusicServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
+                            </Grid>
+                        </dev:SettingsCard>
+
                        <!--  时间轴相关配置  -->
                        <dev:SettingsExpander x:Uid="SettingsPageLyricsTimeline" IsExpanded="True">
                            <ToggleSwitch IsOn="{x:Bind ViewModel.SelectedMediaSourceProvider.IsTimelineSyncEnabled, Mode=TwoWay}" />
@@ -127,55 +204,6 @@
                </Grid>
            </ScrollViewer>

-            <!--  播放源列表  -->
-            <ListView
-                x:Name="MediaSourceProvidersListView"
-                VerticalAlignment="Top"
-                AllowDrop="True"
-                CanDragItems="True"
-                CanReorderItems="True"
-                DragItemsCompleted="MediaSourceProvidersListView_DragItemsCompleted"
-                ItemsSource="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo, Mode=OneWay}"
-                ScrollViewer.HorizontalScrollBarVisibility="Hidden"
-                ScrollViewer.HorizontalScrollMode="Enabled"
-                ScrollViewer.VerticalScrollBarVisibility="Disabled"
-                ScrollViewer.VerticalScrollMode="Disabled"
-                SelectedItem="{x:Bind ViewModel.SelectedMediaSourceProvider, Mode=TwoWay}">
-                <ListView.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <ItemsStackPanel Orientation="Horizontal" />
-                    </ItemsPanelTemplate>
-                </ListView.ItemsPanel>
-                <ListView.ItemTemplate>
-                    <DataTemplate x:DataType="models:MediaSourceProviderInfo">
-                        <StackPanel Orientation="Horizontal" Spacing="6">
-                            <FontIcon
-                                FontFamily="Segoe UI Symbol"
-                                FontSize="12"
-                                Glyph="&#x283F;" />
-                            <ImageIcon Height="16" Source="{Binding Provider, Converter={StaticResource MediaSourceProviderToLogoUriConverter}, Mode=OneWay}" />
-                            <TextBlock
-                                MaxWidth="200"
-                                Text="{Binding Provider, Converter={StaticResource MediaSourceProviderToDisplayedNameConverter}, Mode=OneWay}"
-                                TextWrapping="Wrap" />
-                        </StackPanel>
-                    </DataTemplate>
-                </ListView.ItemTemplate>
-            </ListView>
-            <interactivity:Interaction.Behaviors>
-                <interactivity:DataTriggerBehavior
-                    Binding="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo.Count, Mode=OneWay}"
-                    ComparisonCondition="NotEqual"
-                    Value="0">
-                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
-                </interactivity:DataTriggerBehavior>
-                <interactivity:DataTriggerBehavior
-                    Binding="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo.Count, Mode=OneWay}"
-                    ComparisonCondition="Equal"
-                    Value="0">
-                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
-                </interactivity:DataTriggerBehavior>
-            </interactivity:Interaction.Behaviors>
        </Grid>

        <StackPanel
@@ -222,6 +250,9 @@
                                IsEnabled="False"
                                NavigateUri="{x:Bind ViewModel.TranslatedLyricsRef, Mode=OneWay}" />
                        </dev:SettingsCard>
+                        <dev:SettingsCard x:Uid="SettingsPageForceWordByWordEffect">
+                            <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.IsForceWordByWordEffect, Mode=TwoWay}" />
+                        </dev:SettingsCard>

                        <!--  Lyrics translation  -->
                        <TextBlock x:Uid="SettingsPageTranslation" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
@@ -320,19 +351,25 @@
                            </dev:SettingsExpander.Items>
                        </dev:SettingsExpander>

-                        <!--  LX music server  -->
-                        <TextBlock x:Uid="SettingsPageLXMusicServer" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-                        <dev:SettingsCard x:Uid="SettingsPageServerAddress">
-                            <StackPanel Orientation="Horizontal" Spacing="6">
+                        <!--  amll-ttml-db  -->
+                        <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="amll-ttml-db" />
+                        <dev:SettingsCard x:Uid="SettingsPageAmllTtmlDbBaseUrl">
+                            <Grid ColumnSpacing="6">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
                                <TextBox
-                                    x:Uid="SettingsPageLXMusicServerInput"
-                                    IsEnabled="{x:Bind ViewModel.IsLXMusicServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
-                                    Text="{x:Bind ViewModel.AppSettings.GeneralSettings.LXMusicServer, Mode=TwoWay}" />
+                                    Grid.Column="0"
+                                    Text="{x:Bind ViewModel.AppSettings.GeneralSettings.AmllTtmlDbBaseUrl, Mode=TwoWay}"
+                                    TextWrapping="Wrap" />
                                <Button
-                                    x:Uid="SettingsPageServerTestButton"
-                                    Command="{x:Bind ViewModel.LXMusicServerTestCommand}"
-                                    IsEnabled="{x:Bind ViewModel.IsLXMusicServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
-                            </StackPanel>
+                                    Grid.Column="1"
+                                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                          FontSize=12,
+                                                          Glyph=&#xE8FB;}"
+                                    Style="{StaticResource GhostButtonStyle}" />
+                            </Grid>
                        </dev:SettingsCard>

                        <!--  Apple Music token  -->
@@ -342,20 +379,31 @@
                            Description="Use at your own risk"
                            Foreground="{ThemeResource SystemFillColorCautionBrush}"
                            Header="WARNING">
-                            <StackPanel Orientation="Horizontal" Spacing="6">
+                            <Grid ColumnSpacing="6">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
                                <TextBox
-                                    MaxWidth="250"
+                                    Grid.Column="0"
                                    PlaceholderText="media-user-token"
                                    Text="{x:Bind ViewModel.AppleMusicMediaUserToken, Mode=TwoWay}"
                                    TextWrapping="Wrap" />
-                                <HyperlinkButton Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, FontSize=12, Glyph=&#xE897;}" NavigateUri="{x:Bind constants:Link.AppleMusicCfgUrl}" />
+                                <HyperlinkButton
+                                    Grid.Column="1"
+                                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                          FontSize=12,
+                                                          Glyph=&#xE897;}"
+                                    NavigateUri="{x:Bind constants:Link.AppleMusicCfgUrl}" />
                                <Button
+                                    Grid.Column="2"
                                    Command="{x:Bind ViewModel.SaveAppleMusicMediaUserTokenCommand}"
                                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                                          FontSize=12,
                                                          Glyph=&#xE8FB;}"
                                    Style="{StaticResource GhostButtonStyle}" />
-                            </StackPanel>
+                            </Grid>
                        </dev:SettingsCard>

                    </StackPanel>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaSourceProviderInfo.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaSourceProviderInfo.cs
@@ -2,6 +2,7 @@

 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Extensions;
+using BetterLyrics.WinUI3.Helper;
 using CommunityToolkit.Mvvm.ComponentModel;
 using System;
 using System.Linq;
@@ -27,6 +28,8 @@ namespace BetterLyrics.WinUI3.Models

        [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<AlbumArtSearchProviderInfo> AlbumArtSearchProvidersInfo { get; set; } = [.. Enum.GetValues<AlbumArtSearchProvider>().Select(p => new AlbumArtSearchProviderInfo(p, true))];

+        public bool IsLXMusic => PlayerIdMatcher.IsLXMusic(Provider);
+
        public MediaSourceProviderInfo()
        {
            Provider = string.Empty;
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/GeneralSettings.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/GeneralSettings.cs
@@ -7,6 +7,8 @@ namespace BetterLyrics.WinUI3.Models.Settings
    {
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LanguageCode { get; set; } = "";
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LXMusicServer { get; set; } = string.Empty;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string AmllTtmlDbBaseUrl { get; set; } = Constants.AmllTTmlDB.BaseUrl;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsForceWordByWordEffect { get; set; } = true;
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> ShowOrHideLyricsWindowShortcut { get; set; } = new List<string> { "Ctrl", "Alt", "H" };
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ExitOnLyricsWindowClosed { get; set; } = false;
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ListenOnNewPlaybackSource { get; set; } = true;
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsEffectSettings.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsEffectSettings.cs
@@ -10,8 +10,6 @@ namespace BetterLyrics.WinUI3.Models.Settings

        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsLineFadeEnabled { get; set; } = true;

-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsForceWordByWordEffect { get; set; } = true;
-
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsGlowEffectEnabled { get; set; } = true;
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LineRenderingType LyricsGlowEffectScope { get; set; } = LineRenderingType.CurrentChar;
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsGlowEffectAmount { get; set; } = 8;
@@ -62,8 +60,6 @@ namespace BetterLyrics.WinUI3.Models.Settings

                IsLyricsLineFadeEnabled = this.IsLyricsLineFadeEnabled,

-                IsForceWordByWordEffect = this.IsForceWordByWordEffect,
-
                IsLyricsGlowEffectEnabled = this.IsLyricsGlowEffectEnabled,
                LyricsGlowEffectScope = this.LyricsGlowEffectScope,
                LyricsGlowEffectAmount = this.LyricsGlowEffectAmount,
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs
@@ -66,7 +66,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
        {
            try
            {
-                using var response = await _amllTtmlDbHttpClient.GetAsync(Constants.AmllTTmlDB.Index, HttpCompletionOption.ResponseHeadersRead);
+                using var response = await _amllTtmlDbHttpClient.GetAsync($"{_settingsService.AppSettings.GeneralSettings.AmllTtmlDbBaseUrl}/{Constants.AmllTTmlDB.IndexSuffix}", HttpCompletionOption.ResponseHeadersRead);
                if (!response.IsSuccessStatusCode) return false;

                await using var stream = await response.Content.ReadAsStreamAsync();
@@ -378,7 +378,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
            }

            // 下载歌词内容
-            var url = $"{Constants.AmllTTmlDB.QueryPrefix}{rawLyricFile}";
+            var url = $"{_settingsService.AppSettings.GeneralSettings.AmllTtmlDbBaseUrl}/{Constants.AmllTTmlDB.QueryPrefix}/{rawLyricFile}";
            try
            {
                using var response = await _amllTtmlDbHttpClient.GetAsync(url);
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/TranslateService/TranslateService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/TranslateService/TranslateService.cs
@@ -66,7 +66,7 @@ namespace BetterLyrics.WinUI3.Services.TranslateService
                {
                    if (lyricsDataArr[i].LanguageCode == targetLangCode)
                    {
-                        float translationRate = lyricsDataArr[i].LyricsLines.Count / lyricsDataArr[0].LyricsLines.Count;
+                        float translationRate = lyricsDataArr[i].LyricsLines.Count / (float)lyricsDataArr[0].LyricsLines.Count;
                        if (translationRate > maxTranslatinRate)
                        {
                            maxTranslatinRate = translationRate;
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
@@ -571,6 +571,9 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
  <data name="SettingsPageAlbumStyle.Text" xml:space="preserve">
    <value>Album art area style</value>
  </data>
+  <data name="SettingsPageAmllTtmlDbBaseUrl.Header" xml:space="preserve">
+    <value>Base URL</value>
+  </data>
  <data name="SettingsPageAmount.Header" xml:space="preserve">
    <value>Amount</value>
  </data>
@@ -895,7 +898,7 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
  <data name="SettingsPageLog.Header" xml:space="preserve">
    <value>Log record</value>
  </data>
-  <data name="SettingsPageLXMusicServer.Text" xml:space="preserve">
+  <data name="SettingsPageLXMusicServer.Header" xml:space="preserve">
    <value>LX Music Server</value>
  </data>
  <data name="SettingsPageLXMusicServerInput.PlaceholderText" xml:space="preserve">
@@ -1210,9 +1213,6 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
  <data name="SettingsPageScrollTopDuration.Header" xml:space="preserve">
    <value>The duration of the first line</value>
  </data>
-  <data name="SettingsPageServerAddress.Header" xml:space="preserve">
-    <value>Server address</value>
-  </data>
  <data name="SettingsPageServerTestButton.Content" xml:space="preserve">
    <value>Test server</value>
  </data>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
@@ -571,6 +571,9 @@
  <data name="SettingsPageAlbumStyle.Text" xml:space="preserve">
    <value>アルバムエリアスタイル</value>
  </data>
+  <data name="SettingsPageAmllTtmlDbBaseUrl.Header" xml:space="preserve">
+    <value>ベースURL</value>
+  </data>
  <data name="SettingsPageAmount.Header" xml:space="preserve">
    <value>量</value>
  </data>
@@ -895,7 +898,7 @@
  <data name="SettingsPageLog.Header" xml:space="preserve">
    <value>ログレコード</value>
  </data>
-  <data name="SettingsPageLXMusicServer.Text" xml:space="preserve">
+  <data name="SettingsPageLXMusicServer.Header" xml:space="preserve">
    <value>LX Music Server</value>
  </data>
  <data name="SettingsPageLXMusicServerInput.PlaceholderText" xml:space="preserve">
@@ -1210,9 +1213,6 @@
  <data name="SettingsPageScrollTopDuration.Header" xml:space="preserve">
    <value>最初の行の期間</value>
  </data>
-  <data name="SettingsPageServerAddress.Header" xml:space="preserve">
-    <value>サーバーアドレス</value>
-  </data>
  <data name="SettingsPageServerTestButton.Content" xml:space="preserve">
    <value>テストサーバー</value>
  </data>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
@@ -571,6 +571,9 @@
  <data name="SettingsPageAlbumStyle.Text" xml:space="preserve">
    <value>앨범 영역 스타일</value>
  </data>
+  <data name="SettingsPageAmllTtmlDbBaseUrl.Header" xml:space="preserve">
+    <value>기본 URL</value>
+  </data>
  <data name="SettingsPageAmount.Header" xml:space="preserve">
    <value>금액</value>
  </data>
@@ -895,7 +898,7 @@
  <data name="SettingsPageLog.Header" xml:space="preserve">
    <value>로그 레코드</value>
  </data>
-  <data name="SettingsPageLXMusicServer.Text" xml:space="preserve">
+  <data name="SettingsPageLXMusicServer.Header" xml:space="preserve">
    <value>LX 음악 서버</value>
  </data>
  <data name="SettingsPageLXMusicServerInput.PlaceholderText" xml:space="preserve">
@@ -1210,9 +1213,6 @@
  <data name="SettingsPageScrollTopDuration.Header" xml:space="preserve">
    <value>첫 번째 줄의 기간</value>
  </data>
-  <data name="SettingsPageServerAddress.Header" xml:space="preserve">
-    <value>서버 주소</value>
-  </data>
  <data name="SettingsPageServerTestButton.Content" xml:space="preserve">
    <value>테스트 서버</value>
  </data>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
@@ -571,6 +571,9 @@
  <data name="SettingsPageAlbumStyle.Text" xml:space="preserve">
    <value>专辑区域样式</value>
  </data>
+  <data name="SettingsPageAmllTtmlDbBaseUrl.Header" xml:space="preserve">
+    <value>基本 URL</value>
+  </data>
  <data name="SettingsPageAmount.Header" xml:space="preserve">
    <value>量</value>
  </data>
@@ -895,7 +898,7 @@
  <data name="SettingsPageLog.Header" xml:space="preserve">
    <value>日志记录</value>
  </data>
-  <data name="SettingsPageLXMusicServer.Text" xml:space="preserve">
+  <data name="SettingsPageLXMusicServer.Header" xml:space="preserve">
    <value>LX 音乐服务器</value>
  </data>
  <data name="SettingsPageLXMusicServerInput.PlaceholderText" xml:space="preserve">
@@ -1210,9 +1213,6 @@
  <data name="SettingsPageScrollTopDuration.Header" xml:space="preserve">
    <value>首行持续时间</value>
  </data>
-  <data name="SettingsPageServerAddress.Header" xml:space="preserve">
-    <value>服务器地址</value>
-  </data>
  <data name="SettingsPageServerTestButton.Content" xml:space="preserve">
    <value>测试服务器</value>
  </data>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
@@ -571,6 +571,9 @@
  <data name="SettingsPageAlbumStyle.Text" xml:space="preserve">
    <value>專輯區域樣式</value>
  </data>
+  <data name="SettingsPageAmllTtmlDbBaseUrl.Header" xml:space="preserve">
+    <value>基本網址</value>
+  </data>
  <data name="SettingsPageAmount.Header" xml:space="preserve">
    <value>量</value>
  </data>
@@ -895,7 +898,7 @@
  <data name="SettingsPageLog.Header" xml:space="preserve">
    <value>日誌記錄</value>
  </data>
-  <data name="SettingsPageLXMusicServer.Text" xml:space="preserve">
+  <data name="SettingsPageLXMusicServer.Header" xml:space="preserve">
    <value>LX 音樂服務器</value>
  </data>
  <data name="SettingsPageLXMusicServerInput.PlaceholderText" xml:space="preserve">
@@ -1210,9 +1213,6 @@
  <data name="SettingsPageScrollTopDuration.Header" xml:space="preserve">
    <value>首行持續時間</value>
  </data>
-  <data name="SettingsPageServerAddress.Header" xml:space="preserve">
-    <value>服務器地址</value>
-  </data>
  <data name="SettingsPageServerTestButton.Content" xml:space="preserve">
    <value>測試服務器</value>
  </data>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.cs
@@ -331,7 +331,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                int textLength = line.OriginalText.Length;
                if (textLength == 0) return;

-                if (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.IsForceWordByWordEffect)
+                if (_settingsService.AppSettings.GeneralSettings.IsForceWordByWordEffect)
                {
                    // 没有逐字时间轴，均匀分配每个字的高亮时间
                    double lineProgress = (now - line.StartMs) / (lineEndMs - line.StartMs);