From 661edbefd56284af6844b539a76a452aac5efcac Mon Sep 17 00:00:00 2001
From: ywmoyue <ywmoyue@163.com>
Date: Sun, 11 Aug 2024 20:25:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BE=93=E5=85=A5=E5=BC=B9?=
 =?UTF-8?q?=E5=B9=95=E6=97=B6=E8=A2=AB=E5=BF=AB=E6=8D=B7=E9=94=AE=E5=BD=B1?=
 =?UTF-8?q?=E5=93=8D=EF=BC=9B=E4=BF=AE=E5=A4=8D=E6=8C=89=E4=BD=8F=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=BA=E5=88=A4=E6=96=AD=E9=94=99=E8=AF=AF=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BiliLite.UWP/BiliLite.UWP.csproj                 | 12 ++++++++----
 .../Models/Functions/AddVolumeFunction.cs            |  2 ++
 .../Models/Functions/CancelFullscreenFunction.cs     |  2 ++
 .../Models/Functions/CaptureVideoShortcutFunction.cs |  4 +++-
 .../Models/Functions/FastUpShortcutFunction.cs       |  4 +++-
 .../Models/Functions/GotoLastVideoFunction.cs        |  4 +++-
 .../Models/Functions/GotoNextVideoFunction.cs        |  4 +++-
 .../Functions/HighRateSpeedPlayShortcutFunction.cs   |  4 +++-
 .../LargePositionForwardShortcutFunction.cs          |  4 +++-
 .../Models/Functions/MinusVolumeFunction.cs          |  2 ++
 .../Models/Functions/SlowDownShortcutFunction.cs     |  4 +++-
 .../ToggleDanmakuDisplayShortcutFunction.cs          |  4 +++-
 .../Functions/ToggleFullWindowShortcutFunction.cs    |  4 +++-
 .../Functions/ToggleMiniWindowShortcutFunction.cs    |  4 +++-
 .../Models/Functions/ToggleMuteShortcutFunction.cs   |  4 +++-
 src/BiliLite.UWP/Services/ShortcutKeyService.cs      |  2 +-
 16 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/src/BiliLite.UWP/BiliLite.UWP.csproj b/src/BiliLite.UWP/BiliLite.UWP.csproj
index 9051ec03e..82d0171c6 100644
--- 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
index 2530c114a..55070c09a 100644
--- 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
index ade38a2e5..66f86fa6f 100644
--- 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
index e7025248f..2aa27863d 100644
--- 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
index 5c9d36bc5..24496dac7 100644
--- 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
index ddcec2178..a5b8125cb 100644
--- 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
index 6bfce7e0e..4cd2f03e5 100644
--- 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
index 61a1c8bad..f75d8e287 100644
--- 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
index a03eb64eb..1140e14a6 100644
--- 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
index 35bb8c6ae..795953e1f 100644
--- 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
index 222effa0f..c8050a17a 100644
--- 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
index 018f1c115..c0a3a53d1 100644
--- 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
index 3425c543d..92fe3e2cd 100644
--- 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
index 1ab1dd67f..5519dda68 100644
--- 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
index 9c78eac65..4b572de62 100644
--- 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
index 1a9092e48..7931052a2 100644
--- 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