Merge pull request 'master' (#2) from master into main

Reviewed-on: #2

.editorconfig

@@ -2,3 +2,117 @@
 
 # CA1416: 验证平台兼容性
 dotnet_diagnostic.CA1416.severity = silent
+
+[*.cs]
+#### 命名样式 ####
+
+# 命名规则
+
+dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
+dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
+dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
+
+dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.types_should_be_pascal_case.symbols = types
+dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+
+# 符号规范
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.types.required_modifiers = 
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_field_members.required_modifiers = 
+
+# 命名样式
+
+dotnet_naming_style.begins_with_i.required_prefix = I
+dotnet_naming_style.begins_with_i.required_suffix = 
+dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.capitalization = pascal_case
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+csharp_using_directive_placement = outside_namespace:silent
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_accessors = true:silent
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = false:silent
+csharp_style_conditional_delegate_call = true:suggestion
+csharp_style_var_for_built_in_types = false:silent
+
+[*.vb]
+#### 命名样式 ####
+
+# 命名规则
+
+dotnet_naming_rule.interface_should_be_以_i_开始.severity = suggestion
+dotnet_naming_rule.interface_should_be_以_i_开始.symbols = interface
+dotnet_naming_rule.interface_should_be_以_i_开始.style = 以_i_开始
+
+dotnet_naming_rule.类型_should_be_帕斯卡拼写法.severity = suggestion
+dotnet_naming_rule.类型_should_be_帕斯卡拼写法.symbols = 类型
+dotnet_naming_rule.类型_should_be_帕斯卡拼写法.style = 帕斯卡拼写法
+
+dotnet_naming_rule.非字段成员_should_be_帕斯卡拼写法.severity = suggestion
+dotnet_naming_rule.非字段成员_should_be_帕斯卡拼写法.symbols = 非字段成员
+dotnet_naming_rule.非字段成员_should_be_帕斯卡拼写法.style = 帕斯卡拼写法
+
+# 符号规范
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.类型.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.类型.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
+dotnet_naming_symbols.类型.required_modifiers = 
+
+dotnet_naming_symbols.非字段成员.applicable_kinds = property, event, method
+dotnet_naming_symbols.非字段成员.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
+dotnet_naming_symbols.非字段成员.required_modifiers = 
+
+# 命名样式
+
+dotnet_naming_style.以_i_开始.required_prefix = I
+dotnet_naming_style.以_i_开始.required_suffix = 
+dotnet_naming_style.以_i_开始.word_separator = 
+dotnet_naming_style.以_i_开始.capitalization = pascal_case
+
+dotnet_naming_style.帕斯卡拼写法.required_prefix = 
+dotnet_naming_style.帕斯卡拼写法.required_suffix = 
+dotnet_naming_style.帕斯卡拼写法.word_separator = 
+dotnet_naming_style.帕斯卡拼写法.capitalization = pascal_case
+
+dotnet_naming_style.帕斯卡拼写法.required_prefix = 
+dotnet_naming_style.帕斯卡拼写法.required_suffix = 
+dotnet_naming_style.帕斯卡拼写法.word_separator = 
+dotnet_naming_style.帕斯卡拼写法.capitalization = pascal_case
+
+[*.{cs,vb}]
+dotnet_style_qualification_for_field = false:silent
+dotnet_style_qualification_for_property = false:silent
+dotnet_style_qualification_for_method = false:silent
+dotnet_style_qualification_for_event = false:silent
+end_of_line = crlf

BDU.sln

@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.14.36221.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ATS", "ATS\ATS.csproj", "{000A2999-6535-43D3-94DA-EE372D19702F}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Common\Common.csproj", "{AEA71207-A57F-424A-9AA0-9AC9A4B681F1}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeviceCommand", "DeviceCommand\DeviceCommand.csproj", "{13E7EF22-4595-D29C-1E97-91B321696C07}"
@@ -22,16 +20,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "加密狗", "加密狗\加密狗.csproj", "{E4D76F6D-39C5-4F4F-B81A-31D9828A8CC6}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BDU", "BDU\BDU.csproj", "{0C2B5CA2-D873-255B-1B76-741346ECA1BB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{000A2999-6535-43D3-94DA-EE372D19702F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{000A2999-6535-43D3-94DA-EE372D19702F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{000A2999-6535-43D3-94DA-EE372D19702F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{000A2999-6535-43D3-94DA-EE372D19702F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AEA71207-A57F-424A-9AA0-9AC9A4B681F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AEA71207-A57F-424A-9AA0-9AC9A4B681F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AEA71207-A57F-424A-9AA0-9AC9A4B681F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,6 +52,10 @@ Global
 		{E4D76F6D-39C5-4F4F-B81A-31D9828A8CC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E4D76F6D-39C5-4F4F-B81A-31D9828A8CC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E4D76F6D-39C5-4F4F-B81A-31D9828A8CC6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0C2B5CA2-D873-255B-1B76-741346ECA1BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C2B5CA2-D873-255B-1B76-741346ECA1BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C2B5CA2-D873-255B-1B76-741346ECA1BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C2B5CA2-D873-255B-1B76-741346ECA1BB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

BDU/App.xaml

@@ -1,8 +1,8 @@
-<Application x:Class="ATS.App"
+<Application x:Class="BDU.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:ATS"
+             xmlns:local="clr-namespace:BDU"
-             xmlns:converters="clr-namespace:ATS.Converters"
+             xmlns:converters="clr-namespace:BDU.Converters"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              StartupUri="Windows/Login.xaml">

BDU/App.xaml.cs

@@ -1,9 +1,9 @@
-using ATS.Tools;
+using BDU.Tools;
 using System.Configuration;
 using System.Data;
 using System.Windows;
 
-namespace ATS
+namespace BDU
 {
     /// <summary>
     /// Interaction logic for App.xaml
@@ -12,12 +12,13 @@ namespace ATS
     {
         protected override void OnStartup(StartupEventArgs e)
         {
-            if (SecurityDongle.Verify() <= 0)
+            //先注释加密狗，要进行测试
-            {
+            //if (SecurityDongle.Verify() <= 0)
-                MessageBox.Show("加密狗到期或检测失败!\n");
+            //{
-                App.Current.Shutdown();
+            //    MessageBox.Show("加密狗到期或检测失败!\n");
-                return;
+            //    App.Current.Shutdown();
-            }
+            //    return;
+            //}
             base.OnStartup(e);
         }
     }

BDU/Converters/BoolInverseConverter.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 
-namespace ATS.Converters
+namespace BDU.Converters
 {
     public class BoolInverseConverter : IValueConverter
     {

BDU/Converters/BooleanToVisibilityConverter.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 
-namespace ATS.Converters
+namespace BDU.Converters
 {
     public class BooleanToVisibilityConverter : IValueConverter
     {

BDU/Converters/DeviceNameConverter.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 
-namespace ATS.Converters
+namespace BDU.Converters
 {
     public class DeviceNameConverter : IValueConverter
     {

BDU/Converters/DeviceSettingWindowConverter.cs

@@ -1,4 +1,4 @@
-using ATS.Models;
+using BDU.Models;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -9,7 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 
-namespace ATS.Converters
+namespace BDU.Converters
 {
     public class DeviceSettingWindowConverter : IValueConverter
     {

BDU/Converters/EnumValueConverter.cs

@@ -3,7 +3,7 @@ using System.Globalization;
 using System.Linq;
 using System.Windows.Data;
 
-namespace ATS.Converters
+namespace BDU.Converters
 {
     public class EnumValueConverter : IMultiValueConverter
     {

BDU/Converters/EnumValuesConverter.cs

@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace ATS.Converters
+namespace BDU.Converters
 {
     public class EnumValuesConverter : IValueConverter
     {

BDU/Converters/FilteredParametersConverter.cs

@@ -1,10 +1,10 @@
-using ATS.Models;
+using BDU.Models;
 using System;
 using System.Globalization;
 using System.Linq;
 using System.Windows.Data;
 
-namespace ATS.Converters
+namespace BDU.Converters
 {
     public class FilteredParametersConverter : IMultiValueConverter
     {

BDU/Converters/GuidToParameterNameConverter.cs

@@ -1,4 +1,4 @@
-using ATS.Windows;
+using BDU.Windows;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 
-namespace ATS.Converters
+namespace BDU.Converters
 {
     public class GuidToParameterNameConverter : IValueConverter
     {

BDU/Converters/HexConverter.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 
-namespace ATS.Converters
+namespace BDU.Converters
 {
     public class HexConverter : IValueConverter
     {

BDU/Converters/HexToDecimalConverter.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 
-namespace ATS.Converters
+namespace BDU.Converters
 {
     public class HexToDecimalConverter : IValueConverter
     {

BDU/Converters/IsEnumTypeConverter .cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 
-namespace ATS.Converters
+namespace BDU.Converters
 {
     public class IsEnumTypeConverter : IValueConverter
     {

BDU/Converters/ParameterCategoryToStringConverter.cs

@@ -5,9 +5,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
-using static ATS.Models.ParameterModel;
+using static BDU.Models.ParameterModel;
 
-namespace ATS.Converters
+namespace BDU.Converters
 {
     public class ParameterCategoryToStringConverter : IValueConverter
     {

BDU/Converters/ParameterCategoryToVisibilityConverter.cs

@@ -6,9 +6,9 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
-using static ATS.Models.ParameterModel;
+using static BDU.Models.ParameterModel;
 
-namespace ATS.Converters
+namespace BDU.Converters
 {
     public class ParameterCategoryToVisibilityConverter : IValueConverter
     {

BDU/Converters/ParameterToGotoSettingStringConverter.cs

@@ -1,4 +1,4 @@
-using ATS.Windows;
+using BDU.Windows;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 
-namespace ATS.Converters
+namespace BDU.Converters
 {
     internal class ParameterToGotoSettingStringConverter : IValueConverter
     {

BDU/Converters/ParameterTypeToBoolConverter.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 
-namespace ATS.Converters
+namespace BDU.Converters
 {
     public class ParameterTypeToBoolConverter : IValueConverter
     {

BDU/Converters/ParameterValueToStringConverter.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 
-namespace ATS.Converters
+namespace BDU.Converters
 {
     public class ParameterValueToStringConverter : IValueConverter
     {

BDU/Converters/StepResultToStringConverter.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 
-namespace ATS.Converters
+namespace BDU.Converters
 {
     public class StepResultToStringConverter : IValueConverter
     {

BDU/Converters/StringToVisibilityConverter.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 
-namespace ATS.Converters
+namespace BDU.Converters
 {
     public class StringToVisibilityConverter : IValueConverter
     {

BDU/Logic/DeviceConnect.cs

@@ -1,6 +1,6 @@
-using ATS.Models;
+using BDU.Models;
-using ATS.Tools;
+using BDU.Tools;
-using ATS.Windows;
+using BDU.Windows;
 using DeviceCommand.Base;
 using DocumentFormat.OpenXml.Drawing.Charts;
 using Newtonsoft.Json;
@@ -13,7 +13,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using TSMasterCAN;
 
-namespace ATS.Logic
+namespace BDU.Logic
 {
     public static class DeviceConnect
     {

BDU/Logic/StepRunning.cs

@@ -1,7 +1,7 @@
-using ATS.Models;
+using BDU.Models;
-using ATS.Tools;
+using BDU.Tools;
-using ATS.Views;
+using BDU.Views;
-using ATS.Windows;
+using BDU.Windows;
 using ATS_DBContext;
 using ATS_DBContext.Models;
 using ControlzEx.Standard;
@@ -17,9 +17,9 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
-using static ATS.Models.ParameterModel;
+using static BDU.Models.ParameterModel;
 
-namespace ATS.Logic
+namespace BDU.Logic
 {
     public static class StepRunning
     {

BDU/Models/CANSignalModel.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ATS.Models
+namespace BDU.Models
 {
     public class CANSignalModel
     {

BDU/Models/DeviceConnectSettingModel.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ATS.Models
+namespace BDU.Models
 {
     public class DeviceConnectSettingModel
     {

BDU/Models/DeviceModel.cs

@@ -7,7 +7,7 @@ using System.Reflection.Metadata;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ATS.Models
+namespace BDU.Models
 {
     [AddINotifyPropertyChangedInterface]
     public class DeviceModel

BDU/Models/MethodModel.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ATS.Models
+namespace BDU.Models
 {
     [AddINotifyPropertyChangedInterface]
     public class MethodModel

BDU/Models/ParameterModel.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ATS.Models
+namespace BDU.Models
 {
     [AddINotifyPropertyChangedInterface]
     public class ParameterModel

BDU/Models/ProgramModel.cs

@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Controls;
 
-namespace ATS.Models
+namespace BDU.Models
 {
     [AddINotifyPropertyChangedInterface]
     public class ProgramModel

BDU/Models/ReportModel.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ATS.Models
+namespace BDU.Models
 {
     public enum IsPass
     {

BDU/Models/StepModel.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ATS.Models
+namespace BDU.Models
 {
     [AddINotifyPropertyChangedInterface]
     public class StepModel

BDU/Models/SubProgramItem.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ATS.Models
+namespace BDU.Models
 {
     public class SubProgramItem
     {

BDU/Models/UserModel.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ATS.Models
+namespace BDU.Models
 {
     [AddINotifyPropertyChangedInterface]
     public class UserModel

BDU/SystemConfig.cs

@@ -1,10 +1,10 @@
-using ATS.Tools;
+using BDU.Tools;
 using Newtonsoft.Json;
 using System;
 using System.IO;
 using System.Reflection;
 
-namespace ATS
+namespace BDU
 {
     public class SystemConfig
     {
@@ -29,24 +29,27 @@ namespace ATS
         }
 
         [JsonIgnore]
-        public string SystemPath { get; set; } = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "ATS系统");
+        public string SystemPath { get; set; } = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "BDU系统");
 
         public int PerformanceLevel { get; set; } = 50;
 
-        public string LogFilePath { get; set; } = @"D:\ATS\日志\";
+        public string LogFilePath { get; set; } = @"D:\BDU\日志\";
 
-        public string DLLFilePath { get; set; } = @"D:\ATS\指令\";
+        public string DLLFilePath { get; set; } = @"D:\BDU\指令\";
 
-        public string SubProgramFilePath { get; set; } = @"D:\ATS\子程序\";
+        public string SubProgramFilePath { get; set; } = @"D:\BDU\子程序\";
 
-        public string PreDefineDevicesPath { get; set; } = @"D:\ATS\设备预设\PreDefineDevices.json";
+        public string PreDefineDevicesPath { get; set; } = @"D:\BDU\设备预设\PreDefineDevices.json";
 
-        public string DBCFilePath { get; set; } = @"D:\ATS\DBC文件\ZSDB123500_HY11_HS11_800V_ADCU20_HVEnergeCAN_230901_Fit.dbc";
+        public string DBCFilePath { get; set; } = @"D:\BDU\DBC文件\ZSDB123500_HY11_HS11_800V_ADCU20_HVEnergeCAN_230901_Fit.dbc";
         public string DefaultSubProgramFilePath { get; set; } = "";
 
         // 配置加载方法
         public void LoadFromFile()
         {
+            if (!Directory.Exists(SystemPath))
+                Directory.CreateDirectory(SystemPath);
+
             string configPath = Path.Combine(SystemPath, "system.config");
 
             if (!File.Exists(configPath))

BDU/Tools/DataGridExportToExcel.cs

@@ -14,7 +14,7 @@ using System.Windows.Controls;
 using System.Windows.Data;
 using VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment;
 
-namespace ATS.Tools
+namespace BDU.Tools
 {
     public static class DataGridExportToExcel
     {

BDU/Tools/ExpressionEvaluator.cs

@@ -6,7 +6,7 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using NCalc;
 
-namespace ATS.Tools
+namespace BDU.Tools
 {
     public class ExpressionEvaluator
     {

BDU/Tools/Log.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Windows.Media;
 using System.Windows.Threading;
 
-namespace ATS.Tools
+namespace BDU.Tools
 {
     public static class Log
     {

BDU/Tools/SecurityDongle.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using 加密狗;
 
-namespace ATS.Tools
+namespace BDU.Tools
 {
     public class SecurityDongle
     {

BDU/Views/CANCatchSingalView.xaml

@@ -1,11 +1,11 @@
-<mah:MetroWindow x:Class="ATS.Views.CANCatchSingalView"
+<mah:MetroWindow x:Class="BDU.Views.CANCatchSingalView"
         xmlns:metro="http://metro.mahapps.com/winfx/xaml/controls" 
         xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:ATS.Views" xmlns:local1="clr-namespace:ATS.Converters"
+        xmlns:local="clr-namespace:BDU.Views" xmlns:local1="clr-namespace:BDU.Converters"
                  mc:Ignorable="d"
         Title="CAN采集信号配置界面" Height="450" Width="1100">
     <Grid>

BDU/Views/CANCatchSingalView.xaml.cs

@@ -1,4 +1,4 @@
-using ATS.Models;
+using BDU.Models;
 using MahApps.Metro.Controls;
 using PropertyChanged;
 using System;
@@ -17,7 +17,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 using TSMasterCAN;
 
-namespace ATS.Views
+namespace BDU.Views
 {
     /// <summary>
     /// CANCatchSingalView.xaml 的交互逻辑

BDU/Views/CommandTreeView.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="ATS.Views.CommandTreeView"
+<UserControl x:Class="BDU.Views.CommandTreeView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:ATS.Views"
+             xmlns:local="clr-namespace:BDU.Views"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d"
              Loaded="UserControl_Loaded"

BDU/Views/CommandTreeView.xaml.cs

@@ -1,7 +1,7 @@
-using ATS.Logic;
+using BDU.Logic;
-using ATS.Models;
+using BDU.Models;
-using ATS.Tools;
+using BDU.Tools;
-using ATS.Windows;
+using BDU.Windows;
 using Common.Attributes;
 using GongSolutions.Wpf.DragDrop.Utilities;
 using Newtonsoft.Json;
@@ -25,11 +25,11 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using System.Xml;
-using static ATS.Models.ParameterModel;
+using static BDU.Models.ParameterModel;
 using static Common.Attributes.ATSCommandAttribute;
 using Path = System.IO.Path;
 
-namespace ATS.Views
+namespace BDU.Views
 {
     /// <summary>
     /// CommandTreeView.xaml 的交互逻辑
@@ -125,7 +125,7 @@ namespace ATS.Views
                 var parameters = method.GetParameters();
                 if (parameters.Length > 0)
                 {
-                    memberName += "(" + string.Join(",", parameters.Select(p => p.ParameterType.FullName)) + ")";
+                    memberName += "(" + string.Join(",", parameters.Select(p => p.ParameterType.FullName?.Replace('+', '.'))) + ")";
                 }
 
                 // 查找注释节点

BDU/Views/LogArea.xaml

@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="ATS.Views.LogArea"
+    x:Class="BDU.Views.LogArea"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:ATS.Views"
+    xmlns:local="clr-namespace:BDU.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     d:DesignHeight="450"
     d:DesignWidth="800"

BDU/Views/LogArea.xaml.cs

@@ -1,4 +1,4 @@
-using ATS.Tools;
+using BDU.Tools;
 using PropertyChanged;
 using System;
 using System.Collections.Generic;
@@ -10,7 +10,7 @@ using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Threading;
 
-namespace ATS.Views
+namespace BDU.Views
 {
     public partial class LogArea : UserControl
     {

BDU/Views/ParametersManager.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="ATS.Views.ParametersManager"
+<UserControl x:Class="BDU.Views.ParametersManager"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:ATS.Views"
+             xmlns:local="clr-namespace:BDU.Views"
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
              mc:Ignorable="d"
              d:DataContext="{d:DesignInstance Type=local:ParametersManager}"

BDU/Views/ParametersManager.xaml.cs

@@ -1,7 +1,7 @@
-using ATS.Logic;
+using BDU.Logic;
-using ATS.Models;
+using BDU.Models;
-using ATS.Tools;
+using BDU.Tools;
-using ATS.Windows;
+using BDU.Windows;
 using DeviceCommand.Base;
 using Newtonsoft.Json;
 using PropertyChanged;
@@ -23,10 +23,10 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using static ATS.Models.ParameterModel;
+using static BDU.Models.ParameterModel;
 using static MaterialDesignThemes.Wpf.Theme.ToolBar;
 
-namespace ATS.Views
+namespace BDU.Views
 {
     /// <summary>
     /// ParametersManager.xaml 的交互逻辑

BDU/Views/SingleStepEdit.xaml

@@ -1,11 +1,11 @@
 <UserControl
-    x:Class="ATS.Views.SingleStepEdit"
+    x:Class="BDU.Views.SingleStepEdit"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:ATS.Views"
+    xmlns:local="clr-namespace:BDU.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:converters="clr-namespace:ATS.Converters"
+    xmlns:converters="clr-namespace:BDU.Converters"
     d:DataContext="{d:DesignInstance Type=local:SingleStepEdit}"
     d:DesignHeight="450"
     d:DesignWidth="800"

BDU/Views/SingleStepEdit.xaml.cs

@@ -1,6 +1,6 @@
-using ATS.Models;
+using BDU.Models;
-using ATS.Tools;
+using BDU.Tools;
-using ATS.Windows;
+using BDU.Windows;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -16,7 +16,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace ATS.Views
+namespace BDU.Views
 {
     /// <summary>
     /// SingleStepEdit.xaml 的交互逻辑

BDU/Views/StepsManager.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="ATS.Views.StepsManager"
+<UserControl x:Class="BDU.Views.StepsManager"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:dd="urn:gong-wpf-dragdrop"
-             xmlns:local="clr-namespace:ATS.Views"
+             xmlns:local="clr-namespace:BDU.Views"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              d:DataContext="{d:DesignInstance Type=local:StepsManager}"
              d:DesignHeight="450"

BDU/Views/StepsManager.xaml.cs

@@ -1,6 +1,6 @@
-using ATS.Models;
+using BDU.Models;
-using ATS.Tools;
+using BDU.Tools;
-using ATS.Windows;
+using BDU.Windows;
 using PropertyChanged;
 using System;
 using System.Collections.Generic;
@@ -22,7 +22,7 @@ using System.Windows.Navigation;
 using System.Windows.Shapes;
 using Timer = System.Timers.Timer;
 
-namespace ATS.Views
+namespace BDU.Views
 {
     /// <summary>
     /// StepsManager.xaml 的交互逻辑

BDU/Views/ToolBar.xaml

@@ -1,11 +1,11 @@
-<UserControl x:Class="ATS.Views.ToolBar"
+<UserControl x:Class="BDU.Views.ToolBar"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:ATS.Views"
+             xmlns:local="clr-namespace:BDU.Views"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:converters="clr-namespace:ATS.Tools"
+             xmlns:converters="clr-namespace:BDU.Tools"
     d:DataContext="{d:DesignInstance Type=local:ToolBar}"
              d:DesignWidth="800"
              mc:Ignorable="d"

BDU/Views/ToolBar.xaml.cs

@@ -1,7 +1,7 @@
-using ATS.Logic;
+using BDU.Logic;
-using ATS.Models;
+using BDU.Models;
-using ATS.Tools;
+using BDU.Tools;
-using ATS.Windows;
+using BDU.Windows;
 using ATS_DBContext;
 using MaterialDesignThemes.Wpf;
 using Microsoft.Win32;
@@ -23,10 +23,10 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using TSMasterCAN;
-using static ATS.Models.ParameterModel;
+using static BDU.Models.ParameterModel;
 using Path = System.IO.Path;
 
-namespace ATS.Views
+namespace BDU.Views
 {
     /// <summary>
     /// ToolBar.xaml 的交互逻辑

BDU/Windows/DeviceManageWindow.xaml

@@ -1,10 +1,10 @@
-<mah:MetroWindow x:Class="ATS.Windows.DeviceManageWindow"
+<mah:MetroWindow x:Class="BDU.Windows.DeviceManageWindow"
         xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:ATS.Windows"
+        xmlns:local="clr-namespace:BDU.Windows"
         mc:Ignorable="d"
         d:DataContext="{d:DesignInstance Type=local:DeviceManageWindow}"
         WindowStyle="None"

BDU/Windows/DeviceManageWindow.xaml.cs

@@ -1,5 +1,5 @@
-using ATS.Models;
+using BDU.Models;
-using ATS.Tools;
+using BDU.Tools;
 using MahApps.Metro.Controls;
 using Newtonsoft.Json;
 using PropertyChanged;
@@ -19,7 +19,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace ATS.Windows
+namespace BDU.Windows
 {
     /// <summary>
     /// DeviceManageWindow.xaml 的交互逻辑

BDU/Windows/DeviceSettingWindow.xaml

@@ -1,10 +1,10 @@
-<mah:MetroWindow  x:Class="ATS.Windows.DeviceSettingWindow"
+<mah:MetroWindow  x:Class="BDU.Windows.DeviceSettingWindow"
                   xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
                   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                  xmlns:local="clr-namespace:ATS.Windows"
+                  xmlns:local="clr-namespace:BDU.Windows"
                   mc:Ignorable="d"
                   d:DataContext="{d:DesignInstance Type=local:DeviceSettingWindow}"
                   WindowStyle="None"

BDU/Windows/DeviceSettingWindow.xaml.cs

@@ -1,4 +1,4 @@
-using ATS.Models;
+using BDU.Models;
 using MahApps.Metro.Controls;
 using Newtonsoft.Json;
 using NPOI.XSSF.Streaming.Values;
@@ -18,7 +18,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace ATS.Windows
+namespace BDU.Windows
 {
     /// <summary>
     /// DeviceSettingWindow.xaml 的交互逻辑
@@ -206,6 +206,7 @@ namespace ATS.Windows
         {
             try
             {
+
                 string filePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, SystemConfig.Instance.PreDefineDevicesPath);
                 
                 if (!System.IO.File.Exists(filePath))

BDU/Windows/Login.xaml

@@ -1,13 +1,13 @@
 <mah:MetroWindow xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
                  xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
-                 x:Class="ATS.Windows.Login"
+                 x:Class="BDU.Windows.Login"
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                 xmlns:local="clr-namespace:ATS.Windows"
+                 xmlns:local="clr-namespace:BDU.Windows"
                  mc:Ignorable="d"
-                 Title="ATS系统"
+                 Title="BDU系统"
                  WindowStartupLocation="CenterScreen"
                  Height="315"
                  Width="420"
@@ -61,6 +61,10 @@
     </Window.Resources>
 
     <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="11*"/>
+            <ColumnDefinition Width="94*"/>
+        </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="40" />
@@ -73,7 +77,7 @@
                 CornerRadius="5"
                 BorderThickness="1"
                 BorderBrush="#E0E0E0"
-                Padding="30,20">
+                Padding="30,20" Grid.ColumnSpan="2">
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
@@ -144,11 +148,11 @@
         </Border>
 
         <!-- 底部版权信息 -->
-        <TextBlock Grid.Row="2"
+        <TextBlock Grid.Row="1"
-                   Text="© 2025 ATS系统"
+                   Text="© 2025 BDU系统"
                    Foreground="#777"
                    FontSize="12"
-                   HorizontalAlignment="Center"
+                   HorizontalAlignment="Left"
-                   Margin="0,10" />
+                   Margin="123,10,0,10" Grid.Column="1" />
     </Grid>
 </mah:MetroWindow>

BDU/Windows/Login.xaml.cs

@@ -1,5 +1,5 @@
-using ATS.Models;
+using BDU.Models;
-using ATS.Windows;
+using BDU.Windows;
 using MahApps.Metro.Controls;
 using System;
 using System.Collections.Generic;
@@ -19,7 +19,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 using Path = System.IO.Path;
 
-namespace ATS.Windows
+namespace BDU.Windows
 {
     /// <summary>
     /// Login.xaml 的交互逻辑
@@ -51,6 +51,7 @@ namespace ATS.Windows
                 UserList.Add(new()
                 {
                     UserName = "超级管理员",
+                    UserAccount ="admin",
                     UserId = Guid.NewGuid(),
                     PassWord = "admin",
                     Role = 2

BDU/Windows/MainWindow.xaml

@@ -1,16 +1,16 @@
-<mah:MetroWindow x:Class="ATS.Windows.MainWindow"
+<mah:MetroWindow x:Class="BDU.Windows.MainWindow"
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                 xmlns:local="clr-namespace:ATS.Windows"
+                 xmlns:local="clr-namespace:BDU.Windows"
                  xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
                  xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-                 xmlns:vs="clr-namespace:ATS.Views"
+                 xmlns:vs="clr-namespace:BDU.Views"
                  mc:Ignorable="d"
                  Loaded="MetroWindow_Loaded"
                  d:DataContext="{d:DesignInstance Type=local:MainWindow}"
-                 Title="ATS_MainWindow"
+                 Title="BDU_MainWindow"
                  Height="580"
                  Width="1099">
     <Grid>

BDU/Windows/MainWindow.xaml.cs

@@ -1,5 +1,5 @@
-using ATS.Models;
+using BDU.Models;
-using ATS.Tools;
+using BDU.Tools;
 using MahApps.Metro.Controls;
 using MathNet.Numerics;
 using Microsoft.Win32;
@@ -22,7 +22,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace ATS.Windows
+namespace BDU.Windows
 {
     /// <summary>
     /// MainWindow.xaml 的交互逻辑
@@ -163,7 +163,7 @@ namespace ATS.Windows
             Title = $"{parentPath} > {subProgramName}";
             
             // 通知 StepsManager 更新 Title 显示子程序名称
-            ATS.Views.StepsManager.Instance?.UpdateTitle(subProgramName);
+            BDU.Views.StepsManager.Instance?.UpdateTitle(subProgramName);
         }
 
 
@@ -203,12 +203,12 @@ namespace ATS.Windows
                 if (_isInSubProgramMode && _currentSubProgramNameStack.Count > 0)
                 {
                     // 如果还在子程序模式中（多层嵌套），显示上一层子程序名称
-                    ATS.Views.StepsManager.Instance?.UpdateTitle(_currentSubProgramNameStack.Peek());
+                    BDU.Views.StepsManager.Instance?.UpdateTitle(_currentSubProgramNameStack.Peek());
                 }
                 else
                 {
                     // 返回主程序
-                    ATS.Views.StepsManager.Instance?.UpdateTitle();
+                    BDU.Views.StepsManager.Instance?.UpdateTitle();
                 }
             }
         }

BDU/Windows/ParameterSettingWindow.xaml

@@ -1,8 +1,8 @@
-<mah:MetroWindow x:Class="ATS.Windows.ParameterSettingWindow"
+<mah:MetroWindow x:Class="BDU.Windows.ParameterSettingWindow"
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                 xmlns:local="clr-namespace:ATS.Windows"
+                 xmlns:local="clr-namespace:BDU.Windows"
                  xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                  Title="ParameterSettingWindow"

BDU/Windows/ParameterSettingWindow.xaml.cs

@@ -1,4 +1,4 @@
-using ATS.Models;
+using BDU.Models;
 using MahApps.Metro.Controls;
 using PropertyChanged;
 using System;
@@ -16,9 +16,9 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 using TSMaster;
-using static ATS.Models.ParameterModel;
+using static BDU.Models.ParameterModel;
 
-namespace ATS.Windows
+namespace BDU.Windows
 {
     /// <summary>
     /// ParameterSettingWindow.xaml 的交互逻辑

BDU/Windows/SystemConfigWindow.xaml

@@ -1,10 +1,10 @@
-<mah:MetroWindow x:Class="ATS.Windows.SystemConfigWindow"
+<mah:MetroWindow x:Class="BDU.Windows.SystemConfigWindow"
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                  xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
-                 xmlns:local="clr-namespace:ATS.Windows"
+                 xmlns:local="clr-namespace:BDU.Windows"
                  mc:Ignorable="d"
                  Title="SystemConfigWindow"
                  Width="420"

BDU/Windows/SystemConfigWindow.xaml.cs

@@ -1,4 +1,4 @@
-using ATS;
+using BDU;
 using MahApps.Metro.Controls;
 using Newtonsoft.Json;
 using System;
@@ -7,7 +7,7 @@ using System.Reflection;
 using System.Windows;
 using System.Windows.Input;
 
-namespace ATS.Windows
+namespace BDU.Windows
 {
     public partial class SystemConfigWindow : MetroWindow
     {

BDU/Windows/TestDataInfomationWindow.xaml

@@ -1,8 +1,8 @@
-<mah:MetroWindow x:Class="ATS.Windows.TestDataInfomationWindow"
+<mah:MetroWindow x:Class="BDU.Windows.TestDataInfomationWindow"
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                 xmlns:local="clr-namespace:ATS.Windows"
+                 xmlns:local="clr-namespace:BDU.Windows"
                  xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                  Title="TestDataInfomationWindow"

BDU/Windows/TestDataInfomationWindow.xaml.cs

@@ -1,4 +1,4 @@
-using ATS.Tools;
+using BDU.Tools;
 using ATS_DBContext;
 using ATS_DBContext.Models;
 using ClosedXML.Excel;
@@ -13,7 +13,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
 
-namespace ATS.Windows
+namespace BDU.Windows
 {
     [AddINotifyPropertyChangedInterface]
     public partial class TestDataInfomationWindow : MetroWindow

BDU/Windows/UserSettingWindow.xaml

@@ -1,10 +1,10 @@
 <mah:MetroWindow xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
-                 x:Class="ATS.Windows.UserSettingWindow"
+                 x:Class="BDU.Windows.UserSettingWindow"
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                 xmlns:local="clr-namespace:ATS.Windows"
+                 xmlns:local="clr-namespace:BDU.Windows"
                  d:DataContext="{d:DesignInstance Type=local:UserSettingWindow}"
                  mc:Ignorable="d"
                  ShowTitleBar="False"

BDU/Windows/UserSettingWindow.xaml.cs

@@ -1,4 +1,4 @@
-using ATS.Models;
+using BDU.Models;
 using MahApps.Metro.Controls;
 using PropertyChanged;
 using System;
@@ -18,7 +18,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace ATS.Windows
+namespace BDU.Windows
 {
     /// <summary>
     /// UsersAdd.xaml 的交互逻辑

BDU/Windows/UsersManage.xaml

@@ -1,10 +1,10 @@
 <mah:MetroWindow xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
-                 x:Class="ATS.Windows.UsersManage"
+                 x:Class="BDU.Windows.UsersManage"
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                 xmlns:local="clr-namespace:ATS.Windows"
+                 xmlns:local="clr-namespace:BDU.Windows"
                  xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
                  d:DataContext="{d:DesignInstance Type=local:UsersManage}"
                  mc:Ignorable="d"

BDU/Windows/UsersManage.xaml.cs

@@ -1,4 +1,4 @@
-using ATS.Models;
+using BDU.Models;
 using DocumentFormat.OpenXml.Spreadsheet;
 using MahApps.Metro.Controls;
 using PropertyChanged;
@@ -22,7 +22,7 @@ using System.Windows.Navigation;
 using System.Windows.Shapes;
 using Path = System.IO.Path;
 
-namespace ATS.Windows
+namespace BDU.Windows
 {
     /// <summary>
     /// UsersManage.xaml 的交互逻辑

DeviceCommand/Device/AMETEKSGX.cs

@@ -13,9 +13,12 @@ namespace DeviceCommand.Device
     /// 直流电源——阿美泰克直流电源
     /// </summary>
     [ATSCommand]
-    [DeviceCategory("阿美泰克直流电源\r\n")]
+    [DeviceCategory("阿美泰克直流电源")]
     public class AMETEKSGX : Tcp
     {
+        /// <summary>
+        /// 信号量锁
+        /// </summary>
         public SemaphoreSlim semaphoreSlimLock { get; set; } = new(1, 1);
 
         /// <summary>

DeviceCommand/Device/IT_N6322B.cs

@@ -16,11 +16,28 @@ namespace DeviceCommand.Device
     [DeviceCategory("三通道可编程直流电源")]
     public class IT_N6322B : Tcp
     {
+        /// <summary>
+        /// 信号量锁
+        /// </summary>
         public SemaphoreSlim semaphoreSlimLock { get; set; } = new(1, 1);
 
+        /// <summary>
+        /// 通道枚举
+        /// </summary>
         public enum ChannelList_Enum
         {
-            CH1 = 1, CH2 = 2, CH3 = 3
+            /// <summary>
+            /// 通道1
+            /// </summary>
+            CH1 = 1,
+            /// <summary>
+            /// 通道2
+            /// </summary>
+            CH2 = 2,
+            /// <summary>
+            /// 通道3
+            /// </summary>
+            CH3 = 3
         }
 
 
@@ -32,6 +49,7 @@ namespace DeviceCommand.Device
         /// <returns></returns>
         public async Task Set_RemoteMode(Tcp client, CancellationToken ct = default)
         {
+            await semaphoreSlimLock.WaitAsync(ct);
             try
             {
                 await SendAsync(client, $"SYST:REM\n", ct);
@@ -69,15 +87,17 @@ namespace DeviceCommand.Device
             }
         }
 
+
+
         /// <summary>
-        /// 设置源指定通道对应通道输出电压
+        /// 设置源指定通道过电压保护电平
         /// </summary>
         /// <param name="client">设备</param>
         /// <param name="channel">通道</param>
-        /// <param name="voltage">电压</param>
+        /// <param name="voltage">输出频率</param>
         /// <param name="ct">支持中途取消发送指令</param>
         /// <returns></returns>
-        public async Task Set_OutputVoltage(Tcp client, ChannelList_Enum channel, float voltage, CancellationToken ct = default)
+        public async Task Set_OutputITVoltage(Tcp client, ChannelList_Enum channel, float voltage, CancellationToken ct = default)
         {
             await semaphoreSlimLock.WaitAsync(ct);
             try
@@ -103,7 +123,7 @@ namespace DeviceCommand.Device
         /// <param name="voltage">输出频率</param>
         /// <param name="ct">支持中途取消发送指令</param>
         /// <returns></returns>
-        public async Task Set_MaxVoltage(Tcp client, ChannelList_Enum channel, float voltage, CancellationToken ct = default)
+        public async Task Set_MaxITVoltage(Tcp client, ChannelList_Enum channel, float voltage, CancellationToken ct = default)
         {
             await semaphoreSlimLock.WaitAsync(ct);
             try
@@ -129,7 +149,7 @@ namespace DeviceCommand.Device
         /// <param name="current">输出频率</param>
         /// <param name="ct">支持中途取消发送指令</param>
         /// <returns></returns>
-        public async Task Set_OutputCurrent(Tcp client, ChannelList_Enum channel, float current, CancellationToken ct = default)
+        public async Task Set_OutputITCurrent(Tcp client, ChannelList_Enum channel, float current, CancellationToken ct = default)
         {
             await semaphoreSlimLock.WaitAsync(ct);
             try
@@ -155,7 +175,7 @@ namespace DeviceCommand.Device
         /// <param name="current">电压</param>
         /// <param name="ct">支持中途取消发送指令</param>
         /// <returns></returns>
-        public async Task Set_MaxCurrent(Tcp client, ChannelList_Enum channel, float current, CancellationToken ct = default)
+        public async Task Set_MaxITCurrent(Tcp client, ChannelList_Enum channel, float current, CancellationToken ct = default)
         {
             await semaphoreSlimLock.WaitAsync(ct);
             try
@@ -182,7 +202,7 @@ namespace DeviceCommand.Device
         /// <param name="current">电流</param>
         /// <param name="ct">支持中途取消发送指令</param>
         /// <returns></returns>
-        public async Task Set_MaxCurrent(Tcp client, ChannelList_Enum channel, float voltage, float current, CancellationToken ct = default)
+        public async Task Set_CurrentAndVoltage(Tcp client, ChannelList_Enum channel, float voltage, float current, CancellationToken ct = default)
         {
             await semaphoreSlimLock.WaitAsync(ct);
             try
@@ -207,7 +227,7 @@ namespace DeviceCommand.Device
         /// <param name="channel">通道</param>
         /// <param name="ct">取消令牌</param>
         /// <returns>返回值是：定通道电源输出的实际电压值 (Amps)</returns>
-        public async Task<string> QueryVoltage(Tcp client, ChannelList_Enum channel, CancellationToken ct = default)
+        public async Task<string> Query_ITVoltage(Tcp client, ChannelList_Enum channel, CancellationToken ct = default)
         {
             await semaphoreSlimLock.WaitAsync(ct);
             try
@@ -230,7 +250,7 @@ namespace DeviceCommand.Device
         /// <param name="channel">通道</param>
         /// <param name="ct">取消令牌</param>
         /// <returns>返回值是：设置的电流值 (Amps)</returns>
-        public async Task<string> QueryCurrent(Tcp client, ChannelList_Enum channel, CancellationToken ct = default)
+        public async Task<string> Query_ITCurrent(Tcp client, ChannelList_Enum channel, CancellationToken ct = default)
         {
             await semaphoreSlimLock.WaitAsync(ct);
             try
@@ -251,7 +271,7 @@ namespace DeviceCommand.Device
         /// <param name="channel">通道</param>
         /// <param name="ct">取消令牌</param>
         /// <returns>返回值是：指定通道电源输出的实际功率值 (Amps)</returns>
-        public async Task<string> QueryPower(Tcp client, ChannelList_Enum channel, CancellationToken ct = default)
+        public async Task<string> Query_ITPower(Tcp client, ChannelList_Enum channel, CancellationToken ct = default)
         {
             await semaphoreSlimLock.WaitAsync(ct);
             try
@@ -273,7 +293,7 @@ namespace DeviceCommand.Device
         /// <param name="channel">通道</param>
         /// <param name="ct">支持中途取消发送指令</param>
         /// <returns></returns>
-        public async Task Set_Power_ON(Tcp client, ChannelList_Enum channel, CancellationToken ct = default)
+        public async Task Set_ITPower_ON(Tcp client, ChannelList_Enum channel, CancellationToken ct = default)
         {
             await semaphoreSlimLock.WaitAsync(ct);
             try
@@ -299,7 +319,7 @@ namespace DeviceCommand.Device
         /// <param name="channel">通道</param>
         /// <param name="ct">支持中途取消发送指令</param>
         /// <returns></returns>
-        public async Task Set_Power_OFF(Tcp client, ChannelList_Enum channel, CancellationToken ct = default)
+        public async Task Set_ITPower_OFF(Tcp client, ChannelList_Enum channel, CancellationToken ct = default)
         {
             await semaphoreSlimLock.WaitAsync(ct);
             try
@@ -316,11 +336,5 @@ namespace DeviceCommand.Device
             }
         }
     }
-
-
-
-
-
-
-
 }
+

DeviceCommand/Device/KeySight_Truevolt.cs

@@ -185,7 +185,6 @@ namespace DeviceCommand.Device
         /// 启动DC电压和比例测量禁用或启用自动归零模式
         /// </summary>
         /// <param name="client">设备</param>
-        /// <param name="range">量程</param>
         /// <param name="ct">支持中途取消发送指令</param>
         /// <returns></returns>
         public async Task Start_VoltageDCAUTO_ZERO(Tcp client, CancellationToken ct = default)

DeviceCommand/Device/RTM3004.cs

@@ -32,20 +32,59 @@ namespace DeviceCommand.Device
         /// </summary>
         public enum ChannelName_Single_Enum
         {
-            CH1 = 1, CH2 = 2, CH3 = 3, CH4 = 4
-        }
             /// <summary>
-        /// 测试项(1到9)
+            /// 通道1
+            /// </summary>
+            CH1 = 1,
+            /// <summary>
+            /// 通道2
+            /// </summary>
+            CH2 = 2,
+            /// <summary>
+            /// 通道3
+            /// </summary>
+            CH3 = 3,
+            /// <summary>
+            /// 通道4
+            /// </summary>
+            CH4 = 4
+        }
+
+        /// <summary>
+        /// 测量项枚举，RTM3004支持8个独立的测量项
         /// </summary>
         public enum Measurement_Enum
         {
-            MEAS1 = 1, MEAS2 = 2, MEAS3 = 3, MEAS4 = 4, MEAS5 = 5, MEAS6 = 6, MEAS7 = 7, MEAS8 = 8
+            /// <summary>测量项1</summary>
+            MEAS1 = 1,
+            /// <summary>测量项2</summary>
+            MEAS2 = 2,
+            /// <summary>测量项3</summary>
+            MEAS3 = 3,
+            /// <summary>测量项4</summary>
+            MEAS4 = 4,
+            /// <summary>测量项5</summary>
+            MEAS5 = 5,
+            /// <summary>测量项6</summary>
+            MEAS6 = 6,
+            /// <summary>测量项7</summary>
+            MEAS7 = 7,
+            /// <summary>测量项8</summary>
+            MEAS8 = 8
         }
+
+        /// <summary>
+        /// 通道耦合模式枚举
+        /// </summary>
         public enum CouplingMode
         {
+            /// <summary>直流限制耦合</summary>
             DCLimit,
+            /// <summary>交流限制耦合</summary>
             ACLimit,
-            GND, //手册有 GND 耦合
+            /// <summary>接地耦合，用于参考电平</summary>
+            GND,
+            /// <summary>直流耦合</summary>
             DC
         }
 
@@ -54,17 +93,25 @@ namespace DeviceCommand.Device
         /// </summary>
         public enum AcquisitionState
         {
+            /// <summary>运行中，持续采集波形</summary>
             RUN,
-            STOPping,//采集完成后停止采集
+            /// <summary>采集完成后停止采集</summary>
-            COMPlete,//设置：不可用
+            STOPping,
-            BREak//设置：立即中断当前采集
+            /// <summary>采集完成（设置：不可用）</summary>
+            COMPlete,
+            /// <summary>立即中断当前采集</summary>
+            BREak
         }
 
+        /// <summary>
         /// 带宽限制（手册 CH<x>:BANdwidth 支持值）
+        /// </summary>
         public enum BandwidthLimit
         {
-            FULL,//使用全部带宽
+            /// <summary>使用全部带宽，无限制</summary>
-            B20//频率限制为20 MHz。高频信号被移除以降低
+            FULL,
+            /// <summary>频率限制为20 MHz，高频信号被移除以降低噪声</summary>
+            B20
         }
 
         /// <summary>
@@ -72,32 +119,39 @@ namespace DeviceCommand.Device
         /// </summary>
         public enum TriggerMode
         {
-            AUTO,   // 自动
+            /// <summary>自动模式，无触发时自动扫描</summary>
-            NORMal, // 正常
+            AUTO,
+            /// <summary>正常模式，仅在触发时采集</summary>
+            NORMal,
         }
 
         /// <summary>
-        /// 触发模式（手册 TRIGger:A:MODe 支持值）
+        /// 触发斜率/边沿枚举
         /// </summary>
         public enum Slope_Enum
         {
-            POSitive,  //上升沿，正电压变化
+            /// <summary>上升沿触发，检测电压正向变化</summary>
-            NEGative,//下降沿，负电压变化
+            POSitive,
-            EITHer //上升和下降的边缘
+            /// <summary>下降沿触发，检测电压负向变化</summary>
-
+            NEGative,
+            /// <summary>上升和下降沿都触发</summary>
+            EITHer
         }
 
-
         /// <summary>
-        /// 测试项信号水平的百分比（手册 TRIGger:A:MODe 支持值）
+        /// 参考电平百分比模式枚举
+        /// 用于设置上升/下降时间测量的上下参考电平
         /// </summary>
         public enum Relative_Mode
         {
-            TEN,  //10, 50 and 90%
+            /// <summary>10%、50%和90%参考电平</summary>
-            TWENty,// 20, 50 and 80%
+            TEN,
-            FIVE,// 5, 50 and 95 %
+            /// <summary>20%、50%和80%参考电平</summary>
-            USER//层级定义采用REFLevel参数
+            TWENty,
-
+            /// <summary>5%、50%和95%参考电平</summary>
+            FIVE,
+            /// <summary>用户自定义参考电平，需配合REFLevel参数使用</summary>
+            USER
         }
         #endregion