GithubStar/ThingsGateway
1
0
Fork 0
mirror of https://github.com/ThingsGateway/ThingsGateway.git synced 2026-10-17 05:07:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 通道多设备日志分类显示

Browse Source
This commit is contained in:
2248356998 qq.com
2025-10-24 17:46:24 +08:00
parent facf8bd401
commit b42f8afa35
8 changed files with 13 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Directory.Build.props
+3 -3
View File
@@ -1,9 +1,9 @@
<Project>
<PropertyGroup>
<PluginVersion>10.12.11</PluginVersion>
<ProPluginVersion>10.12.11</ProPluginVersion>
<DefaultVersion>10.12.11</DefaultVersion>
<PluginVersion>10.12.12</PluginVersion>
<ProPluginVersion>10.12.12</ProPluginVersion>
<DefaultVersion>10.12.12</DefaultVersion>
<AuthenticationVersion>10.11.7</AuthenticationVersion>
<SourceGeneratorVersion>10.11.7</SourceGeneratorVersion>
<NET8Version>8.0.21</NET8Version>
src/Foundation/ThingsGateway.Foundation/Channel/IClientChannel.cs
-1
View File
@@ -30,7 +30,6 @@ public interface IClientChannel : IChannel, ISender, IClient, IClientSender, IOn
WaitHandlePool<MessageBase> WaitHandlePool { get; }
WaitLock GetLock(string key);
void LogSeted(bool logSeted);
/// <summary>
/// 设置数据处理适配器
src/Foundation/ThingsGateway.Foundation/Channel/OtherChannel.cs
+2 -8
View File
@@ -80,13 +80,11 @@ public class OtherChannel : SetupConfigObject, IClientChannel
private bool logSet;
/// <inheritdoc/>
public void SetDataHandlingAdapterLogger(ILog log)
{
if (!logSet && ReadOnlyDataHandlingAdapter is IDeviceDataHandleAdapter handleAdapter)
if (ReadOnlyDataHandlingAdapter is IDeviceDataHandleAdapter handleAdapter)
{
logSet = true;
handleAdapter.Logger = log;
}
}
@@ -96,12 +94,8 @@ public class OtherChannel : SetupConfigObject, IClientChannel
if (adapter is SingleStreamDataHandlingAdapter singleStreamDataHandlingAdapter)
SetAdapter(singleStreamDataHandlingAdapter);
logSet = false;
}
public void LogSeted(bool logSeted)
{
logSet = logSeted;
}
/// <summary>
/// 设置数据处理适配器。
/// </summary>
src/Foundation/ThingsGateway.Foundation/Channel/SerialPortChannel.cs
+2 -8
View File
@@ -52,13 +52,11 @@ public class SerialPortChannel : SerialPortClient, IClientChannel
/// <inheritdoc/>
public DataHandlingAdapter ReadOnlyDataHandlingAdapter => ProtectedDataHandlingAdapter;
private bool logSet;
/// <inheritdoc/>
public void SetDataHandlingAdapterLogger(ILog log)
{
if (!logSet && ProtectedDataHandlingAdapter is IDeviceDataHandleAdapter handleAdapter)
if (ProtectedDataHandlingAdapter is IDeviceDataHandleAdapter handleAdapter)
{
logSet = true;
handleAdapter.Logger = log;
}
}
@@ -68,13 +66,9 @@ public class SerialPortChannel : SerialPortClient, IClientChannel
if (adapter is SingleStreamDataHandlingAdapter singleStreamDataHandlingAdapter)
SetAdapter(singleStreamDataHandlingAdapter);
logSet = false;
}
public void LogSeted(bool logSeted)
{
logSet = logSeted;
}
/// <inheritdoc/>
src/Foundation/ThingsGateway.Foundation/Channel/TcpClientChannel.cs
+2 -8
View File
@@ -34,12 +34,10 @@ public class TcpClientChannel : TcpClient, IClientChannel
WaitHandlePool = new WaitHandlePool<MessageBase>(minSign, maxSign);
pool?.CancelAll();
}
private bool logSet;
public void SetDataHandlingAdapterLogger(ILog log)
{
if (!logSet && DataHandlingAdapter is IDeviceDataHandleAdapter handleAdapter)
if (DataHandlingAdapter is IDeviceDataHandleAdapter handleAdapter)
{
logSet = true;
handleAdapter.Logger = log;
}
}
@@ -49,12 +47,8 @@ public class TcpClientChannel : TcpClient, IClientChannel
if (adapter is SingleStreamDataHandlingAdapter singleStreamDataHandlingAdapter)
SetAdapter(singleStreamDataHandlingAdapter);
logSet = false;
}
public void LogSeted(bool logSeted)
{
logSet = logSeted;
}
/// <inheritdoc/>
public ChannelReceivedEventHandler ChannelReceived { get; } = new();
src/Foundation/ThingsGateway.Foundation/Channel/TcpSessionClientChannel.cs
+2 -8
View File
@@ -25,13 +25,11 @@ public class TcpSessionClientChannel : TcpSessionClient, IClientChannel
public TcpSessionClientChannel()
{
}
private bool logSet;
/// <inheritdoc/>
public void SetDataHandlingAdapterLogger(ILog log)
{
if (!logSet && DataHandlingAdapter is IDeviceDataHandleAdapter handleAdapter)
if (DataHandlingAdapter is IDeviceDataHandleAdapter handleAdapter)
{
logSet = true;
handleAdapter.Logger = log;
}
}
@@ -41,12 +39,8 @@ public class TcpSessionClientChannel : TcpSessionClient, IClientChannel
if (adapter is SingleStreamDataHandlingAdapter singleStreamDataHandlingAdapter)
SetAdapter(singleStreamDataHandlingAdapter);
logSet = false;
}
public void LogSeted(bool logSeted)
{
logSet = logSeted;
}
public void ResetSign(int minSign = 1, int maxSign = ushort.MaxValue - 1)
{
var pool = WaitHandlePool;
src/Foundation/ThingsGateway.Foundation/Channel/UdpSessionChannel.cs
+2 -8
View File
@@ -30,27 +30,21 @@ public class UdpSessionChannel : UdpSession, IClientChannel
ResetSign();
}
public override TouchSocketConfig Config => base.Config ?? ChannelOptions.Config;
private bool logSet;
/// <inheritdoc/>
public void SetDataHandlingAdapterLogger(ILog log)
{
if (!logSet && DataHandlingAdapter is IDeviceDataHandleAdapter handleAdapter)
if (DataHandlingAdapter is IDeviceDataHandleAdapter handleAdapter)
{
logSet = true;
handleAdapter.Logger = log;
}
}
public void LogSeted(bool logSeted)
{
logSet = logSeted;
}
/// <inheritdoc/>
public void SetDataHandlingAdapter(DataHandlingAdapter adapter)
{
if (adapter is UdpDataHandlingAdapter udpDataHandlingAdapter)
SetAdapter(udpDataHandlingAdapter);
logSet = false;
}
src/Foundation/ThingsGateway.Foundation/Device/DeviceBase.cs
-8
View File
@@ -1060,10 +1060,6 @@ public abstract class DeviceBase : AsyncAndSyncDisposableObject, IDevice
}
Channel.Collects.Remove(this);
if (Channel is IClientChannel clientChannel)
{
clientChannel.LogSeted(false);
}
}
}
@@ -1118,10 +1114,6 @@ public abstract class DeviceBase : AsyncAndSyncDisposableObject, IDevice
Channel.Collects.Remove(this);
if (Channel is IClientChannel clientChannel)
{
clientChannel.LogSeted(false);
}
}