TyroneGit/CapMachine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

现场增加日志功能

Browse Source
This commit is contained in:
Tyrone CT
2026-05-14 10:41:23 +08:00
parent e954988fb5
commit 4cdda056b4
1 changed files with 83 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
CapMachine.Wpf/ViewModels/CANConfigViewModel.cs
View File

@@ -39,9 +39,9 @@ namespace CapMachine.Wpf.ViewModels
IEventAggregator eventAggregator, IRegionManager regionManager, SysRunService sysRunService,
ComActionService actionService,
ConfigService configService, CanDriveService canDriveService,
IMapper mapper, MachineRtDataService machineRtDataService)
IMapper mapper, MachineRtDataService machineRtDataService, ILogService logService)
{
//LogService = logService;
LogService = logService;
FreeSql = freeSql;
EventAggregator = eventAggregator;
RegionManager = regionManager;
@@ -52,7 +52,6 @@ namespace CapMachine.Wpf.ViewModels
Mapper = mapper;
this.MachineRtDataService = machineRtDataService;
//MachineDataService = machineDataService;
DialogService = dialogService;
WriteNameCbxItems = new ObservableCollection<CbxItems>()
@@ -89,6 +88,7 @@ namespace CapMachine.Wpf.ViewModels
public CanDriveService CanDriveService { get; }
public IMapper Mapper { get; }
private MachineRtDataService MachineRtDataService { get; }
public ILogService LogService { get; }
/// <summary>
/// 弹窗服务
@@ -104,6 +104,9 @@ namespace CapMachine.Wpf.ViewModels
/// </summary>
private void InitLoadCanConfigPro()
{
try
{
LogService.Info("开始加载CAN配置数据");
//CAN配置集合数据
canLinConfigPros = FreeSql.Select<CanLinConfigPro>().Where(a => a.CANLINInfo == CANLIN.CAN)
.Include(a => a.CANConfigExd)
@@ -136,13 +139,6 @@ namespace CapMachine.Wpf.ViewModels
SignalName = item.SignalName,
SignalCmdValue = double.TryParse(item.DefautValue, out double result) == true ? result : 0,
});
//CanDriveService.CmdData.Add(new CanCmdData()
//{
// ConfigName = item.Name,
// MsgName = item.MsgFrameName,
// SignalName = item.SignalName,
// SignalCmdValue = double.TryParse(item.DefautValue, out double result) == true ? result : 0,
//});
}
}
var ReadData = SelectCanLinConfigPro.CanLinConfigContents!.Where(a => a.RWInfo == RW.Read).ToList();
@@ -154,6 +150,13 @@ namespace CapMachine.Wpf.ViewModels
//匹配选中的SelectCanLinConfigPro.CanLinConfigContents和ListCanDbcModel
MatchSeletedAndCanDbcModel();
}
LogService.Info("CAN配置数据加载成功");
}
catch (Exception ex)
{
LogService.Error($"加载CAN配置数据失败: {ex.Message}\r\n堆栈: {ex.StackTrace}");
System.Windows.MessageBox.Show($"加载CAN配置数据失败: {ex.Message}", "错误", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Error);
}
}
/// <summary>
@@ -373,7 +376,9 @@ namespace CapMachine.Wpf.ViewModels
}
break;
case "Active":
try
{
LogService.Info("开始执行CAN配置激活操作");
//激活到取消的状态的判断
if (IsCanConfigProActive == true)
{
@@ -382,6 +387,7 @@ namespace CapMachine.Wpf.ViewModels
//控件的激活配置信息
IsCANConfigDatagridActive = !IsCanConfigProActive;
LogService.Info("CAN配置已取消激活");
return;
}
@@ -398,6 +404,7 @@ namespace CapMachine.Wpf.ViewModels
CanDriveService.InitCanConfig(SelectCanLinConfigPro);
InitLoadCanConfigPro();
LogService.Info($"CAN配置激活成功: {SelectCanLinConfigPro.ConfigName}");
}
else
{
@@ -409,6 +416,15 @@ namespace CapMachine.Wpf.ViewModels
{
System.Windows.MessageBox.Show("请确保CAN连接打开和Dbc解析成功后再激活", "提示", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Hand);
}
}
catch (Exception ex)
{
LogService.Error($"CAN配置激活操作失败: {ex.Message}\r\n堆栈: {ex.StackTrace}");
System.Windows.MessageBox.Show($"CAN配置激活操作失败: {ex.Message}", "错误", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Error);
//恢复状态
IsCanConfigProActive = false;
IsCANConfigDatagridActive = true;
}
break;
default:
break;