#35 锁屏时注册解锁热键、解锁时释放热键

JiuLing-zhang · JiuLing-zhang · commit c63d96cf44b6 · 2025-10-15T22:55:16.000+08:00
diff --git a/src/ComputerLock/Components/Settings/LockSettings.razor.cs b/src/ComputerLock/Components/Settings/LockSettings.razor.cs
@@ -47,6 +47,13 @@ private void AutoLockChanged(int autoLockMinute)
     }
     private Task SetLockHotkey(string hotkey)
     {
+        // 检查快捷键是否与解锁快捷键相同
+        if (hotkey.IsNotEmpty() && hotkey == AppSettings.UnlockHotkeyString)
+        {
+            Snackbar.Add(Lang["HotkeyDuplicateError"], Severity.Error);
+            return Task.CompletedTask;
+        }
+
         AppSettings.LockHotkeyString = hotkey;
         SaveSettings();
         RegisterLockHotkey();
diff --git a/src/ComputerLock/Components/Settings/UnlockSettings.razor.cs b/src/ComputerLock/Components/Settings/UnlockSettings.razor.cs
@@ -120,48 +120,25 @@ private void PwdBoxLocationChanged(ScreenLocationEnum location)
         SaveSettings();
     }
 
+    // ========= 热键的注册和注销交给锁定服务处理（仅当锁定时热键才生效）这里只保存设置 ============
     private Task SetUnlockHotkey(string hotkey)
     {
+        // 检查快捷键是否与锁屏快捷键相同
+        if (hotkey.IsNotEmpty() && hotkey == AppSettings.LockHotkeyString)
+        {
+            Snackbar.Add(Lang["HotkeyDuplicateError"], Severity.Error);
+            return Task.CompletedTask;
+        }
+
         AppSettings.UnlockHotkeyString = hotkey;
         SaveSettings();
-        RegisterUnlockHotkey();
         return Task.CompletedTask;
     }
     private Task ClearUnlockHotkey()
     {
         AppSettings.UnlockHotkeyString = "";
         SaveSettings();
-        UnregisterUnlockHotkey();
         return Task.CompletedTask;
     }
-
-    public void RegisterUnlockHotkey()
-    {
-        try
-        {
-            if (AppSettings.UnlockHotkey != null)
-            {
-                Logger.Info("注册解锁热键");
-                HotkeyHook.Register((int)HotkeyType.Unlock, AppSettings.UnlockHotkey);
-            }
-        }
-        catch (Exception ex)
-        {
-            Logger.Error($"绑定解锁热键失败", ex);
-            Snackbar.Add($"{Lang["ExRegistFailed"]}{ex.Message}", Severity.Error);
-        }
-    }
-    public void UnregisterUnlockHotkey()
-    {
-        try
-        {
-            Logger.Info("释放解锁热键");
-            HotkeyHook.Unregister((int)HotkeyType.Unlock);
-        }
-        catch (Exception ex)
-        {
-            Logger.Error($"释放解锁热键失败", ex);
-            //MessageBoxUtils.ShowError($"取消快捷键失败：{ex.Message}");
-        }
-    }
+    // ================================================================================
 }
diff --git a/src/ComputerLock/Platforms/HotkeyHook.cs b/src/ComputerLock/Platforms/HotkeyHook.cs
@@ -47,6 +47,7 @@ public void Register(int id, Hotkey hotKey)
         if (ids.Contains(id))
         {
             Unregister(id);
+            ids.Remove(id);
         }
 
         var success = WinApi.RegisterHotKey(_nativeWindow.Handle, id, (uint)hotKey.Modifiers, (uint)hotKey.Key);
@@ -64,6 +65,10 @@ public void Register(int id, Hotkey hotKey)
     public void Unregister(int id)
     {
         WinApi.UnregisterHotKey(_nativeWindow.Handle, id);
+        if (ids.Contains(id))
+        {
+            ids.Remove(id);
+        }
     }
 
     public void Dispose()
