Skip to content

Commit 270c443

Browse files
JiuLing-zhangJiuLing-zhang
committed
日志按照等级分类记录
1 parent aba3e33 commit 270c443

File tree

11 files changed

+103
-106
lines changed

11 files changed

+103
-106
lines changed

‎src/ComputerLock/Components/Settings/LockSettings.razor.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,26 +67,26 @@ public void RegisterLockHotkey()
6767
{
6868
if (AppSettings.LockHotkey != null)
6969
{
70-
Logger.Write("注册锁屏热键");
70+
Logger.Info("注册锁屏热键");
7171
HotkeyHook.Register((int)HotkeyType.Lock, AppSettings.LockHotkey);
7272
}
7373
}
7474
catch (Exception ex)
7575
{
76-
Logger.Write($"绑定锁屏热键失败：{ex.Message}。{ex.StackTrace}");
76+
Logger.Error($"绑定锁屏热键失败", ex);
7777
Snackbar.Add($"{Lang["ExRegistFailed"]}{ex.Message}", Severity.Error);
7878
}
7979
}
8080
public void UnregisterLockHotkey()
8181
{
8282
try
8383
{
84-
Logger.Write("释放锁屏热键");
84+
Logger.Info("释放锁屏热键");
8585
HotkeyHook.Unregister((int)HotkeyType.Lock);
8686
}
8787
catch (Exception ex)
8888
{
89-
Logger.Write($"释放锁屏热键失败：{ex.Message}。{ex.StackTrace}");
89+
Logger.Error($"释放锁屏热键失败", ex);
9090
//MessageBoxUtils.ShowError($"取消快捷键失败：{ex.Message}");
9191
}
9292
}

‎src/ComputerLock/Components/Settings/UnlockSettings.razor.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,26 +141,26 @@ public void RegisterUnlockHotkey()
141141
{
142142
if (AppSettings.UnlockHotkey != null)
143143
{
144-
Logger.Write("注册解锁热键");
144+
Logger.Info("注册解锁热键");
145145
HotkeyHook.Register((int)HotkeyType.Unlock, AppSettings.UnlockHotkey);
146146
}
147147
}
148148
catch (Exception ex)
149149
{
150-
Logger.Write($"绑定解锁热键失败：{ex.Message}。{ex.StackTrace}");
150+
Logger.Error($"绑定解锁热键失败", ex);
151151
Snackbar.Add($"{Lang["ExRegistFailed"]}{ex.Message}", Severity.Error);
152152
}
153153
}
154154
public void UnregisterUnlockHotkey()
155155
{
156156
try
157157
{
158-
Logger.Write("释放解锁热键");
158+
Logger.Info("释放解锁热键");
159159
HotkeyHook.Unregister((int)HotkeyType.Unlock);
160160
}
161161
catch (Exception ex)
162162
{
163-
Logger.Write($"释放解锁热键失败：{ex.Message}。{ex.StackTrace}");
163+
Logger.Error($"释放解锁热键失败", ex);
164164
//MessageBoxUtils.ShowError($"取消快捷键失败：{ex.Message}");
165165
}
166166
}

‎src/ComputerLock/ComputerLock.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<ItemGroup>
2020
<PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="8.2.4" />
2121
<PackageReference Include="JiuLing.AutoUpgrade" Version="2.3.0" />
22-
<PackageReference Include="JiuLing.CommonLibs" Version="1.7.6" />
22+
<PackageReference Include="JiuLing.CommonLibs" Version="1.7.7" />
2323
<PackageReference Include="JiuLing.TitleBarKit" Version="1.0.3" />
2424
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Wpf" Version="8.0.100" />
2525
<PackageReference Include="ModernWpfUI" Version="0.9.6" />

