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

Class/TcpServer.cs

@@ -1,7 +1,10 @@
-using System;
+using Microsoft.VisualBasic;
+using SunlightAggregationTerminal.Models;
+using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
+using System.Reflection.PortableExecutable;
 using System.Text;
 using System.Text.Json;
 using TouchSocket.Core;
@@ -38,6 +41,7 @@ namespace SunlightAggregationTerminal.Class
         public static string ServerPassword = "";
         public static string ServerTerminal = "";
 
+
         public static TouchSocket.Sockets.TcpClient tcpClient = new TouchSocket.Sockets.TcpClient();
 
         public static void Configuration(string ip, string Name, string Password, string Terminal)
@@ -77,7 +81,7 @@ namespace SunlightAggregationTerminal.Class
         {
             tcpClient.Connecting = (client, e) => { return EasyTask.CompletedTask; };//即将连接到服务器，此时已经创建socket，但是还未建立tcp
             tcpClient.Connected = (client, e) => {
-                TcpServer.TcpTransmit("Log");
+                TcpServer.TcpTransmit("\"{\"Command\":\"Log\"}\"");
                 return EasyTask.CompletedTask; };//成功连接到服务器
             tcpClient.Closing = (client, e) => { return EasyTask.CompletedTask; };//即将从服务器断开连接。此处仅主动断开才有效。
             tcpClient.Closed = (client, e) => { return EasyTask.CompletedTask; };//从服务器断开连接，当连接不成功时不会触发。
@@ -102,6 +106,8 @@ namespace SunlightAggregationTerminal.Class
                         {
                             App.GlobalData.UserId = val.ToString() ?? "";
                             App.GlobalData.LogNo = true;
+
+                            TcpServer.TcpTransmit("{\"Command\":\"Info\"}");
                         }
 
                         if (data.TryGetValue("UserData", out var value_UserData))
@@ -113,7 +119,12 @@ namespace SunlightAggregationTerminal.Class
 
                         }
 
+                        if (data.TryGetValue("Info", out val) && val != null)//机台信息接受
+                        {
+                            DataModel.Info_data = JsonSerializer.Deserialize<List<Dictionary<string, object>>>(val.ToString()!)!;
 
+                            InfoPage.OnInfoPage();
+                        }                            
                         if (data.TryGetValue("Query", out val) && val != null)//查询接受
                         {
                             QueryPage.Query_data(val.ToString()!);