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

UserClass/AsyncTcpClient.cs

@@ -75,8 +75,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
                 //从服务器收到信息。但是一般byteBlock和requestInfo会根据适配器呈现不同的值。
                 string SYSAPI = e.ByteBlock.Span.ToString(Encoding.ASCII).Substring(0, 5);
                 string DAT = e.ByteBlock.Span.ToString(Encoding.UTF8);
-
+                if (SYSAPI == "SC800")
-                if (SYSAPI == "SC851")
+                { }
+                else if (SYSAPI == "SC851")
                 {
                     DAT = DAT.Substring(DAT.IndexOf("]") + 1);
 

ViewModel/MainWindowViewModel.cs

@@ -83,16 +83,12 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
         {
             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
         {