修复输入弹幕时被快捷键影响；修复按住行为判断错误；

ywmoyue · Aug 11, 2024 · 661edbe · 661edbe
1 parent 86b2a69
commit 661edbe
Show file tree

Hide file tree

Showing 16 changed files with 48 additions and 16 deletions.
diff --git a/src/BiliLite.UWP/BiliLite.UWP.csproj b/src/BiliLite.UWP/BiliLite.UWP.csproj
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project ToolsVersion="15.0" DefaultTargets="Build"
+  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
+    Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -1559,10 +1561,12 @@
       <Name>Windows Desktop Extensions for the UWP</Name>
     </SDKReference>
   </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
+  <PropertyGroup
+    Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <Import
+    Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/src/BiliLite.UWP/Models/Functions/AddVolumeFunction.cs b/src/BiliLite.UWP/Models/Functions/AddVolumeFunction.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using BiliLite.Extensions;
 using BiliLite.Pages;
 
 namespace BiliLite.Models.Functions
@@ -10,6 +11,7 @@ public class AddVolumeFunction : BaseShortcutFunction
         public override async Task Action(object param)
         {
             if (!(param is IPlayPage page)) return;
+            if (ControlsExtensions.CheckFocusTextBoxNow()) return;
             page.AddVolume();
         }
     }

diff --git a/src/BiliLite.UWP/Models/Functions/CancelFullscreenFunction.cs b/src/BiliLite.UWP/Models/Functions/CancelFullscreenFunction.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using BiliLite.Extensions;
 using BiliLite.Pages;
 
 namespace BiliLite.Models.Functions
@@ -10,6 +11,7 @@ public class CancelFullscreenFunction : BaseShortcutFunction
         public override async Task Action(object param)
         {
             if (!(param is IPlayPage page)) return;
+            if (ControlsExtensions.CheckFocusTextBoxNow()) return;
             page.CancelFullscreen();
         }
     }

diff --git a/src/BiliLite.UWP/Models/Functions/CaptureVideoShortcutFunction.cs b/src/BiliLite.UWP/Models/Functions/CaptureVideoShortcutFunction.cs
@@ -1,4 +1,5 @@
-using BiliLite.Pages;
+using BiliLite.Extensions;
+using BiliLite.Pages;
 using System.Threading.Tasks;
 
 namespace BiliLite.Models.Functions
@@ -10,6 +11,7 @@ public class CaptureVideoShortcutFunction : BaseShortcutFunction
         public override async Task Action(object param)
         {
             if (!(param is IPlayPage page)) return;
+            if (ControlsExtensions.CheckFocusTextBoxNow()) return;
             await page.CaptureVideo();
         }
     }

diff --git a/src/BiliLite.UWP/Models/Functions/FastUpShortcutFunction.cs b/src/BiliLite.UWP/Models/Functions/FastUpShortcutFunction.cs
@@ -1,4 +1,5 @@
-using BiliLite.Pages;
+using BiliLite.Extensions;
+using BiliLite.Pages;
 using System.Threading.Tasks;
 
 namespace BiliLite.Models.Functions
@@ -10,6 +11,7 @@ public class FastUpShortcutFunction : BaseShortcutFunction
         public override async Task Action(object param)
         {
             if (!(param is PlayPage page)) return;
+            if (ControlsExtensions.CheckFocusTextBoxNow()) return;
             page.FastUp();
         }
     }

diff --git a/src/BiliLite.UWP/Models/Functions/GotoLastVideoFunction.cs b/src/BiliLite.UWP/Models/Functions/GotoLastVideoFunction.cs
@@ -1,4 +1,5 @@
-using BiliLite.Pages;
+using BiliLite.Extensions;
+using BiliLite.Pages;
 using System.Threading.Tasks;
 
 namespace BiliLite.Models.Functions
@@ -10,6 +11,7 @@ public class GotoLastVideoFunction : BaseShortcutFunction
         public override async Task Action(object param)
         {
             if (!(param is PlayPage page)) return;
+            if (ControlsExtensions.CheckFocusTextBoxNow()) return;
             page.GotoLastVideo();
         }
     }

diff --git a/src/BiliLite.UWP/Models/Functions/GotoNextVideoFunction.cs b/src/BiliLite.UWP/Models/Functions/GotoNextVideoFunction.cs
@@ -1,4 +1,5 @@
-using BiliLite.Pages;
+using BiliLite.Extensions;
+using BiliLite.Pages;
 using System.Threading.Tasks;
 
 namespace BiliLite.Models.Functions
@@ -10,6 +11,7 @@ public class GotoNextVideoFunction : BaseShortcutFunction
         public override async Task Action(object param)
         {
             if (!(param is PlayPage page)) return;
+            if (ControlsExtensions.CheckFocusTextBoxNow()) return;
             page.GotoNextVideo();
         }
     }

diff --git a/src/BiliLite.UWP/Models/Functions/HighRateSpeedPlayShortcutFunction.cs b/src/BiliLite.UWP/Models/Functions/HighRateSpeedPlayShortcutFunction.cs
@@ -1,4 +1,5 @@
-using BiliLite.Pages;
+using BiliLite.Extensions;
+using BiliLite.Pages;
 using System.Threading.Tasks;
 
 namespace BiliLite.Models.Functions
@@ -10,6 +11,7 @@ public class StartHighRateSpeedPlayShortcutFunction : BaseShortcutFunction
         public override async Task Action(object param)
         {
             if (!(param is PlayPage page)) return;
+            if (ControlsExtensions.CheckFocusTextBoxNow()) return;
             page.StartHighRateSpeedPlay();
         }
 

