Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer
This commit is contained in:
commit
d6eaa41db3
4 files changed
+57
-14
No files matched your search
@@ -15,6 +15,7 @@ using TouchSocket.Core;
|
||||
using TouchSocket.Sockets;
|
||||
using DyeingComputer.ViewModel;
|
||||
using System.Runtime.InteropServices;
|
||||
using ScottPlot.Colormaps;
|
||||
|
||||
namespace DyeingComputer.UserClass
|
||||
{/// <summary>
|
||||
@@ -25,14 +26,49 @@ namespace DyeingComputer.UserClass
|
||||
public static async Task Main()
|
||||
{
|
||||
TcpService service = new TcpService();
|
||||
service.Connecting = (client, e) => { return EasyTask.CompletedTask; };//有客户端正在连接
|
||||
service.Connected = (client, e) => { return EasyTask.CompletedTask; };//有客户端成功连接
|
||||
service.Closing = (client, e) => { return EasyTask.CompletedTask; };//有客户端正在断开连接,只有当主动断开时才有效。
|
||||
service.Closed = (client, e) => { return EasyTask.CompletedTask; };//有客户端断开连接
|
||||
service.Received = (client, e) =>
|
||||
{
|
||||
LogGing.LogSQLDATA("800", "TcpServer", "API:"+e.ByteBlock.Span.ToString(Encoding.ASCII));
|
||||
if (e.ByteBlock.Span.ToString(Encoding.ASCII) == "SC800") client.SendAsync(MainWindowViewModel.S01);
|
||||
if (e.ByteBlock.Span.ToString(Encoding.ASCII) == "SC801") client.SendAsync(MainWindowViewModel.S16.ToString());
|
||||
if (e.ByteBlock.Span.ToString(Encoding.ASCII) == "SC802") client.SendAsync(MainWindowViewModel.S03);
|
||||
if (e.ByteBlock.Span.ToString(Encoding.ASCII) == "SC803") client.SendAsync(MainWindowViewModel.S05);
|
||||
if (e.ByteBlock.Span.ToString(Encoding.ASCII) == "SC804") client.SendAsync(MainWindowViewModel.S06);
|
||||
string SYSAPI = e.ByteBlock.Span.ToString(Encoding.ASCII).Substring(0,5);
|
||||
LogGing.LogSQLDATA("800", "TcpServer", "API:"+ SYSAPI);
|
||||
if (SYSAPI == "SC800") client.SendAsync(MainWindowViewModel.S01);
|
||||
if (SYSAPI == "SC801") client.SendAsync(MainWindowViewModel.S16.ToString());
|
||||
if (SYSAPI == "SC802") client.SendAsync(MainWindowViewModel.S03);
|
||||
if (SYSAPI == "SC803") client.SendAsync(MainWindowViewModel.S05);
|
||||
if (SYSAPI == "SC804") client.SendAsync(MainWindowViewModel.S06);
|
||||
if (SYSAPI == "SC810")
|
||||
{
|
||||
|
||||
}
|
||||
if (SYSAPI == "SC820")
|
||||
{
|
||||
|
||||
}
|
||||
if (SYSAPI == "SC830")//当前信息
|
||||
{
|
||||
Dictionary<string, object> Chart_new = new Dictionary<string, object>();//缓存函数
|
||||
Chart_new.Add("DYELOT", MainWindowViewModel.WorkNumder);
|
||||
Chart_new.Add("Time", MainWindowViewModel.SYSTime);
|
||||
Chart_new.Add("MST", MainWindowViewModel.TEMP_co);
|
||||
Chart_new.Add("MTT", MainWindowViewModel.Selet_dtm("1010"));
|
||||
Chart_new.Add("MTL", MainWindowViewModel.Selet_dtm("1015"));
|
||||
Chart_new.Add("MTH", MainWindowViewModel.Selet_dtm("1009"));
|
||||
Chart_new.Add("MUT", MainWindowViewModel.Selet_dtm("1011"));
|
||||
Chart_new.Add("STTA", MainWindowViewModel.Selet_dtm("1012"));
|
||||
Chart_new.Add("STLA", MainWindowViewModel.Selet_dtm("1017"));
|
||||
Chart_new.Add("STTB", MainWindowViewModel.Selet_dtm("1013"));
|
||||
Chart_new.Add("STLB", MainWindowViewModel.Selet_dtm("1018"));
|
||||
Chart_new.Add("STTC", MainWindowViewModel.Selet_dtm("1014"));
|
||||
Chart_new.Add("STLC", MainWindowViewModel.Selet_dtm("1019"));
|
||||
client.SendAsync(Chart_new.ToJsonString());
|
||||
}
|
||||
if (SYSAPI == "SC851") client.SendAsync(MainWindowViewModel.dt_d.ToJsonString());//数字开关信息
|
||||
if (SYSAPI == "SC852") client.SendAsync(MainWindowViewModel.dt_a.ToJsonString());//寄存器信息
|
||||
if (SYSAPI == "SC853") client.SendAsync(MainWindowViewModel.dt_m.ToJsonString());//缓存信息
|
||||
|
||||
return EasyTask.CompletedTask;
|
||||
};
|
||||
|
||||
@@ -45,7 +81,8 @@ namespace DyeingComputer.UserClass
|
||||
.ConfigurePlugins(a =>
|
||||
{
|
||||
//a.Add<DifferentProtocolPlugin>();
|
||||
}));
|
||||
})
|
||||
);
|
||||
await service.StartAsync();//启动
|
||||
|
||||
LogGing.LogGingDATA("800SREVER:START");
|
||||
|
||||
@@ -48,7 +48,8 @@ namespace DyeingComputer.UserClass
|
||||
}
|
||||
}
|
||||
public static void LogSQLDATA(string NAME, string api, string dat)
|
||||
{if (!sqld)
|
||||
{
|
||||
if (!sqld)
|
||||
{
|
||||
sqld = true;
|
||||
SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
|
||||
|
||||
Reference in new issue
Block a user