Browse Source

日志显示,修改缓冲区

master
sc 4 weeks ago
parent
commit
8d0b37f0e2
  1. 4
      UserClass/AsyncSerialPortClient.cs
  2. 26
      UserClass/AsyncTcpClient.cs
  3. 8
      View/MachinesView.xaml.cs

4
UserClass/AsyncSerialPortClient.cs

@ -262,6 +262,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
return EasyTask.CompletedTask; ; return EasyTask.CompletedTask; ;
}; };
await portclient.SetupAsync(new TouchSocketConfig() await portclient.SetupAsync(new TouchSocketConfig()
.SetMaxBufferSize(1024 * 1024 * 100)
.SetSerialPortOption(new SerialPortOption() .SetSerialPortOption(new SerialPortOption()
{ {
BaudRate = BAUD,//波特率 BaudRate = BAUD,//波特率
@ -274,7 +275,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
.ConfigurePlugins(a => .ConfigurePlugins(a =>
{ {
//a.Add<MyPlugin>(); //a.Add<MyPlugin>();
})); }
));
try try
{ {
await portclient.ConnectAsync(); await portclient.ConnectAsync();

26
UserClass/AsyncTcpClient.cs

@ -383,38 +383,24 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
//载入配置 //载入配置
await tcpClient.SetupAsync(new TouchSocketConfig() await tcpClient.SetupAsync(new TouchSocketConfig()
.SetMaxBufferSize(1024*1024) .SetMaxBufferSize(1024* 1024*100)
.SetMinBufferSize(1024*64) .SetMinBufferSize(1024*1024)
.SetRemoteIPHost(ip + ":" + port) .SetRemoteIPHost(ip + ":" + port)
.ConfigurePlugins(a => .ConfigurePlugins(a =>
{ {
//触发型重连
// a.UseTcpReconnection();
//使用Polling轮询连接插件 //使用Polling轮询连接插件
a.UseTcpReconnection() a.UseTcpReconnection()
.UsePolling(TimeSpan.FromSeconds(5)); .UsePolling(TimeSpan.FromSeconds(5));
}) })
.ConfigureContainer(a => .ConfigureContainer(a =>
{ {
// a.AddConsoleLogger();//添加一个日志注入
}));
// Result result = await
await tcpClient.TryConnectAsync();
// return result.IsSuccess;
/* try
{
await tcpClient.ConnectAsync();//调用连接,当连接不成功时,会抛出异常。
return true;
}
catch
{
return false;
}*/
}
}
));
await tcpClient.TryConnectAsync();
}
} }
} }

8
View/MachinesView.xaml.cs

@ -99,7 +99,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
} }
private void ListViewItem_LOG(object sender, MouseButtonEventArgs e) private void ListViewItem_LOG(object sender, MouseButtonEventArgs e)
{ {
if (LOG_ > 3) { LOG_ = 0; } if (LOG_ >= 3) { LOG_ = 0; }
else else
{ LOG_++; } { LOG_++; }
@ -108,29 +108,33 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
SYS_GRID.Visibility = Visibility.Collapsed; SYS_GRID.Visibility = Visibility.Collapsed;
SET_GRID.Visibility = Visibility.Collapsed; SET_GRID.Visibility = Visibility.Collapsed;
view = 3; view = 3;
LOG_dataTable.Clear();
Dictionary<string, object> dat_859 =new Dictionary<string, object>(); Dictionary<string, object> dat_859 =new Dictionary<string, object>();
if (LOG_ == 0) if (LOG_ == 0)
{ {
MAC_name.Text = machine+ "(SERVER)";
dat_859.Add("INSTRUCTION", "SERVER"); dat_859.Add("INSTRUCTION", "SERVER");
dat_859.Add("TIME_S", DateTime.Now.AddDays(-1).ToString("yyyy/MM/dd HH:mm:ss")); dat_859.Add("TIME_S", DateTime.Now.AddDays(-1).ToString("yyyy/MM/dd HH:mm:ss"));
dat_859.Add("TIME_E", DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")); dat_859.Add("TIME_E", DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"));
} }
else if (LOG_ == 1) else if (LOG_ == 1)
{ {
MAC_name.Text = machine + "(OperationLog)";
dat_859.Add("INSTRUCTION", "OperationLog"); dat_859.Add("INSTRUCTION", "OperationLog");
dat_859.Add("TIME_S", DateTime.Now.AddDays(-1).ToString("yyyy/MM/dd HH:mm:ss")); dat_859.Add("TIME_S", DateTime.Now.AddDays(-1).ToString("yyyy/MM/dd HH:mm:ss"));
dat_859.Add("TIME_E", DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")); dat_859.Add("TIME_E", DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"));
} }
else if (LOG_ == 2) else if (LOG_ == 2)
{ {
MAC_name.Text = machine + "(IOLog)";
dat_859.Add("INSTRUCTION", "IOLog"); dat_859.Add("INSTRUCTION", "IOLog");
dat_859.Add("TIME_S", DateTime.Now.AddDays(-1).ToString("yyyy/MM/dd HH:mm:ss")); dat_859.Add("TIME_S", DateTime.Now.AddDays(-1).ToString("yyyy/MM/dd HH:mm:ss"));
dat_859.Add("TIME_E", DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")); dat_859.Add("TIME_E", DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"));
} }
else else
{ {
MAC_name.Text = machine + "(ERRLog)";
dat_859.Add("INSTRUCTION", "ERRLog"); dat_859.Add("INSTRUCTION", "ERRLog");
dat_859.Add("TIME_S", DateTime.Now.AddDays(-1).ToString("yyyy/MM/dd HH:mm:ss")); dat_859.Add("TIME_S", DateTime.Now.AddDays(-1).ToString("yyyy/MM/dd HH:mm:ss"));
dat_859.Add("TIME_E", DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")); dat_859.Add("TIME_E", DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"));

Loading…
Cancel
Save