From fe2aa4880d5c9fd88088ad0ed81ebaca05629f5f Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期一, 02 十一月 2026 17:59:45 +0800
Subject: [PATCH] feat: 集成CAN驱动/模拟器 + 仪器仪表注册/硬件调试模块
---
HMI.ParameterManage/TestItem.xaml.cs | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/HMI.ParameterManage/TestItem.xaml.cs b/HMI.ParameterManage/TestItem.xaml.cs
index 96e0570..f6c1308 100644
--- a/HMI.ParameterManage/TestItem.xaml.cs
+++ b/HMI.ParameterManage/TestItem.xaml.cs
@@ -1,14 +1,13 @@
锘縰sing HMI.Base;
+using HMI.Core.Entity;
+using HMI.Core.Manager;
using HMI.Core.Util;
-using HMI.ParameterManage.Entity;
-using HMI.ParameterManage.Util;
using HMI.UI.Util;
using HMI.Util;
using Microsoft.Win32;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
-using System.IO;
using System.Linq;
using System.Windows;
@@ -52,17 +51,9 @@
bool isActivated;
public static string FileFolder { get; private set; }
- public override object Active()
+ public override void Active()
{
- if (!isActivated)
- {
- string folder = Path.Combine(ParameterManage.FileFolder, "TestItem");
- PathHelper.InitFolder(folder);
- base.SetBaseFolder(folder);
- FileFolder = folder;
- isActivated = true;
- }
- return null;
+
}
private void Button_Click(object sender, RoutedEventArgs e)
@@ -306,7 +297,7 @@
try
{
ObservableCollection<ProductData> products =
- ParameterManager.GetProducts<ObservableCollection<ProductData>>()
+ ProductManager.GetProducts<ObservableCollection<ProductData>>()
?? new ObservableCollection<ProductData>();
Products = products;
}
--
Gitblit v1.9.1