sc/SunlightCentralizedControlManagement
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement

Browse Source
This commit is contained in:
sc committed 2024-11-26 23:51:59 +08:00
2 parents e8cd6f53a9 f8c008e4ab
commit 9bba26417c
2 files changed
+6 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UserClass/AsyncTcpClient.cs
+3 -2
View File
@@ -75,8 +75,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
//从服务器收到信息。但是一般byteBlock和requestInfo会根据适配器呈现不同的值。 //从服务器收到信息。但是一般byteBlock和requestInfo会根据适配器呈现不同的值。
string SYSAPI = e.ByteBlock.Span.ToString(Encoding.ASCII).Substring(0, 5); string SYSAPI = e.ByteBlock.Span.ToString(Encoding.ASCII).Substring(0, 5);
string DAT = e.ByteBlock.Span.ToString(Encoding.UTF8); string DAT = e.ByteBlock.Span.ToString(Encoding.UTF8);
if (SYSAPI == "SC800")
if (SYSAPI == "SC851") { }
else if (SYSAPI == "SC851")
{ {
DAT = DAT.Substring(DAT.IndexOf("]") + 1); DAT = DAT.Substring(DAT.IndexOf("]") + 1);
ViewModel/MainWindowViewModel.cs
+3 -7
View File
@@ -83,16 +83,12 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
{ {
for (int i = 0; i < Machinesdata_Count; i++) for (int i = 0; i < Machinesdata_Count; i++)
{ {
// if ( Selet_Machines(Machines,"State", i).ToString() =="801") if ( Selet_Machines(Machines,"State", i).ToString() =="801")
// MachiensTcpClient[i].SendAsync("SC800:SCCM["+ MachiensTcpClient[i].IP+";"+ MachiensTcpClient[i].Port+"]"); MachiensTcpClient[i].SendAsync("SC800:SCCM["+ MachiensTcpClient[i].IP+";"+ MachiensTcpClient[i].Port+"]");
MachiensTcpClient[1].SendAsync("SC851BED2E58B6EBB4BD4"); // MachiensTcpClient[1].SendAsync("SC851BED2E58B6EBB4BD4");
} }
// DataTable obj = JsonConvert.DeserializeObject<DataTable>(yt);//反序列化
} }
void DisTimer_500MS(object sender, EventArgs e)//Tick_Event周期执行事件500MS void DisTimer_500MS(object sender, EventArgs e)//Tick_Event周期执行事件500MS
{ {