diff --git a/src/ComputerLock/Platforms/SystemKeyHook.cs b/src/ComputerLock/Platforms/SystemKeyHook.cs
@@ -23,28 +23,39 @@ protected override int HookCallback(int nCode, int wParam, IntPtr lParam)
         {
             int vkCode = Marshal.ReadInt32(lParam);
 
+            // 仅在按下阶段进行拦截判断；抬起阶段放行避免影响 WM_HOTKEY 触发
+            if (!(wParam == WinApi.WM_KEYDOWN || wParam == WinApi.WM_SYSKEYDOWN))
+            {
+                return WinApi.CallNextHookEx(_hookId, nCode, wParam, lParam);
+            }
+
             if (_ignoreHotkey == null)
             {
-                if (IsSystemKey(vkCode) && (wParam == WinApi.WM_KEYDOWN || wParam == WinApi.WM_SYSKEYDOWN))
+                if (IsSystemKey(vkCode))
                 {
                     OnUserInput?.Invoke(this, EventArgs.Empty);
                     return 1; // 阻止事件传递
                 }
                 return WinApi.CallNextHookEx(_hookId, nCode, wParam, lParam); // 其他按键放行
             }
 
-            if (!IsPartOfIgnoreHotkey(vkCode))
+            // 属于需要放行的热键组成部分（修饰键或主键）则放行
+            if (IsPartOfIgnoreHotkey(vkCode))
             {
-                if (IsModifierKey(vkCode) && !IsModifierRequired(vkCode))
-                {
-                    return 1; // 阻止事件传递
-                }
-                else if (vkCode != (int)_ignoreHotkey.Key)
-                {
-                    return 1; // 阻止事件传递
-                }
+                return WinApi.CallNextHookEx(_hookId, nCode, wParam, lParam);
+            }
+
+            // 拦截非必要修饰键
+            if (IsModifierKey(vkCode) && !IsModifierRequired(vkCode))
+            {
+                return 1; // 阻止事件传递
+            }
+
+            // 不是忽略热键
+            if (vkCode != (int)_ignoreHotkey.Key)
+            {
+                return 1; // 阻止事件传递
             }
-            return WinApi.CallNextHookEx(_hookId, nCode, wParam, lParam); // 放行
         }
         return WinApi.CallNextHookEx(_hookId, nCode, wParam, lParam);
     }
diff --git a/src/ComputerLock/Resources/Lang.en.resx b/src/ComputerLock/Resources/Lang.en.resx
@@ -432,4 +432,7 @@
   <data name="DisablePasswordBoxTips" xml:space="preserve">
 	  <value>Unlock method: Press [ESC] key or click with mouse to show password box</value>
   </data>
+  <data name="HotkeyDuplicateError" xml:space="preserve">
+	  <value>Lock screen hotkey and unlock hotkey cannot be the same</value>
+  </data>
 </root>
diff --git a/src/ComputerLock/Resources/Lang.resx b/src/ComputerLock/Resources/Lang.resx
@@ -432,4 +432,7 @@
   <data name="DisablePasswordBoxTips" xml:space="preserve">
 	  <value>当前解锁方式：按 [ESC] 键 或 鼠标点击密码框位置显示密码框</value>
   </data>
+  <data name="HotkeyDuplicateError" xml:space="preserve">
+	  <value>锁屏快捷键和解锁快捷键不能相同</value>
+  </data>
 </root>
diff --git a/src/ComputerLock/Resources/Lang.zh.resx b/src/ComputerLock/Resources/Lang.zh.resx
@@ -432,4 +432,7 @@
   <data name="DisablePasswordBoxTips" xml:space="preserve">
 	  <value>当前解锁方式：按 [ESC] 键 或 鼠标点击密码框位置显示密码框</value>
   </data>
+  <data name="HotkeyDuplicateError" xml:space="preserve">
+	  <value>锁屏快捷键和解锁快捷键不能相同</value>
+  </data>
 </root>
diff --git a/src/ComputerLock/Services/GlobalLockService.cs b/src/ComputerLock/Services/GlobalLockService.cs
@@ -215,6 +215,16 @@ public void Lock()
                 if (_appSettings.UnlockHotkey != null)
                 {
                     _systemKeyHook.SetIgnoreHotkey(_appSettings.UnlockHotkey);
+
+                    try
+                    {
+                        _logger.Info("全局锁定 -> 锁定时注册解锁快捷键");
+                        _hotkeyHook.Register((int)HotkeyType.Unlock, _appSettings.UnlockHotkey);
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.Error("注册解锁快捷键失败", ex);
+                    }
                 }
             }
         }
