g82tt/KinginfoGateway
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update code collation

Browse Source
This commit is contained in:
2248356998 qq.com
2023-03-26 19:48:08 +08:00
parent 32b773a8fa
commit 6b96aff6e8
29 changed files with 66 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Plugins/ThingsGateway.Modbus/ModbusServer.cs
View File

@@ -170,11 +170,9 @@ namespace ThingsGateway.Modbus
IsFirst = false;
var list = Values.ToListWithDequeue();
await Task.Yield();
foreach (var item in list)
{
await _plc.WriteAsync(item.Item2.DataType, item.Item1, item.Item2.Value?.ToString());
//直接异步等待1s
}
await Task.Delay(100, cancellationToken);
}

5
src/Plugins/ThingsGateway.Siemens/S7_1200.cs
View File

@@ -1,7 +1,4 @@

using ThingsGateway.Foundation;
namespace ThingsGateway.Siemens
namespace ThingsGateway.Siemens
{
public class S7_1200 : S7
{

4
src/Plugins/ThingsGateway.Siemens/S7_1500.cs
View File

@@ -1,6 +1,4 @@
using ThingsGateway.Foundation;
namespace ThingsGateway.Siemens
namespace ThingsGateway.Siemens
{
public class S7_1500 : S7
{

4
src/Plugins/ThingsGateway.Siemens/S7_200.cs
View File

@@ -1,6 +1,4 @@
using ThingsGateway.Foundation;
namespace ThingsGateway.Siemens
namespace ThingsGateway.Siemens
{
public class S7_200 : S7
{

4
src/Plugins/ThingsGateway.Siemens/S7_200SMART.cs
View File

@@ -1,6 +1,4 @@
using ThingsGateway.Foundation;
namespace ThingsGateway.Siemens
namespace ThingsGateway.Siemens
{
public class S7_200SMART : S7
{

4
src/Plugins/ThingsGateway.Siemens/S7_300.cs
View File

@@ -1,6 +1,4 @@
using ThingsGateway.Foundation;
namespace ThingsGateway.Siemens
namespace ThingsGateway.Siemens
{
public class S7_300 : S7
{

4
src/Plugins/ThingsGateway.Siemens/S7_400.cs
View File

@@ -1,6 +1,4 @@
using ThingsGateway.Foundation;
namespace ThingsGateway.Siemens
namespace ThingsGateway.Siemens
{
public class S7_400 : S7
{

1
src/ThingsGateway.Foundation/TouchSocketEx/TGWaitData.cs
View File

@@ -123,7 +123,6 @@ namespace ThingsGateway.Foundation
/// <param name="millisecond"></param>
public async Task<WaitDataStatus> WaitAsync(int millisecond)
{
await Task.Yield();
var task = m_waitHandle.WaitOneAsync();
if (await Task.WhenAny(task, Task.Delay(millisecond)) != task)
{

2
src/ThingsGateway.Web.Foundation/HostServices/Core/Plugin/DriverBase.cs
View File

@@ -3,10 +3,8 @@
using System.Threading;
using ThingsGateway.Foundation;
using ThingsGateway.Foundation.Serial;
using TouchSocket.Core;
using TouchSocket.Sockets;
namespace ThingsGateway.Web.Foundation;
/// <summary>

2
src/ThingsGateway.Web.Foundation/Logging/TGRunTimeDatabaseLoggingWriter.cs
View File

@@ -4,8 +4,6 @@ using System.Collections.Concurrent;
using ThingsGateway.Core;
using TouchSocket.Core;
namespace ThingsGateway.Web.Foundation
{
/// <summary>

8
src/ThingsGateway.Web.Page/Page/DeviceStatusPage.razor
View File

@@ -55,12 +55,12 @@
<MTabItem>
<MRow NoGutters>
<MCol Md=2 Cols="12">
<MCard Class="ma-2" Style="height:100%">
<MCard Class="ma-2" Style="height: calc(100vh - 300px)">
<MCardTitle>
<MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="mx-2 my-1" @bind-Value="_collectDeviceGroupSearchName"
Outlined Label=@typeof(CollectDevice).GetDescription(nameof(CollectDevice.DeviceGroup)) />
</MCardTitle>
<MTreeview Dense TItem="string" TKey="string" ActiveChanged=@(async a=>
<MTreeview Style="height: calc(100vh - 320px);overflow-y:auto" Dense TItem="string" TKey="string" ActiveChanged=@(async a=>
{
if(_collectDeviceGroup!=a.FirstOrDefault())
{
@@ -114,12 +114,12 @@
<MTabItem>
<MRow>
<MCol Md=2 Cols="12">
<MCard Class="ma-2" Style="height:100%">
<MCard Class="ma-2" Style="height: calc(100vh - 300px)">
<MCardTitle>
<MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="mx-2 my-1" @bind-Value="_uploadDeviceGroupSearchName"
Outlined Label=@typeof(UploadDevice).GetDescription(nameof(UploadDevice.DeviceGroup)) />
</MCardTitle>
<MTreeview Dense TItem="string" TKey="string" ActiveChanged=@(async a=>
<MTreeview Style="height: calc(100vh - 320px);overflow-y:auto" Dense TItem="string" TKey="string" ActiveChanged=@(async a=>
{
if(_uploadDeviceGroup!=a.FirstOrDefault())
{

1
src/ThingsGateway.Web.Rcl.Core/Components/DataTable/AppDataTable.razor.cs
View File

@@ -192,7 +192,6 @@ namespace ThingsGateway.Web.Rcl.Core
{
QueryLoading = true;
StateHasChanged();
await Task.Yield();
PageItems = await QueryCall.Invoke(SearchModel);
Items = PageItems.Records;