huangsucan/ADP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log日志bug修改

Browse Source
This commit is contained in:
hsc
2026-06-24 10:18:54 +08:00
parent c4470af013
commit 4deb785135
16 changed files with 169 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
TestingModule/ViewModels/CommandTreeViewModel.cs
View File

@@ -210,7 +210,7 @@ namespace TestingModule.ViewModels
}
catch (Exception ex)
{
LoggerHelper.WarnWithNotify($"无法加载程序集 {Path.GetFileName(dllPath)}: {ex.Message}");
LoggerHelper.WarnWithNotify(_globalInfo.CurrentScope, $"无法加载程序集 {Path.GetFileName(dllPath)}: {ex.Message}");
}
}
}
@@ -237,7 +237,7 @@ namespace TestingModule.ViewModels
}
catch (Exception ex)
{
LoggerHelper.WarnWithNotify($"加载子程序错误: {filePath} - {ex.Message}");
LoggerHelper.WarnWithNotify(_globalInfo.CurrentScope, $"加载子程序错误: {filePath} - {ex.Message}");
}
}
}
@@ -317,7 +317,7 @@ namespace TestingModule.ViewModels
}
catch (Exception ex)
{
LoggerHelper.ErrorWithNotify($"加载类型错误: {assembly.FullName} - {ex.Message}");
LoggerHelper.ErrorWithNotify(_globalInfo.CurrentScope, $"加载类型错误: {assembly.FullName} - {ex.Message}");
}
if (validTypes.Count > 0)
@@ -504,7 +504,7 @@ namespace TestingModule.ViewModels
}
catch (Exception ex)
{
LoggerHelper.ErrorWithNotify($"添加方法失败: {method.Name} - {ex.Message}");
LoggerHelper.ErrorWithNotify(_globalInfo.CurrentScope, $"添加方法失败: {method.Name} - {ex.Message}");
}
}
@@ -537,7 +537,7 @@ namespace TestingModule.ViewModels
}
catch (Exception ex)
{
LoggerHelper.ErrorWithNotify($"添加子程序失败: {subProgram.Name} - {ex.Message}");
LoggerHelper.ErrorWithNotify(_globalInfo.CurrentScope, $"添加子程序失败: {subProgram.Name} - {ex.Message}"); ;
}
}

41
TestingModule/ViewModels/LogAreaViewModel.cs
View File

@@ -1,18 +1,20 @@
using UIShare.GlobalVariable;
using Logger;
using Prism.Ioc;
using Prism.Mvvm;
using System;
using System.Collections.ObjectModel;
using System.Reflection;
using System.Windows;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Threading;
using UIShare.ViewModelBase;
namespace TestingModule.ViewModels
{
public class LogAreaViewModel : NavigateViewModelBase, IDisposable
{
// 日志集合
private ObservableCollection<LogItem> _logs = new();
@@ -23,20 +25,23 @@ namespace TestingModule.ViewModels
}
public ICommand ClearLogCommand { get; set; }
private readonly ScopedContext _scopedContext;
private readonly GlobalInfo _globalInfo;
private IProgress<(string Message, Brush Color, int Depth)>? _logProgress;
public LogAreaViewModel(IContainerProvider containerProvider) : base(containerProvider)
{
ClearLogCommand = new DelegateCommand(ClearLog);
_scopedContext = containerProvider.Resolve<ScopedContext>();
_globalInfo = containerProvider.Resolve<GlobalInfo>();
// 2. 保持原有逻辑，但请确保在 Dispose 中对其进行清理
LoggerHelper.Progress = new System.Progress<(string message, string color, int depth)>(
log =>
{
// 增加防御性代码：防止进入销毁流程时异步回调引发空引用异常
if (Logs == null) return;
var brush = (Brush)new BrushConverter().ConvertFromString(log.color);
Logs.Add(new LogItem(log.message, brush, log.depth));
});
// 创建本作用域专属的日志接收器并注册到 ScopedContext
_logProgress = new Progress<(string Message, Brush Color, int Depth)>(log =>
{
if (Logs == null) return;
Logs.Add(new LogItem(log.Message, log.Color, log.Depth));
});
_scopedContext.LogProgress = _logProgress;
}
private void ClearLog()
@@ -51,16 +56,22 @@ namespace TestingModule.ViewModels
{
try
{
LoggerHelper.Progress = null!;
// 注销本作用域的日志接收器，避免 Dispose 后仍收到旧消息
if (_scopedContext != null && _scopedContext.LogProgress == _logProgress)
{
_scopedContext.LogProgress = null;
}
_logProgress = null;
if (Logs != null)
{
Logs.Clear();
Logs = null!;
Logs = null!;
}
}
catch (Exception ex)
{
Logger.LoggerHelper.ErrorWithNotify($"释放日志组件（LogAreaViewModel）资源失败: {ex.Message}");
Logger.LoggerHelper.ErrorWithNotify(_scopedContext != null ? _globalInfo.CurrentScope : "", $"释放日志组件（LogAreaViewModel）资源失败: {ex.Message}");
}
}
}

2
TestingModule/ViewModels/ParametersManagerViewModel.cs
View File

@@ -175,7 +175,7 @@ namespace TestingModule.ViewModels
}
catch (Exception ex)
{
LoggerHelper.ErrorWithNotify($"打开设备编辑窗口 [{type}] 失败：{ex.Message}");
LoggerHelper.ErrorWithNotify(_globalInfo.CurrentScope, $"打开设备编辑窗口 [{type}] 失败：{ex.Message}");
}
}

4
TestingModule/ViewModels/SingleStepEditViewModel.cs
View File

@@ -47,6 +47,7 @@ namespace TestingModule.ViewModels
}
#endregion
private ScopedContext _ScopedContext;
private GlobalInfo _globalInfo;
#region 命令
public ICommand CancelEditCommand { get; set; }
public ICommand SaveStepCommand { get; set; }
@@ -54,6 +55,7 @@ namespace TestingModule.ViewModels
public SingleStepEditViewModel(IContainerProvider containerProvider, ScopedContext scopedContext) : base(containerProvider)
{
_ScopedContext = scopedContext;
_globalInfo=containerProvider.Resolve<GlobalInfo>();
_eventAggregator.GetEvent<EditSetpEvent>().Subscribe(EditSingleStep);
CancelEditCommand = new DelegateCommand(CancelEdit);
SaveStepCommand = new DelegateCommand(SaveStep);
@@ -100,7 +102,7 @@ namespace TestingModule.ViewModels
}
catch
{
LoggerHelper.ErrorWithNotify("循环指令参数设置错误：类型转换失败");
LoggerHelper.ErrorWithNotify(_globalInfo.CurrentScope,"循环指令参数设置错误：类型转换失败");
}
}
else