从小幻影视迁移功能 (#1157)

Author: Richasy

src/.editorconfig

@@ -1,4 +1,4 @@
-# 如果要从更高级别的目录继承 .editorconfig 设置，请删除以下行
+# 如果要从更高级别的目录继承 .editorconfig 设置，请删除以下行
 root = true
 
 # c# 文件
@@ -484,6 +484,9 @@ dotnet_diagnostic.CA1030.severity = none
 # IL2067: Target parameter argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The parameter of method does not have matching annotations.
 dotnet_diagnostic.IL2067.severity = none
 
+# VSTHRD002: Avoid problematic synchronous waits
+dotnet_diagnostic.VSTHRD002.severity = none
+
 [*.{cs,vb}]
 dotnet_style_qualification_for_field = false:silent
 dotnet_style_qualification_for_property = false:silent

src/Desktop/BiliCopilot.UI/BiliCopilot.UI.csproj

@@ -225,6 +225,7 @@
     <None Remove="Controls\Settings\PlayerControlSettingControl.xaml" />
     <None Remove="Controls\Settings\PromptTemplateSettingControl.xaml" />
     <None Remove="Controls\Settings\ScreenshotSettingControl.xaml" />
+    <None Remove="Controls\Settings\ScrollSettingControl.xaml" />
     <None Remove="Controls\Settings\SearchRecommendSettingSection.xaml" />
     <None Remove="Controls\Settings\ThemeSettingControl.xaml" />
     <None Remove="Controls\Users\FansBody.xaml" />
@@ -1159,6 +1160,9 @@
     <None Update="Assets\basic-mpv.conf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <Page Update="Controls\Settings\ScrollSettingControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Update="Controls\Danmaku\DanmakuSendDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>

src/Desktop/BiliCopilot.UI/BiliCopilot.UI.csproj.user

@@ -18,6 +18,9 @@
     <None Update="App.xaml">
       <SubType>Designer</SubType>
     </None>
+    <Page Update="Controls\Settings\ScrollSettingControl.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="Controls\Danmaku\DanmakuSendDialog.xaml">
       <SubType>Designer</SubType>
     </Page>

src/Desktop/BiliCopilot.UI/Controls/Core/OverlayTransportControls.xaml

@@ -532,7 +532,7 @@
                 RequestedTheme="Dark"
                 Style="{StaticResource CaptionTextBlockStyle}"
                 Text="{x:Bind GetTimeText(ViewModel.Player.Position), Mode=OneWay}"
-                Visibility="{x:Bind ViewModel.IsProgressChanging, Mode=OneWay, Converter={StaticResource BoolToVisibilityReverseConverter}}" />
+                Visibility="{x:Bind ViewModel.IsPreviewProgressChanging, Mode=OneWay, Converter={StaticResource BoolToVisibilityReverseConverter}}" />
             <TextBlock
                 HorizontalAlignment="Right"
                 VerticalAlignment="Center"
@@ -541,7 +541,7 @@
                 RequestedTheme="Dark"
                 Style="{StaticResource CaptionTextBlockStyle}"
                 Text="{x:Bind GetTimeText(ViewModel.PreviewPosition), Mode=OneWay}"
-                Visibility="{x:Bind ViewModel.IsProgressChanging, Mode=OneWay}" />
+                Visibility="{x:Bind ViewModel.IsPreviewProgressChanging, Mode=OneWay}" />
             <local:CacheBar
                 Grid.Column="1"
                 Height="4"

src/Desktop/BiliCopilot.UI/Controls/Core/PlayerInteractivePanel.xaml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <local:PlayerControlBase
     x:Class="BiliCopilot.UI.Controls.Core.PlayerInteractivePanel"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -64,5 +64,21 @@
             HorizontalAlignment="Stretch"
             VerticalAlignment="Stretch"
             Fill="Transparent" />
+
+        <Border Visibility="{x:Bind ViewModel.Player.IsCompactOverlay, Mode=OneWay, Converter={StaticResource BoolToVisibilityReverseConverter}}">
+            <Border Visibility="{x:Bind ViewModel.IsControlsVisible, Mode=OneWay}">
+                <Button
+                    Margin="0,0,16,0"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Center"
+                    AutomationProperties.Name="{ext:Locale Name=ShowMenu}"
+                    Click="OnMenuButtonClick"
+                    Style="{StaticResource SidePlayerButtonStyle}"
+                    ToolTipService.ToolTip="{ext:Locale Name=ShowMenu}"
+                    Visibility="{x:Bind ViewModel.IsTouchControlsVisible, Mode=OneWay}">
+                    <ic:FluentIcon FontSize="14" Icon="HandPoint" />
+                </Button>
+            </Border>
+        </Border>
     </Grid>
 </local:PlayerControlBase>

src/Desktop/BiliCopilot.UI/Controls/Core/PlayerInteractivePanel.xaml.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Bili Copilot. All rights reserved.
+// Copyright (c) Bili Copilot. All rights reserved.
 
 using BiliCopilot.UI.Toolkits;
 using Microsoft.UI.Dispatching;
@@ -21,8 +21,6 @@ public sealed partial class PlayerInteractivePanel : PlayerControlBase
     private bool _isLeftButton;
     private bool _isRightButton;
     private bool _isHolding;
-    private readonly HashSet<uint> _activeTouchPointers = [];
-    private int _lastTouchPointerCount;
 
     public PlayerInteractivePanel()
     {
@@ -89,12 +87,6 @@ protected override void OnPointerPressed(PointerRoutedEventArgs e)
         var width = ActualWidth;
         var sideWidth = Math.Max(80, width / 5d);
 
-        if (point.PointerDeviceType == Microsoft.UI.Input.PointerDeviceType.Touch)
-        {
-            _activeTouchPointers.Add(point.PointerId);
-            _lastTouchPointerCount = _activeTouchPointers.Count;
-        }
-
         if (point.Position.X > width - sideWidth)
         {
             _interactiveArea = InteractiveArea.Aside;
@@ -161,11 +153,6 @@ protected override void OnPointerMoved(PointerRoutedEventArgs e)
     /// <inheritdoc/>
     protected override void OnPointerReleased(PointerRoutedEventArgs e)
     {
-        if (e.Pointer.PointerDeviceType == Microsoft.UI.Input.PointerDeviceType.Touch)
-        {
-            _activeTouchPointers.Remove(e.Pointer.PointerId);
-        }
-
         if (PointerCaptures?.Any(p => p.PointerId == e.Pointer.PointerId) != true)
         {
             return;
@@ -212,14 +199,6 @@ protected override void OnPointerReleased(PointerRoutedEventArgs e)
         e.Handled = true;
     }
 
-    protected override void OnPointerCanceled(PointerRoutedEventArgs e)
-    {
-        if (e.Pointer.PointerDeviceType == Microsoft.UI.Input.PointerDeviceType.Touch)
-        {
-            _activeTouchPointers.Remove(e.Pointer.PointerId);
-        }
-    }
-
     private void OnTempControlTimerTick(DispatcherQueueTimer sender, object args)
     {
         if (ViewModel == null)
@@ -282,17 +261,8 @@ private async void OnTapTimerTick(object? sender, object? e)
         {
             if (_isTouch)
             {
-                if (_lastTouchPointerCount == 2)
-                {
-                    FlyoutBase.GetAttachedFlyout(this).ShowAt(this, new FlyoutShowOptions
-                    {
-                        Position = _startPoint,
-                    });
-                }
-                else
-                {
-                    ViewModel.IsControlsVisible = !ViewModel.IsControlsVisible;
-                }
+                ViewModel.IsControlsVisible = !ViewModel.IsControlsVisible;
+                ViewModel.IsTouchControlsVisible = !ViewModel.IsTouchControlsVisible;
             }
             else if (_isLeftButton)
             {
@@ -433,4 +403,15 @@ private void OnFlyoutClosed(object sender, object e)
     {
         ViewModel.IsPopupVisible = false;
     }
+
+    private void OnMenuButtonClick(object sender, RoutedEventArgs e)
+    {
+        var btn = sender as FrameworkElement;
+        var point = btn!.TransformToVisual(this).TransformPoint(new Point(0, 0));
+        FlyoutBase.GetAttachedFlyout(this).ShowAt(this, new FlyoutShowOptions
+        {
+            Position = point,
+            Placement = FlyoutPlacementMode.Right,
+        });
+    }
 }

src/Desktop/BiliCopilot.UI/Controls/Core/PlayerOverlay.xaml

@@ -680,7 +680,7 @@
                             HorizontalAlignment="Stretch"
                             IsEnabled="{x:Bind ViewModel.IsSubtitleEnabled, Mode=OneWay}"
                             ItemsSource="{x:Bind ViewModel.Fonts, Mode=OneWay}"
-                            SelectedItem="{x:Bind ViewModel.SubtitleFontFamily, Mode=OneWay}"
+                            Loaded="OnSubtitleFontComboLoaded"
                             SelectionChanged="OnSubtitleFontChanged"
                             SelectionChangedTrigger="Committed" />
                         <TextBlock

src/Desktop/BiliCopilot.UI/Controls/Core/PlayerOverlay.xaml.cs

@@ -1,10 +1,11 @@
-// Copyright (c) Bili Copilot. All rights reserved.
+// Copyright (c) Bili Copilot. All rights reserved.
 
 using BiliCopilot.UI.ViewModels.Items;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml.Input;
 using Richasy.MpvKernel.Core.Enums;
 using Richasy.WinUIKernel.Share.Base;
+using Richasy.WinUIKernel.Share.Toolkits;
 using System.ComponentModel;
 
 namespace BiliCopilot.UI.Controls.Core;
@@ -276,13 +277,13 @@ private string GetSpeedText(double speed)
 
     private void OnSubtitleFontChanged(object sender, SelectionChangedEventArgs e)
     {
-        var item = e.AddedItems.FirstOrDefault() as string;
-        if (ViewModel?.Player == null || ViewModel.Player?.IsPlaybackInitialized != true || string.IsNullOrEmpty(item) || ViewModel.SubtitleFontFamily == item)
+        var item = e.AddedItems.FirstOrDefault() as SystemFont;
+        if (ViewModel?.Player == null || ViewModel.Player?.IsPlaybackInitialized != true || item == null || ViewModel.SubtitleFontFamily == item.LocalName)
         {
             return;
         }
 
-        ViewModel.ChangeSubtitleFontFamilyCommand.Execute(item);
+        ViewModel.ChangeSubtitleFontFamilyCommand.Execute(item.LocalName);
     }
 
     private void OnSubtitleDelayChanged(NumberBox sender, NumberBoxValueChangedEventArgs args)
@@ -322,4 +323,14 @@ private void OnSourceItemClick(object sender, RoutedEventArgs e)
         selectedSource?.ActiveCommand.Execute(default);
         SourceFlyout?.Hide();
     }
+
+    private void OnSubtitleFontComboLoaded(object sender, RoutedEventArgs e)
+    {
+        var font = ViewModel.SubtitleFontFamily;
+        var source = ViewModel.Fonts.FirstOrDefault(p => p.LocalName == font);
+        if (source != null)
+        {
+            SubtitleFontComboBox.SelectedItem = source;
+        }
+    }
 }

src/Desktop/BiliCopilot.UI/Controls/Danmaku/DanmakuDisplayOptions.xaml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <local:DanmakuControlBase
     x:Class="BiliCopilot.UI.Controls.Danmaku.DanmakuDisplayOptions"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -62,7 +62,7 @@
             HorizontalAlignment="Stretch"
             Header="{ext:Locale Name=DanmakuFont}"
             ItemsSource="{x:Bind ViewModel.Fonts, Mode=OneWay}"
-            SelectedItem="{x:Bind ViewModel.DanmakuFontFamily, Mode=TwoWay}" />
+            SelectionChanged="OnDanmakuFontChanged" />
         <StackPanel Spacing="8">
             <TextBlock HorizontalAlignment="Left" Text="{ext:Locale Name=EnabledDanmakuMode}" />
             <Grid

src/Desktop/BiliCopilot.UI/Controls/Danmaku/DanmakuDisplayOptions.xaml.cs

@@ -2,6 +2,7 @@
 
 using BiliCopilot.UI.Models.Constants;
 using BiliCopilot.UI.Toolkits;
+using Richasy.WinUIKernel.Share.Toolkits;
 
 namespace BiliCopilot.UI.Controls.Danmaku;
 
@@ -16,6 +17,7 @@ protected override void OnControlLoaded()
     {
         var renderer = SettingsToolkit.ReadLocalSetting(Models.Constants.SettingNames.DanmakuRenderer, DanmakuRendererType.Win2D);
         RendererComboBox.SelectedIndex = renderer == DanmakuRendererType.DirectX ? 0 : 1;
+        DanmakuFontComboBox.SelectedItem = ViewModel.Fonts.FirstOrDefault(p => p.LocalName == ViewModel.DanmakuFontFamily);
     }
 
     private void OnRendererChanged(object sender, SelectionChangedEventArgs e)
@@ -32,4 +34,13 @@ private void OnRendererChanged(object sender, SelectionChangedEventArgs e)
             ViewModel.Renderer = renderer;
         }
     }
+
+    private void OnDanmakuFontChanged(object sender, SelectionChangedEventArgs e)
+    {
+        var item = DanmakuFontComboBox.SelectedItem as SystemFont;
+        if (item != null && ViewModel.DanmakuFontFamily != item.LocalName)
+        {
+            ViewModel.DanmakuFontFamily = item.LocalName;
+        }
+    }
 }