Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
V
VIZ.H2V
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘龙飞
VIZ.H2V
Commits
07377d47
Commit
07377d47
authored
Sep 16, 2022
by
liulongfei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mac地址获取逻辑调整
parent
cf0e3f41
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
26 deletions
+26
-26
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Command.cs
+1
-1
VIZ.H2V/Properties/AssemblyInfo.cs
+25
-25
No files found.
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Command.cs
View file @
07377d47
...
...
@@ -93,7 +93,7 @@ namespace VIZ.H2V.Module
AlgorithmStrategy
strategy
=
ApplicationDomainEx
.
CsvContext
.
AlgorithmStrategys
.
FirstOrDefault
(
p
=>
p
.
ID
==
(
int
)
this
.
ViewConfig
.
StrategyType
);
// 算法ID
this
.
ID
=
$"
{
NetHelper
.
GetUsedOrLastMacAddress
()
}
__
{
this
.
ViewKey
}
"
;
this
.
ID
=
$"
{
ApplicationDomainEx
.
LOCAL_LOGIC_MAC
}
__
{
this
.
ViewKey
}
"
;
// 显示名称
this
.
DisplayName
=
this
.
ViewConfig
.
DisplayName
??
this
.
viewKey
;
// 算法名称
...
...
VIZ.H2V/Properties/AssemblyInfo.cs
View file @
07377d47
...
...
@@ -60,30 +60,29 @@ using VIZ.Framework.Core;
// VIZ
// ------------------------------------------------------------------------------------
// 应用程序时间校验,超过该时间系统将无法运行
[assembly: ApplicationTimeCheck("2022-9-16 00:00:00")]
//
------------------------------------------------------------------------------------
//
[assembly: ApplicationTimeCheck("2022-9-16 00:00:00")]
//
=====================================================================================================
// MAC地址校验
// 开发机: WIFI: 3C:58:C2:D7:DC:14
// 网线: 00:2B:67:7C:4E:DA
//
// 测试机 1(环达): 网线:E0:4F:43:E6:4F:82
// 测试机 2(环达): 网线:E0:4F:43:E6:48:7C
// 测试机 3(霄云中心): 网线:04:7B:CB:46:0D:C9
// 测试机 4(霄云中心): 网线:04:7B:CB:46:0F:8E
// -------------------------------------------------
// 测试机 5(霄云中心): 网线:00:D8:61:D7:1C:30
// 测试机 6(霄云中心): 网线:00:D8:61:D7:1C:31
// 测试机 7(霄云中心): 网线:04:ED:33:53:08:9F
// 测试机 8(霄云中心): 网线:04:ED:33:53:08:A3
// -------------------------------------------------
[assembly: ApplicationMacCheck("3C:58:C2:D7:DC:14")]
[assembly: ApplicationMacCheck("00:2B:67:7C:4E:DA")]
[assembly: ApplicationMacCheck("E0:4F:43:E6:4F:82")]
[assembly: ApplicationMacCheck("E0:4F:43:E6:48:7C")]
[assembly: ApplicationMacCheck("04:7B:CB:46:0D:C9")]
[assembly: ApplicationMacCheck("04:7B:CB:46:0F:8E")]
[assembly: ApplicationMacCheck("00:D8:61:D7:1C:30")]
[assembly: ApplicationMacCheck("00:D8:61:D7:1C:31")]
[assembly: ApplicationMacCheck("04:ED:33:53:08:9F")]
[assembly: ApplicationMacCheck("04:ED:33:53:08:A3")]
// ------------------------------------------------------------------------------------
// 开发机:
[assembly: ApplicationMacCheck("00-2B-67-7C-4E-DA")]
[assembly: ApplicationMacCheck("3C-58-C2-D7-DC-15")]
[assembly: ApplicationMacCheck("3E-58-C2-D7-DC-14")]
[assembly: ApplicationMacCheck("3C-58-C2-D7-DC-14")]
[assembly: ApplicationMacCheck("00-01-00-01-26-62-61-CC-00-2B-67-7C-4E-DA")]
// ------------------------------------------------------------------------------------
// 环达 H2V-N1
[assembly: ApplicationMacCheck("04-7B-CB-46-0F-8E")]
[assembly: ApplicationMacCheck("00-01-00-01-2A-25-A7-FF-E0-4F-43-E6-5B-9F")]
// ------------------------------------------------------------------------------------
// 环达 H2V-N2
[assembly: ApplicationMacCheck("04-7B-CB-46-0D-C9")]
[assembly: ApplicationMacCheck("00-01-00-01-2A-25-95-B7-E0-4F-43-E6-5B-9F")]
// ------------------------------------------------------------------------------------
// 霄云中心 H2V-001
[assembly: ApplicationMacCheck("E0-4F-43-E6-4F-82")]
[assembly: ApplicationMacCheck("00-01-00-01-2A-33-A8-0D-E0-4F-43-E6-4F-82")]
// 霄云中心 H2V-002
[assembly: ApplicationMacCheck("E0-4F-43-E6-48-7C")]
[assembly: ApplicationMacCheck("00-01-00-01-2A-9B-9E-40-E0-4F-43-E6-48-7C")]
// =====================================================================================================
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment