Skip to content

V
VIZ.H2V
Commit 07377d47 by liulongfei
Options

mac地址获取逻辑调整

parent cf0e3f41
Showing with 26 additions and 26 deletions
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Command.cs
...@@ -93,7 +93,7 @@ namespace VIZ.H2V.Module ...@@ -93,7 +93,7 @@ namespace VIZ.H2V.Module
AlgorithmStrategy strategy = ApplicationDomainEx.CsvContext.AlgorithmStrategys.FirstOrDefault(p => p.ID == (int)this.ViewConfig.StrategyType); AlgorithmStrategy strategy = ApplicationDomainEx.CsvContext.AlgorithmStrategys.FirstOrDefault(p => p.ID == (int)this.ViewConfig.StrategyType);
// 算法ID // 算法ID
this.ID = $"{NetHelper.GetUsedOrLastMacAddress()}__{this.ViewKey}"; this.ID = $"{ApplicationDomainEx.LOCAL_LOGIC_MAC}__{this.ViewKey}";
// 显示名称 // 显示名称
this.DisplayName = this.ViewConfig.DisplayName ?? this.viewKey; this.DisplayName = this.ViewConfig.DisplayName ?? this.viewKey;
// 算法名称 // 算法名称
......
VIZ.H2V/Properties/AssemblyInfo.cs
...@@ -60,30 +60,29 @@ using VIZ.Framework.Core; ...@@ -60,30 +60,29 @@ using VIZ.Framework.Core;
// VIZ // VIZ
// ------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------
// 应用程序时间校验，超过该时间系统将无法运行 // 应用程序时间校验，超过该时间系统将无法运行
[assembly: ApplicationTimeCheck("2022-9-16 00:00:00")] // [assembly: ApplicationTimeCheck("2022-9-16 00:00:00")]
// ------------------------------------------------------------------------------------ // =====================================================================================================
// MAC地址校验 // MAC地址校验
// 开发机： WIFI: 3C:58:C2:D7:DC:14 // ------------------------------------------------------------------------------------
// 网线: 00:2B:67:7C:4E:DA // 开发机：
// [assembly: ApplicationMacCheck("00-2B-67-7C-4E-DA")]
// 测试机 1（环达）： 网线：E0:4F:43:E6:4F:82 [assembly: ApplicationMacCheck("3C-58-C2-D7-DC-15")]
// 测试机 2（环达）： 网线：E0:4F:43:E6:48:7C [assembly: ApplicationMacCheck("3E-58-C2-D7-DC-14")]
// 测试机 3（霄云中心）： 网线：04:7B:CB:46:0D:C9 [assembly: ApplicationMacCheck("3C-58-C2-D7-DC-14")]
// 测试机 4（霄云中心）： 网线：04:7B:CB:46:0F:8E [assembly: ApplicationMacCheck("00-01-00-01-26-62-61-CC-00-2B-67-7C-4E-DA")]
// ------------------------------------------------- // ------------------------------------------------------------------------------------
// 测试机 5（霄云中心）： 网线：00:D8:61:D7:1C:30 // 环达 H2V-N1
// 测试机 6（霄云中心）： 网线：00:D8:61:D7:1C:31 [assembly: ApplicationMacCheck("04-7B-CB-46-0F-8E")]
// 测试机 7（霄云中心）： 网线：04:ED:33:53:08:9F [assembly: ApplicationMacCheck("00-01-00-01-2A-25-A7-FF-E0-4F-43-E6-5B-9F")]
// 测试机 8（霄云中心）： 网线：04:ED:33:53:08:A3 // ------------------------------------------------------------------------------------
// ------------------------------------------------- // 环达 H2V-N2
[assembly: ApplicationMacCheck("3C:58:C2:D7:DC:14")] [assembly: ApplicationMacCheck("04-7B-CB-46-0D-C9")]
[assembly: ApplicationMacCheck("00:2B:67:7C:4E:DA")] [assembly: ApplicationMacCheck("00-01-00-01-2A-25-95-B7-E0-4F-43-E6-5B-9F")]
[assembly: ApplicationMacCheck("E0:4F:43:E6:4F:82")] // ------------------------------------------------------------------------------------
[assembly: ApplicationMacCheck("E0:4F:43:E6:48:7C")] // 霄云中心 H2V-001
[assembly: ApplicationMacCheck("04:7B:CB:46:0D:C9")] [assembly: ApplicationMacCheck("E0-4F-43-E6-4F-82")]
[assembly: ApplicationMacCheck("04:7B:CB:46:0F:8E")] [assembly: ApplicationMacCheck("00-01-00-01-2A-33-A8-0D-E0-4F-43-E6-4F-82")]
[assembly: ApplicationMacCheck("00:D8:61:D7:1C:30")] // 霄云中心 H2V-002
[assembly: ApplicationMacCheck("00:D8:61:D7:1C:31")] [assembly: ApplicationMacCheck("E0-4F-43-E6-48-7C")]
[assembly: ApplicationMacCheck("04:ED:33:53:08:9F")] [assembly: ApplicationMacCheck("00-01-00-01-2A-9B-9E-40-E0-4F-43-E6-48-7C")]
[assembly: ApplicationMacCheck("04:ED:33:53:08:A3")]
// ===================================================================================================== // =====================================================================================================
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment