rename

Author: JiuLing-zhang

src/ComputerLock/App.xaml.cs

@@ -3,6 +3,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using MudBlazor.Services;
 using System.Windows;
+using ComputerLock.Interfaces;
 using ComputerLock.Update;
 using MudExtensions.Services;
 using Application = System.Windows.Application;
@@ -49,11 +50,11 @@ private void Init()
         services.AddSingleton<WindowMain>();
         services.AddTransient<WindowLockScreen>();
         services.AddTransient<WindowBlankScreen>();
-        services.AddSingleton<LockService>();
+        services.AddSingleton<ScreenLockService>();
         services.AddSingleton<SystemKeyHook>();
         services.AddSingleton<IWindowMoving, WindowMoving>();
         services.AddSingleton<IWindowTitleBar, WindowTitleBar>();
-        services.AddSingleton<ILocker, Locker>();
+        services.AddSingleton<IGlobalLockService, GlobalLockService>();
         services.AddLocalization();
         services.AddWpfBlazorWebView();
         services.AddBlazorWebViewDeveloperTools();

src/ComputerLock/Interfaces/IGlobalLockService.cs

@@ -1,9 +1,9 @@
-namespace ComputerLock.Platforms;
+namespace ComputerLock.Interfaces;
 
 /// <summary>
 /// 锁定器接口，全局锁定：包括鼠标、键盘、任务管理器、系统快捷键等
 /// </summary>
-public interface ILocker : IDisposable
+public interface IGlobalLockService : IDisposable
 {
     void Lock();
 }

src/ComputerLock/Pages/Index.razor.cs

@@ -1,4 +1,5 @@
-using ComputerLock.Update;
+using ComputerLock.Interfaces;
+using ComputerLock.Update;
 
 namespace ComputerLock.Pages;
 public partial class Index
@@ -22,7 +23,7 @@ public partial class Index
     private UpdateHelper UpdateHelper { get; set; } = default!;
 
     [Inject]
-    private ILocker Locker { get; set; } = default!;
+    private IGlobalLockService GlobalLockService { get; set; } = default!;
 
     [Inject]
     private HotKeyHook HotKeyHook { get; set; } = default!;
@@ -50,7 +51,7 @@ protected override async Task OnInitializedAsync()
         HotKeyHook.HotKeyPressed += () =>
         {
             Logger.Write("快捷键解锁");
-            Locker.Lock();
+            GlobalLockService.Lock();
         };
 
         if (AppSettings.IsAutoCheckUpdate)

src/ComputerLock/Services/GlobalLockService.cs

@@ -1,27 +1,28 @@
-using Microsoft.Win32;
+using ComputerLock.Interfaces;
+using Microsoft.Win32;
 
-namespace ComputerLock.Platforms;
+namespace ComputerLock.Services;
 
 /// <summary>
 /// 锁定器，全局锁定：包括鼠标、键盘、任务管理器、系统快捷键等
 /// </summary>
-internal class Locker : ILocker
+internal class GlobalLockService : IGlobalLockService
 {
     private readonly ILogger _logger;
     private readonly AppSettings _appSettings;
-    private readonly LockService _lockService;
+    private readonly ScreenLockService _screenLockService;
     private UserActivityMonitor? _activityMonitor;
     private readonly HotKeyHook _hotKeyHook;
     private readonly TaskManagerHook _taskManagerHook;
     private readonly MouseHook _mouseHook;
     private readonly SystemKeyHook _systemKeyHook;
 
-    public Locker(ILogger logger, AppSettings appSettings, UserActivityMonitor activityMonitor, LockService lockService, HotKeyHook hotKeyHook, TaskManagerHook taskManagerHook, MouseHook mouseHook, SystemKeyHook systemKeyHook)
+    public GlobalLockService(ILogger logger, AppSettings appSettings, UserActivityMonitor activityMonitor, ScreenLockService screenLockService, HotKeyHook hotKeyHook, TaskManagerHook taskManagerHook, MouseHook mouseHook, SystemKeyHook systemKeyHook)
     {
         _logger = logger;
         _appSettings = appSettings;
-        _lockService = lockService;
-        _lockService.OnUnlock += (_, _) => OnUnlock();
+        _screenLockService = screenLockService;
+        _screenLockService.OnUnlock += (_, _) => OnUnlock();
 
         InitActivityMonitor(activityMonitor);
         _hotKeyHook = hotKeyHook;
@@ -74,7 +75,7 @@ private void InitActivityMonitor(UserActivityMonitor userActivityMonitor)
 
     public void Lock()
     {
-        _lockService.Lock();
+        _screenLockService.Lock();
 
         _logger.Write("自动锁定 -> 暂停空闲检测");
         _activityMonitor?.StopMonitoring();

src/ComputerLock/Services/ScreenLockService.cs

@@ -8,7 +8,7 @@ namespace ComputerLock.Services;
 /// <summary>
 /// 负责屏幕窗口的锁定和解锁
 /// </summary>
-internal class LockService(
+internal class ScreenLockService(
     IServiceProvider serviceProvider,
     IStringLocalizer<Lang> lang,
     AppSettings appSettings,

src/ComputerLock/WindowMain.xaml.cs

@@ -1,22 +1,23 @@
 using System.IO;
 using System.Windows;
+using ComputerLock.Interfaces;
 
 namespace ComputerLock;
 public partial class WindowMain : Window, IDisposable
 {
     private readonly AppSettings _appSettings;
-    private readonly ILocker _locker;
+    private readonly IGlobalLockService _globalLockService;
     private readonly ILogger _logger;
 
     private readonly NotifyIcon _notifyIcon = new();
     private readonly ContextMenuStrip _contextMenuStrip = new();
 
-    public WindowMain(AppSettings appSettings, ILocker locker, ILogger logger)
+    public WindowMain(AppSettings appSettings, IGlobalLockService globalLockService, ILogger logger)
     {
         InitializeComponent();
 
         _appSettings = appSettings;
-        _locker = locker;
+        _globalLockService = globalLockService;
         _logger = logger;
 
         InitializeNotifyIcon();
@@ -25,7 +26,7 @@ public WindowMain(AppSettings appSettings, ILocker locker, ILogger logger)
         if (_appSettings.LockOnStartup)
         {
             _logger.Write("程序启动时锁定屏幕");
-            _locker.Lock();
+            _globalLockService.Lock();
         }
     }
 
@@ -46,7 +47,7 @@ private void InitializeNotifyIcon()
         btnLock.Click += (_, _) =>
         {
             _logger.Write("托盘锁定");
-            _locker.Lock();
+            _globalLockService.Lock();
         };
         _contextMenuStrip.Items.Add(btnLock);
 
@@ -109,6 +110,6 @@ public void Dispose()
     {
         _logger.Write("系统资源释放，系统关闭");
         _notifyIcon.Dispose();
-        _locker.Dispose();
+        _globalLockService.Dispose();
     }
 }