diff --git a/src/BiliLite.UWP/Models/Functions/LargePositionForwardShortcutFunction.cs b/src/BiliLite.UWP/Models/Functions/LargePositionForwardShortcutFunction.cs
@@ -1,4 +1,5 @@
-using BiliLite.Pages;
+using BiliLite.Extensions;
+using BiliLite.Pages;
 using System.Threading.Tasks;
 
 namespace BiliLite.Models.Functions
@@ -10,6 +11,7 @@ public class LargePositionForwardShortcutFunction : BaseShortcutFunction
         public override async Task Action(object param)
         {
             if (!(param is PlayPage page)) return;
+            if (ControlsExtensions.CheckFocusTextBoxNow()) return;
             page.PositionForward(90);
         }
     }

diff --git a/src/BiliLite.UWP/Models/Functions/MinusVolumeFunction.cs b/src/BiliLite.UWP/Models/Functions/MinusVolumeFunction.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using BiliLite.Extensions;
 using BiliLite.Pages;
 
 namespace BiliLite.Models.Functions
@@ -10,6 +11,7 @@ public class MinusVolumeFunction : BaseShortcutFunction
         public override async Task Action(object param)
         {
             if (!(param is IPlayPage page)) return;
+            if (ControlsExtensions.CheckFocusTextBoxNow()) return;
             page.MinusVolume();
         }
     }

diff --git a/src/BiliLite.UWP/Models/Functions/SlowDownShortcutFunction.cs b/src/BiliLite.UWP/Models/Functions/SlowDownShortcutFunction.cs
@@ -1,4 +1,5 @@
-using BiliLite.Pages;
+using BiliLite.Extensions;
+using BiliLite.Pages;
 using System.Threading.Tasks;
 
 namespace BiliLite.Models.Functions
@@ -10,6 +11,7 @@ public class SlowDownShortcutFunction : BaseShortcutFunction
         public override async Task Action(object param)
         {
             if (!(param is PlayPage page)) return;
+            if (ControlsExtensions.CheckFocusTextBoxNow()) return;
             page.SlowDown();
         }
     }

diff --git a/src/BiliLite.UWP/Models/Functions/ToggleDanmakuDisplayShortcutFunction.cs b/src/BiliLite.UWP/Models/Functions/ToggleDanmakuDisplayShortcutFunction.cs
@@ -1,4 +1,5 @@
-using BiliLite.Pages;
+using BiliLite.Extensions;
+using BiliLite.Pages;
 using System.Threading.Tasks;
 
 namespace BiliLite.Models.Functions
@@ -10,6 +11,7 @@ public class ToggleDanmakuDisplayShortcutFunction : BaseShortcutFunction
         public override async Task Action(object param)
         {
             if (!(param is IPlayPage page)) return;
+            if (ControlsExtensions.CheckFocusTextBoxNow()) return;
             page.ToggleDanmakuDisplay();
         }
     }

diff --git a/src/BiliLite.UWP/Models/Functions/ToggleFullWindowShortcutFunction.cs b/src/BiliLite.UWP/Models/Functions/ToggleFullWindowShortcutFunction.cs
@@ -1,4 +1,5 @@
-using BiliLite.Pages;
+using BiliLite.Extensions;
+using BiliLite.Pages;
 using System.Threading.Tasks;
 
 namespace BiliLite.Models.Functions
@@ -10,6 +11,7 @@ public class ToggleFullWindowShortcutFunction : BaseShortcutFunction
         public override async Task Action(object param)
         {
             if (!(param is IPlayPage page)) return;
+            if (ControlsExtensions.CheckFocusTextBoxNow()) return;
             page.ToggleFullWindow();
         }
     }

diff --git a/src/BiliLite.UWP/Models/Functions/ToggleMiniWindowShortcutFunction.cs b/src/BiliLite.UWP/Models/Functions/ToggleMiniWindowShortcutFunction.cs
@@ -1,4 +1,5 @@
-using BiliLite.Pages;
+using BiliLite.Extensions;
+using BiliLite.Pages;
 using System.Threading.Tasks;
 
 namespace BiliLite.Models.Functions
@@ -10,6 +11,7 @@ public class ToggleMiniWindowShortcutFunction : BaseShortcutFunction
         public override async Task Action(object param)
         {
             if (!(param is IPlayPage page)) return;
+            if (ControlsExtensions.CheckFocusTextBoxNow()) return;
             page.ToggleMiniWindows();
         }
     }

diff --git a/src/BiliLite.UWP/Models/Functions/ToggleMuteShortcutFunction.cs b/src/BiliLite.UWP/Models/Functions/ToggleMuteShortcutFunction.cs
@@ -1,4 +1,5 @@
-using BiliLite.Pages;
+using BiliLite.Extensions;
+using BiliLite.Pages;
 using System.Threading.Tasks;
 
 namespace BiliLite.Models.Functions
@@ -10,6 +11,7 @@ public class ToggleMuteShortcutFunction : BaseShortcutFunction
         public override async Task Action(object param)
         {
             if (!(param is PlayPage page)) return;
+            if (ControlsExtensions.CheckFocusTextBoxNow()) return;
             page.ToggleMute();
         }
     }

diff --git a/src/BiliLite.UWP/Services/ShortcutKeyService.cs b/src/BiliLite.UWP/Services/ShortcutKeyService.cs
@@ -94,9 +94,9 @@ public async void HandleKeyDown(VirtualKey virtualKey)
 
                 if (shortcutKeyFunction.ReleaseFunction != null)
                 {
-                    shortcutKeyFunction.Canceled = false;
                     if (!m_releaseMapsCache.Contains(shortcutKeyFunction))
                     {
+                        shortcutKeyFunction.Canceled = false;
                         m_releaseMapsCache.Add(shortcutKeyFunction);
                         {
                             try