@@ -362,6 +372,19 @@ private void SystemUnlock()
         _mouseHook.Dispose();
         _systemKeyHook.Dispose();
 
+        // 释放解锁快捷键
+        if (_appSettings.UnlockHotkey != null)
+        {
+            try
+            {
+                _hotkeyHook.Unregister((int)HotkeyType.Unlock);
+            }
+            catch (Exception ex)
+            {
+                _logger.Error($"释放解锁热键失败", ex);
+            }
+        }
+
         if (_cts != null)
         {
             _cts.Cancel();
diff --git a/src/ComputerLock/Shared/MainLayout.razor.cs b/src/ComputerLock/Shared/MainLayout.razor.cs
@@ -148,10 +148,6 @@ private void InitializeEventBinding()
         {
             RegisterLockHotkey();
         }
-        if (AppSettings.UnlockHotkeyString.IsNotEmpty())
-        {
-            RegisterUnlockHotkey();
-        }
 
         HotkeyHook.HotkeyPressed += (id) =>
         {
@@ -214,21 +210,4 @@ public void RegisterLockHotkey()
             Snackbar.Add($"{Lang["ExRegistFailed"]}{ex.Message}", Severity.Error);
         }
     }
-
-    public void RegisterUnlockHotkey()
-    {
-        try
-        {
-            if (AppSettings.UnlockHotkey != null)
-            {
-                Logger.Info("注册解锁热键");
-                HotkeyHook.Register((int)HotkeyType.Unlock, AppSettings.UnlockHotkey);
-            }
-        }
-        catch (Exception ex)
-        {
-            Logger.Error($"绑定解锁热键失败", ex);
-            Snackbar.Add($"{Lang["ExRegistFailed"]}{ex.Message}", Severity.Error);
-        }
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,13 @@ private void AutoLockChanged(int autoLockMinute)`
`47`	`47`	`}`
`48`	`48`	`private Task SetLockHotkey(string hotkey)`
`49`	`49`	`{`
	`50`	`+ // 检查快捷键是否与解锁快捷键相同`
	`51`	`+ if (hotkey.IsNotEmpty() && hotkey == AppSettings.UnlockHotkeyString)`
	`52`	`+ {`
	`53`	`+ Snackbar.Add(Lang["HotkeyDuplicateError"], Severity.Error);`
	`54`	`+ return Task.CompletedTask;`
	`55`	`+ }`
	`56`	`+`
`50`	`57`	`AppSettings.LockHotkeyString = hotkey;`
`51`	`58`	`SaveSettings();`
`52`	`59`	`RegisterLockHotkey();`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ public void Register(int id, Hotkey hotKey)`
`47`	`47`	`if (ids.Contains(id))`
`48`	`48`	`{`
`49`	`49`	`Unregister(id);`
	`50`	`+ ids.Remove(id);`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`var success = WinApi.RegisterHotKey(_nativeWindow.Handle, id, (uint)hotKey.Modifiers, (uint)hotKey.Key);`
`@@ -64,6 +65,10 @@ public void Register(int id, Hotkey hotKey)`
`64`	`65`	`public void Unregister(int id)`
`65`	`66`	`{`
`66`	`67`	`WinApi.UnregisterHotKey(_nativeWindow.Handle, id);`
	`68`	`+ if (ids.Contains(id))`
	`69`	`+ {`
	`70`	`+ ids.Remove(id);`
	`71`	`+ }`
`67`	`72`	`}`
`68`	`73`
`69`	`74`	`public void Dispose()`
Original file line number	Diff line number	Diff line change
`@@ -23,28 +23,39 @@ protected override int HookCallback(int nCode, int wParam, IntPtr lParam)`
`23`	`23`	`{`
`24`	`24`	`int vkCode = Marshal.ReadInt32(lParam);`
`25`	`25`
	`26`	`+ // 仅在按下阶段进行拦截判断；抬起阶段放行避免影响 WM_HOTKEY 触发`
	`27`	`+ if (!(wParam == WinApi.WM_KEYDOWN \|\| wParam == WinApi.WM_SYSKEYDOWN))`
	`28`	`+ {`
	`29`	`+ return WinApi.CallNextHookEx(_hookId, nCode, wParam, lParam);`
	`30`	`+ }`
	`31`	`+`
`26`	`32`	`if (_ignoreHotkey == null)`
`27`	`33`	`{`
`28`		`- if (IsSystemKey(vkCode) && (wParam == WinApi.WM_KEYDOWN \|\| wParam == WinApi.WM_SYSKEYDOWN))`
	`34`	`+ if (IsSystemKey(vkCode))`
`29`	`35`	`{`
`30`	`36`	`OnUserInput?.Invoke(this, EventArgs.Empty);`
`31`	`37`	`return 1; // 阻止事件传递`
`32`	`38`	`}`
`33`	`39`	`return WinApi.CallNextHookEx(_hookId, nCode, wParam, lParam); // 其他按键放行`
`34`	`40`	`}`
`35`	`41`
`36`		`- if (!IsPartOfIgnoreHotkey(vkCode))`
	`42`	`+ // 属于需要放行的热键组成部分（修饰键或主键）则放行`
	`43`	`+ if (IsPartOfIgnoreHotkey(vkCode))`
`37`	`44`	`{`
`38`		`- if (IsModifierKey(vkCode) && !IsModifierRequired(vkCode))`
`39`		`- {`
`40`		`- return 1; // 阻止事件传递`
`41`		`- }`
`42`		`- else if (vkCode != (int)_ignoreHotkey.Key)`
`43`		`- {`
`44`		`- return 1; // 阻止事件传递`
`45`		`- }`
	`45`	`+ return WinApi.CallNextHookEx(_hookId, nCode, wParam, lParam);`
	`46`	`+ }`
	`47`	`+`
	`48`	`+ // 拦截非必要修饰键`
	`49`	`+ if (IsModifierKey(vkCode) && !IsModifierRequired(vkCode))`
	`50`	`+ {`
	`51`	`+ return 1; // 阻止事件传递`
	`52`	`+ }`
	`53`	`+`
	`54`	`+ // 不是忽略热键`
	`55`	`+ if (vkCode != (int)_ignoreHotkey.Key)`
	`56`	`+ {`
	`57`	`+ return 1; // 阻止事件传递`
`46`	`58`	`}`
`47`		`- return WinApi.CallNextHookEx(_hookId, nCode, wParam, lParam); // 放行`
`48`	`59`	`}`
`49`	`60`	`return WinApi.CallNextHookEx(_hookId, nCode, wParam, lParam);`
`50`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,10 +148,6 @@ private void InitializeEventBinding()`
`148`	`148`	`{`
`149`	`149`	`RegisterLockHotkey();`
`150`	`150`	`}`
`151`		`- if (AppSettings.UnlockHotkeyString.IsNotEmpty())`
`152`		`- {`
`153`		`- RegisterUnlockHotkey();`
`154`		`- }`
`155`	`151`
`156`	`152`	`HotkeyHook.HotkeyPressed += (id) =>`
`157`	`153`	`{`
`@@ -214,21 +210,4 @@ public void RegisterLockHotkey()`
`214`	`210`	`Snackbar.Add($"{Lang["ExRegistFailed"]}{ex.Message}", Severity.Error);`
`215`	`211`	`}`
`216`	`212`	`}`
`217`		`-`
`218`		`- public void RegisterUnlockHotkey()`
`219`		`- {`
`220`		`- try`
`221`		`- {`
`222`		`- if (AppSettings.UnlockHotkey != null)`
`223`		`- {`
`224`		`- Logger.Info("注册解锁热键");`
`225`		`- HotkeyHook.Register((int)HotkeyType.Unlock, AppSettings.UnlockHotkey);`
`226`		`- }`
`227`		`- }`
`228`		`- catch (Exception ex)`
`229`		`- {`
`230`		`- Logger.Error($"绑定解锁热键失败", ex);`
`231`		`- Snackbar.Add($"{Lang["ExRegistFailed"]}{ex.Message}", Severity.Error);`
`232`		`- }`
`233`		`- }`
`234`	`213`	`}`