Skip to content

Commit cd7a20b

Browse files
JiuLing-zhangJiuLing-zhang
committed
调整日志
1 parent dc85de8 commit cd7a20b

File tree

5 files changed

+60
-62
lines changed

5 files changed

+60
-62
lines changed

‎src/ComputerLock/Services/GlobalLockService.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,27 +51,27 @@ private void InitActivityMonitor(UserActivityMonitor userActivityMonitor)
5151
}
5252
_activityMonitor = userActivityMonitor;
5353

54-
_logger.Write("自动锁定已生效");
54+
_logger.Write("空闲自动锁定已生效");
5555
_activityMonitor.Init(_appSettings.AutoLockSecond);
5656
_activityMonitor.OnIdle += (_, _) =>
5757
{
58-
_logger.Write("自动锁定 -> 锁定");
58+
_logger.Write("空闲自动锁定 -> 执行空闲锁定");
5959
Lock();
6060
};
61-
_logger.Write("自动锁定 -> 启动空闲检测");
61+
_logger.Write("空闲自动锁定 -> 启动空闲检测");
6262
_activityMonitor.StartMonitoring();
6363

64-
_logger.Write("自动锁定 -> 准备监控系统会话状态");
64+
_logger.Write("空闲自动锁定 -> 准备监控系统会话状态");
6565
SystemEvents.SessionSwitch += (_, e) =>
6666
{
6767
if (e.Reason == SessionSwitchReason.SessionLock)
6868
{
69-
_logger.Write("Windows系统锁定 -> 暂停空闲检测");
69+
_logger.Write("空闲自动锁定 -> Windows系统锁定，暂停空闲检测");
7070
_activityMonitor.StopMonitoring();
7171
}
7272
else if (e.Reason == SessionSwitchReason.SessionUnlock)
7373
{
74-
_logger.Write("Windows系统解锁 -> 启动空闲检测");
74+
_logger.Write("空闲自动锁定 -> Windows系统解锁，恢复空闲检测");
7575
_activityMonitor.StartMonitoring();
7676
}
7777
};
@@ -83,7 +83,7 @@ public void Lock()
8383

8484
if (!_screenLockService.Lock(_appSettings.LockAnimation))
8585
{
86-
_logger.Write("自动锁定 -> 屏幕锁定失败");
86+
_logger.Write("全局锁定 -> 屏幕锁定失败");
8787
return;
8888
}
8989

@@ -92,21 +92,21 @@ public void Lock()
9292
_screenLockService.OnUnlock += _screenLockService_OnUnlock;
9393
}
9494

95-
_logger.Write("自动锁定 -> 暂停空闲检测");
95+
_logger.Write("全局锁定 -> 暂停空闲检测");
9696
_activityMonitor?.StopMonitoring();
9797

98-
_logger.Write("锁定服务 -> 禁用任务管理器和系统键");
98+
_logger.Write("全局锁定 -> 禁用任务管理器和系统键");
9999
_taskManagerHook.DisabledTaskManager();
100100

101101
if (_appSettings.IsHideMouseCursor)
102102
{
103-
_logger.Write("锁定服务 -> 隐藏鼠标光标");
103+
_logger.Write("全局锁定 -> 隐藏鼠标光标");
104104
_mouseHook.HideCursor();
105105
}
106106