‎src/ComputerLock/Services/GlobalLockService.cs‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public GlobalLockService(ILogger logger, AppSettings appSettings, UserActivityMo
4949
InitActivityMonitor();
5050
InitUserInputHandling();
5151

52-
_logger.Write("空闲自动锁定 -> 准备监控系统会话状态");
52+
_logger.Info("空闲自动锁定 -> 准备监控系统会话状态");
5353
SystemEvents.SessionSwitch += SystemEvents_SessionSwitch;
5454
}
5555

@@ -60,7 +60,7 @@ private void InitActivityMonitor()
6060
{
6161
_activityMonitor.OnIdle += (_, _) =>
6262
{
63-
_logger.Write("空闲自动锁定 -> 执行空闲锁定");
63+
_logger.Info("空闲自动锁定 -> 执行空闲锁定");
6464
Lock();
6565
};
6666

@@ -73,7 +73,7 @@ private void InitUserInputHandling()
7373
{
7474
if (_appSettings.LockTips && IsLocked)
7575
{
76-
_logger.Write("用户输入 -> 检测到键盘输入");
76+
_logger.Info("用户输入 -> 检测到键盘输入");
7777
_popupService.ShowMessage(_lang["LockTipsValue"]);
7878
}
7979
};
@@ -82,7 +82,7 @@ private void InitUserInputHandling()
8282
{
8383
if (_appSettings.LockTips && IsLocked)
8484
{
85-
_logger.Write("用户输入 -> 检测到鼠标输入");
85+
_logger.Info("用户输入 -> 检测到鼠标输入");
8686
_popupService.ShowMessage(_lang["LockTipsValue"]);
8787
}
8888
};
@@ -95,13 +95,13 @@ private void SystemEvents_SessionSwitch(object sender, SessionSwitchEventArgs e)
9595
{
9696
if (e.Reason == SessionSwitchReason.SessionLock)
9797
{
98-
_logger.Write("系统 -> Windows 系统已锁定");
98+
_logger.Info("系统 -> Windows 系统已锁定");
9999
_isWindowsLocked = true;
100100
WindowsLock();
101101
}
102102
else if (e.Reason == SessionSwitchReason.SessionUnlock)
103103
{
104-
_logger.Write("系统 -> Windows 系统已解除锁定");
104+
_logger.Info("系统 -> Windows 系统已解除锁定");
105105
_isWindowsLocked = false;
106106
WindowsUnlock();
107107
}
@@ -116,15 +116,15 @@ private void WindowsLock()
116116
{
117117
if (!IsLocked)
118118
{
119-
_logger.Write("系统 -> Windows 系统锁定，暂停空闲检测");
119+
_logger.Info("系统 -> Windows 系统锁定，暂停空闲检测");
120120
_activityMonitor.StopMonitoring();
121121
}
122122
}
123123
else
124124
{
125125
if (IsLocked)
126126
{
127-
_logger.Write("系统 -> Windows 系统锁定，程序解锁");
127+
_logger.Info("系统 -> Windows 系统锁定，程序解锁");
128128
Unlock();
129129
}
130130
}
@@ -139,7 +139,7 @@ private void WindowsUnlock()
139139
{
140140
if (!IsLocked)
141141
{
142-
_logger.Write($"系统 -> Windows 系统解锁");
142+
_logger.Info($"系统 -> Windows 系统解锁");
143143
AutoLockStart();
144144
}
145145
}
@@ -149,12 +149,12 @@ private void AutoLockStart()
149149
{
150150
if (_isWindowsLocked && _appSettings.IsUnlockWhenWindowsLock)
151151
{
152-
_logger.Write($"系统 -> Windows 锁定状态，不启用空闲检测");
152+
_logger.Info($"系统 -> Windows 锁定状态，不启用空闲检测");
153153
}
154154

155155
if (_appSettings.AutoLockSecond > 0)
156156
{
157-
_logger.Write($"系统 -> 启动空闲检测，{_appSettings.AutoLockSecond} 秒");
157+
_logger.Info($"系统 -> 启动空闲检测，{_appSettings.AutoLockSecond} 秒");
158158
_activityMonitor.SetAutoLockSecond(_appSettings.AutoLockSecond);
159159
_activityMonitor.StartMonitoring();
160160
}
@@ -164,7 +164,7 @@ public void Lock()
164164
{
165165
if (_isWindowsLocked && _appSettings.IsUnlockWhenWindowsLock)
166166
{
167-
_logger.Write($"系统 -> Windows 锁定状态禁止程序锁定");
167+
_logger.Info($"系统 -> Windows 锁定状态禁止程序锁定");
168168
return;
169169
}
170170

@@ -178,7 +178,7 @@ public void Lock()
178178

179179
if (!_screenLockService.Lock(_appSettings.LockAnimation))
180180
{
181-
_logger.Write("全局锁定 -> 屏幕锁定失败");
181+
_logger.Info("全局锁定 -> 屏幕锁定失败");
182182
return;
183183
}
184184

@@ -187,24 +187,24 @@ public void Lock()
187187
_screenLockService.OnUnlock += _screenLockService_OnUnlock;
188188
}
189189

190-
_logger.Write("全局锁定 -> 暂停空闲检测");
190+
_logger.Info("全局锁定 -> 暂停空闲检测");
191191
_activityMonitor.StopMonitoring();
192192

193-
_logger.Write("全局锁定 -> 禁用任务管理器和系统键");
193+
_logger.Info("全局锁定 -> 禁用任务管理器和系统键");
194194
_taskManagerHook.DisabledTaskManager();
195195

196196
if (_appSettings.IsHideMouseCursor)
197197
{
198-
_logger.Write("全局锁定 -> 隐藏鼠标光标");
198+
_logger.Info("全局锁定 -> 隐藏鼠标光标");
199199
_mouseHook.HideCursor();
200200
}
201201

202-
_logger.Write("全局锁定 -> 启用鼠标钩子");
202+
_logger.Info("全局锁定 -> 启用鼠标钩子");
203203
_mouseHook.InstallHook();
204204

205205
if (_appSettings.ScreenUnlockMethod == ScreenUnlockMethods.Hotkey)
206206
{
207-
_logger.Write("全局锁定 -> 允许快捷键解锁，准备放行快捷键");
207+
_logger.Info("全局锁定 -> 允许快捷键解锁，准备放行快捷键");
208208
if (_appSettings.IsUnlockUseLockHotkey)
209209
{
210210
if (_appSettings.LockHotkey != null)
@@ -225,20 +225,20 @@ public void Lock()
225225
if (_appSettings.IsDisableWindowsLock)
226226
{
227227
_cts = new CancellationTokenSource();
228-
_logger.Write("全局锁定 -> 禁用 Windows 锁屏");
228+
_logger.Info("全局锁定 -> 禁用 Windows 锁屏");
229229
Task.Run(async () =>
230230
{
231231
while (true)
232232
{
233-
_logger.Write("全局锁定 -> 移动鼠标，防止 Windows 锁屏");
233+
_logger.Info("全局锁定 -> 移动鼠标，防止 Windows 锁屏");
234234
_mouseHook.MoveAndClick();
235235
try
236236
{
237237
await Task.Delay(TimeSpan.FromSeconds(55), _cts.Token);
238238
}
239239
catch (TaskCanceledException)
240240
{
241-
_logger.Write("全局锁定 -> 鼠标任务释放");
241+
_logger.Info("全局锁定 -> 鼠标任务释放");
242242
break;
243243
}
244244
}
@@ -247,30 +247,30 @@ public void Lock()
247247
if (_appSettings.AutoPowerSecond > 0)
248248
{
249249
_powerActionCts = new CancellationTokenSource();
250-
_logger.Write($"全局锁定 -> {_appSettings.AutoPowerSecond}秒后自动执行{_appSettings.AutoPowerActionType.GetDescription()}");
250+
_logger.Info($"全局锁定 -> {_appSettings.AutoPowerSecond}秒后自动执行{_appSettings.AutoPowerActionType.GetDescription()}");
251251
Task.Run(async () =>
252252
{
253253
try
254254
{
255255
await Task.Delay(TimeSpan.FromSeconds(_appSettings.AutoPowerSecond), _powerActionCts.Token);
256256
if (_appSettings.AutoPowerActionType == PowerActionType.Shutdown)
257257
{
258-
_logger.Write("准备执行关机");
258+
_logger.Info("准备执行关机");
259259
_powerManager.Shutdown();
260260
}
261261
else if (_appSettings.AutoPowerActionType == PowerActionType.Hibernate)
262262
{
263-
_logger.Write("准备执行休眠");
263+
_logger.Info("准备执行休眠");
264264
_powerManager.Hibernate();
265265
}
266266
}
267267
catch (TaskCanceledException)
268268
{
269-
_logger.Write("自动关机/休眠任务已取消");
269+
_logger.Info("自动关机/休眠任务已取消");
270270
}
271271
catch (Exception ex)
272272
{
273-
_logger.Write($"自动关机/休眠任务异常：{ex.Message}.{ex.StackTrace}");
273+
_logger.Error($"自动关机/休眠任务异常", ex);
274274
}
275275
}, _powerActionCts.Token);
276276
}
@@ -330,8 +330,7 @@ public void Unlock()
330330

331331
public void UpdateAutoLockSettings()
332332
{
333-
_logger.Write("系统 -> 更新自动锁定设置");
334-
_logger.Write("系统 -> 停止空闲检测");
333+
_logger.Info("系统 -> 更新自动锁定设置");
335334
_activityMonitor.StopMonitoring();
336335
AutoLockStart();
337336
}
@@ -349,12 +348,12 @@ private void SystemUnlock()
349348
{
350349
AutoLockStart();
351350

352-
_logger.Write("系统解锁 -> 恢复任务管理器和系统键");
351+
_logger.Info("系统解锁 -> 恢复任务管理器和系统键");
353352
_taskManagerHook.EnabledTaskManager();
354353

355354
if (_appSettings.IsHideMouseCursor)
356355
{
357-
_logger.Write("系统解锁 -> 恢复鼠标光标");
356+
_logger.Info("系统解锁 -> 恢复鼠标光标");
358357
_mouseHook.ResetCursorState();
359358
}
360359

‎src/ComputerLock/Services/HotkeyScreenLockService.cs‎

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

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

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

@@ -39,7 +39,7 @@ public override bool Lock(bool showAnimation)
3939
for (var i = 0; i <= Screen.AllScreens.Length - 1; i++)
4040
{
4141
var screen = Screen.AllScreens[i];
42-
logger.Write($"快捷键屏幕锁定 -> 准备屏幕{i}");
42+
logger.Info($"快捷键屏幕锁定 -> 准备屏幕{i}");
4343
var blankScreen = serviceProvider.GetRequiredService<WindowBlankScreen>();
4444
ShowWindowOnScreen(blankScreen, screen);
4545
_blankScreens.Add(blankScreen);
@@ -50,17 +50,17 @@ public override bool Lock(bool showAnimation)
5050

5151
public override void Unlock()
5252
{
53-
logger.Write("快捷键屏幕锁定 -> 准备解锁");
53+
logger.Info("快捷键屏幕锁定 -> 准备解锁");
5454
foreach (var screen in _blankScreens)
5555
{
56-
logger.Write("快捷键屏幕锁定 -> 释放空白屏幕资源");
56+
logger.Info("快捷键屏幕锁定 -> 释放空白屏幕资源");
5757
screen.Unlock();
5858
screen.Close();
5959
}
6060

6161
if (_showAnimation)
6262
{
63-
logger.Write("快捷键屏幕锁定 -> 解锁动画");
63+
logger.Info("快捷键屏幕锁定 -> 解锁动画");
6464
popupService.ShowMessage(lang["UnLocked"]);
6565
}
6666
}

0 commit comments

Comments
 (0)