g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-10-20 10:50:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

10.9.99

Browse Source
This commit is contained in:
Diego
2025-07-31 16:25:47 +08:00
parent d74e0952dc
commit badf61fe01
2 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Directory.Build.props
View File

@@ -3,7 +3,7 @@
<PropertyGroup>
<PluginVersion>10.9.94</PluginVersion>
<ProPluginVersion>10.9.93</ProPluginVersion>
<DefaultVersion>10.9.98</DefaultVersion>
<DefaultVersion>10.9.99</DefaultVersion>
<AuthenticationVersion>2.9.29</AuthenticationVersion>
<SourceGeneratorVersion>10.9.29</SourceGeneratorVersion>
<NET8Version>8.0.18</NET8Version>

43
src/Foundation/ThingsGateway.Foundation/Device/DeviceBase.cs
View File

@@ -575,12 +575,25 @@ public abstract class DeviceBase : DisposableObject, IDevice
var sendOperResult = await SendAsync(command, clientChannel, endPoint, cancellationToken).ConfigureAwait(false);
if (!sendOperResult.IsSuccess)
throw sendOperResult.Exception ?? new(sendOperResult.ErrorMessage ?? "unknown error");
return new MessageBase(sendOperResult);
waitData.SetCancellationToken(cancellationToken);
await waitData.WaitAsync(timeout).ConfigureAwait(false);
try
{
waitData.SetCancellationToken(Channel.ClosedToken);
await waitData.WaitAsync(timeout).ConfigureAwait(false);
}
catch (Exception ex)
{
if (cancellationToken.IsCancellationRequested)
{
if (!this.DisposedValue)
{
await Task.Delay(timeout, Channel.ClosedToken).ConfigureAwait(false);
}
}
return new MessageBase(ex);
}
var result = waitData.Check();
if (result.IsSuccess)
{
@@ -588,33 +601,11 @@ public abstract class DeviceBase : DisposableObject, IDevice
}
else
{
if (cancellationToken.IsCancellationRequested && result.Exception is OperationCanceledException)
{
waitData.Reset();
waitData.SetCancellationToken(CancellationToken.None);
await waitData.WaitAsync(timeout).ConfigureAwait(false);
result = waitData.Check();
if (result.IsSuccess)
{
return waitData.WaitResult;
}
else
{
return new MessageBase(result);
}
}
return new MessageBase(result);
}
}
catch (Exception ex)
{
if (cancellationToken.IsCancellationRequested)
{
if (!this.DisposedValue)
{
await Task.Delay(timeout, CancellationToken.None).ConfigureAwait(false);
}
}
return new MessageBase(ex);
}
finally