由锁定服务释放密码屏幕

Author: JiuLing-zhang

src/ComputerLock/Services/GlobalLockService.cs

@@ -93,8 +93,11 @@ private void WindowsLock()
         }
         else
         {
-            _logger.Write("系统 -> Windows 系统锁定，程序解锁");
-            Unlock();
+            if (IsLocked)
+            {
+                _logger.Write("系统 -> Windows 系统锁定，程序解锁");
+                Unlock();
+            }
         }
     }
 
@@ -266,8 +269,7 @@ public void UpdateAutoLockSettings()
     private void _screenLockService_OnUnlock(object? sender, EventArgs e)
     {
         _screenLockService!.OnUnlock -= _screenLockService_OnUnlock;
-        SystemUnlock();
-        IsLocked = false;
+        Unlock();
     }
 
     /// <summary>

src/ComputerLock/Services/PasswordScreenLockService.cs

@@ -64,13 +64,10 @@ public override bool Lock(bool showAnimation)
     }
 
     public override void Unlock()
-    {
-        // 密码解锁时，没有显式调用解锁方法，而是通过事件触发解锁
-    }
-
-    private void FmLockScreen_OnUnlock(object? sender, EventArgs e)
     {
         logger.Write("密码屏幕锁定 -> 功能屏幕准备解锁");
+        _windowLockScreen!.Close();
+
         foreach (var screen in _blankScreens)
         {
             logger.Write("密码屏幕锁定 -> 释放空白屏幕资源");
@@ -84,7 +81,10 @@ private void FmLockScreen_OnUnlock(object? sender, EventArgs e)
             logger.Write("密码屏幕锁定 -> 解锁动画");
             ShowPopup(lang["UnLocked"]);
         }
+    }
 
+    private void FmLockScreen_OnUnlock(object? sender, EventArgs e)
+    {
         logger.Write("密码屏幕锁定 -> 通知解锁");
         OnUnlock?.Invoke(this, EventArgs.Empty);
     }

src/ComputerLock/WindowLockScreen.xaml.cs

@@ -148,7 +148,6 @@ private void TxtPassword_PasswordChanged(object sender, RoutedEventArgs e)
         }
         _logger.Write("功能屏幕 -> 密码正确，通知解锁");
         OnUnlock?.Invoke(this, EventArgs.Empty);
-        this.Close();
     }
 
     private void TxtPassword_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)