107107
if (_appSettings.ScreenUnlockMethod == ScreenUnlockMethods.Hotkey)
108108
{
109-
_logger.Write("锁定服务 -> 允许快捷键解锁 -> 准备处理热键");
109+
_logger.Write("全局锁定 -> 允许快捷键解锁，准备放行快捷键");
110110
if (_appSettings.IsUnlockUseLockHotkey)
111111
{
112112
if (_appSettings.LockHotkey != null)
@@ -148,15 +148,15 @@ private void _screenLockService_OnUnlock(object? sender, EventArgs e)
148148
/// </summary>
149149
private void SystemUnlock()
150150
{
151-
_logger.Write("自动锁定 -> 启动空闲检测");
151+
_logger.Write("系统锁定 -> 启动空闲检测");
152152
_activityMonitor?.StartMonitoring();
153153

154-
_logger.Write("锁定服务 -> 恢复任务管理器和系统键");
154+
_logger.Write("系统锁定 -> 恢复任务管理器和系统键");
155155
_taskManagerHook.EnabledTaskManager();
156156

157157
if (_appSettings.IsHideMouseCursor)
158158
{
159-
_logger.Write("锁定服务 -> 恢复鼠标光标");
159+
_logger.Write("系统锁定 -> 恢复鼠标光标");
160160
_mouseHook.ResetCursorState();
161161
}
162162

‎src/ComputerLock/Services/HotkeyScreenLockService.cs‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,32 @@ internal class HotkeyScreenLockService(
1414
public override bool Lock(bool showAnimation)
1515
{
1616
_showAnimation = showAnimation;
17-
logger.Write("锁定服务 -> 准备锁定");
17+
logger.Write("快捷键屏幕锁定 -> 准备锁定");
1818
var primaryScreen = Screen.PrimaryScreen;
1919
if (primaryScreen == null)
2020
{
21-
logger.Write("锁定服务 -> 没有检测到屏幕");
21+
logger.Write("快捷键屏幕锁定 -> 没有检测到屏幕");
2222
return false;
2323
}
2424

2525
if (_showAnimation)
2626
{
27-
logger.Write("锁定服务 -> 锁定动画");
27+
logger.Write("快捷键屏幕锁定 -> 锁定动画");
2828
ShowPopup(lang["Locked"]);
2929
}
3030

3131
if (_blankScreens.Count > 0)
3232
{
33+
logger.Write("快捷键屏幕锁定 -> 准备初始化屏幕");
3334
_blankScreens.Clear();
3435
}
3536

36-
logger.Write("锁定服务 -> 准备主屏幕");
3737
Application.Current.Dispatcher.Invoke(() =>
3838
{
39-
logger.Write("锁定服务 -> 激活主屏幕");
40-
4139
for (var i = 0; i <= Screen.AllScreens.Length - 1; i++)
4240
{
4341
var screen = Screen.AllScreens[i];
44-
logger.Write($"锁定服务 -> 准备副屏幕{i}");
42+
logger.Write($"快捷键屏幕锁定 -> 准备屏幕{i}");
4543
var blankScreen = serviceProvider.GetRequiredService<WindowBlankScreen>();
4644
ShowWindowOnScreen(blankScreen, screen);
4745
_blankScreens.Add(blankScreen);
@@ -52,17 +50,17 @@ public override bool Lock(bool showAnimation)
5250

5351
public override void Unlock()
5452
{
55-
logger.Write("锁定服务 -> 准备解锁");
53+
logger.Write("快捷键屏幕锁定 -> 准备解锁");
5654
foreach (var screen in _blankScreens)
5755
{
58-
logger.Write("锁定服务 -> 释放副屏幕资源");
56+
logger.Write("快捷键屏幕锁定 -> 释放副屏幕资源");
5957
screen.Unlock();
6058
screen.Close();
6159
}
6260

6361
if (_showAnimation)
6462
{
65-
logger.Write("锁定服务 -> 解锁动画");
63+
logger.Write("快捷键屏幕锁定 -> 解锁动画");
6664
ShowPopup(lang["UnLocked"]);
6765
}
6866
}

‎src/ComputerLock/Services/PasswordScreenLockService.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,26 @@ internal class PasswordScreenLockService(IServiceProvider serviceProvider, IStri
1414
public override bool Lock(bool showAnimation)
1515
{
1616
_showAnimation = showAnimation;
17-
logger.Write("锁定服务 -> 准备锁定");
17+
logger.Write("密码屏幕锁定 -> 准备锁定");
1818
var primaryScreen = Screen.PrimaryScreen;
1919
if (primaryScreen == null)
2020
{
21-
logger.Write("锁定服务 -> 没有检测到屏幕");
21+
logger.Write("密码屏幕锁定 -> 没有检测到屏幕");
2222
return false;
2323
}
2424

2525
if (_showAnimation)
2626
{
27-
logger.Write("锁定服务 -> 锁定动画");
27+
logger.Write("密码屏幕锁定 -> 锁定动画");
2828
ShowPopup(lang["Locked"]);
2929
}
3030

3131
if (_blankScreens.Count > 0)
3232
{
33+
logger.Write("密码屏幕锁定 -> 准备处理副屏");
3334
_blankScreens.Clear();
3435
}
3536

36-
logger.Write("锁定服务 -> 准备主屏幕");
3737
Application.Current.Dispatcher.Invoke(() =>
3838
{
3939
_windowLockScreen = serviceProvider.GetRequiredService<WindowLockScreen>();
@@ -42,20 +42,20 @@ public override bool Lock(bool showAnimation)
4242
{
4343
_windowLockScreen.OnUnlock -= FmLockScreen_OnUnlock;
4444
};
45+
logger.Write("密码屏幕锁定 -> 激活主屏幕");
4546
ShowWindowOnScreen(_windowLockScreen, primaryScreen);
4647

47-
logger.Write("锁定服务 -> 激活主屏幕");
48-
4948
for (var i = 0; i <= Screen.AllScreens.Length - 1; i++)
5049
{
5150
var screen = Screen.AllScreens[i];
5251
if (screen.Primary)
5352
{
5453
continue;
5554
}
56-
logger.Write($"锁定服务 -> 准备副屏幕{i}");
55+
logger.Write($"密码屏幕锁定 -> 准备副屏幕{i}");
5756
var blankScreen = serviceProvider.GetRequiredService<WindowBlankScreen>();
5857
blankScreen.OnDeviceInput += BlankScreen_OnDeviceInput;
58+
logger.Write($"密码屏幕锁定 -> 激活副屏幕{i}");
5959
ShowWindowOnScreen(blankScreen, screen);
6060
_blankScreens.Add(blankScreen);
6161
}
@@ -70,27 +70,27 @@ public override void Unlock()
7070

7171
private void FmLockScreen_OnUnlock(object? sender, EventArgs e)
7272
{
73-
logger.Write("锁定服务 -> 准备解锁");
73+
logger.Write("密码屏幕锁定 -> 主屏幕准备解锁");
7474
foreach (var screen in _blankScreens)
7575
{
76-
logger.Write("锁定服务 -> 释放副屏幕资源");
76+
logger.Write("密码屏幕锁定 -> 释放副屏幕资源");
7777
screen.OnDeviceInput -= BlankScreen_OnDeviceInput;
7878
screen.Unlock();
7979
screen.Close();
8080
}
8181

8282
if (_showAnimation)
8383
{
84-
logger.Write("锁定服务 -> 解锁动画");
84+
logger.Write("密码屏幕锁定 -> 解锁动画");
8585
ShowPopup(lang["UnLocked"]);
8686
}
8787

88-
logger.Write("锁定服务 -> 通知解锁");
88+
logger.Write("密码屏幕锁定 -> 通知解锁");
8989
OnUnlock?.Invoke(this, EventArgs.Empty);
9090
}
9191
private void BlankScreen_OnDeviceInput(object? sender, EventArgs e)
9292
{
93-
logger.Write("锁定服务 -> 收到副屏解锁通知");
93+
logger.Write("密码屏幕锁定 -> 收到副屏解锁通知");
9494
_windowLockScreen?.ShowPassword();
9595
}
9696
}

‎src/ComputerLock/WindowBlankScreen.xaml.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,39 +22,39 @@ public WindowBlankScreen(AppSettings appSettings, ILogger logger)
2222

2323
private void Window_Loaded(object sender, RoutedEventArgs e)
2424
{
25-
_logger.Write("副屏幕 -> 准备锁定");
25+
_logger.Write("空白屏幕 -> 准备锁定");
2626
}
2727

2828
private void Window_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
2929
{
30-
_logger.Write("副屏幕 -> 检测到按键");
30+
_logger.Write($"空白屏幕 -> 检测到按键 {e.Key}");
3131
if (e.Key != Key.Escape)
3232
{
3333
return;
3434
}
35-
_logger.Write("副屏幕 -> 按下ESC功能键");
35+
_logger.Write("空白屏幕 -> 按下ESC功能键");
3636
if (_appSettings.EnablePasswordBox)
3737
{
38-
_logger.Write("副屏幕 -> 密码框显示已启用");
38+
_logger.Write("空白屏幕 -> 密码框显示已启用");
3939
if ((_appSettings.PasswordBoxActiveMethod & PasswordBoxActiveMethodEnum.KeyboardDown) != PasswordBoxActiveMethodEnum.KeyboardDown)
4040
{
4141
return;
4242
}
4343
}
44-
_logger.Write("副屏幕 -> 准备通知解锁");
44+
_logger.Write("空白屏幕 -> 通知设备输入");
4545
OnDeviceInput?.Invoke(this, EventArgs.Empty);
4646
}
4747
private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
4848
{
49-
_logger.Write($"副屏幕 -> 准备关闭，当前解锁状态：{_isUnlock}");
49+
_logger.Write($"空白屏幕 -> 准备关闭，当前解锁状态：{_isUnlock}");
5050
if (!_isUnlock)
5151
{
5252
e.Cancel = true;
5353
}
5454
}
5555
public void Unlock()
5656
{
57-
_logger.Write($"副屏幕 -> 解锁");
57+
_logger.Write($"空白屏幕 -> 解锁");
5858
_isUnlock = true;
5959
}
6060
}

0 commit comments

Comments
 (0)