Merge branch 'variablePage' of https://gitee.com/ThingsGateway/ThingsGateway into variablePage
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
//------------------------------------------------------------------------------
|
||||
//------------------------------------------------------------------------------
|
||||
// 此代码版权声明为全文件覆盖,如有原作者特别声明,会在下方手动补充
|
||||
// 此代码版权(除特别声明外的代码)归作者本人Diego所有
|
||||
// 源代码使用协议遵循本仓库的开源协议及附加协议
|
||||
@@ -477,7 +477,7 @@ public class ConcurrentList<T> : IList<T>, IReadOnlyList<T>
|
||||
{
|
||||
lock (((ICollection)m_list).SyncRoot)
|
||||
{
|
||||
return m_list.IndexOf(item);
|
||||
return m_list.LastIndexOf(item);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -1,9 +1,9 @@
|
||||
<Project>
|
||||
|
||||
<PropertyGroup>
|
||||
<PluginVersion>10.11.107</PluginVersion>
|
||||
<ProPluginVersion>10.11.107</ProPluginVersion>
|
||||
<DefaultVersion>10.11.107</DefaultVersion>
|
||||
<PluginVersion>10.11.108</PluginVersion>
|
||||
<ProPluginVersion>10.11.108</ProPluginVersion>
|
||||
<DefaultVersion>10.11.108</DefaultVersion>
|
||||
<AuthenticationVersion>10.11.6</AuthenticationVersion>
|
||||
<SourceGeneratorVersion>10.11.6</SourceGeneratorVersion>
|
||||
<NET8Version>8.0.21</NET8Version>
|
||||
|
@@ -118,20 +118,20 @@ public partial class SiemensS7Master : DeviceBase
|
||||
return new DeviceSingleStreamDataHandleAdapter<S7Message>
|
||||
{
|
||||
CacheTimeout = TimeSpan.FromMilliseconds(Channel.ChannelOptions.CacheTimeout),
|
||||
IsSingleThread = false
|
||||
//IsSingleThread = false
|
||||
};
|
||||
|
||||
case ChannelTypeEnum.UdpSession:
|
||||
return new DeviceUdpDataHandleAdapter<S7Message>()
|
||||
{
|
||||
IsSingleThread = false
|
||||
//IsSingleThread = false
|
||||
};
|
||||
}
|
||||
|
||||
return new DeviceSingleStreamDataHandleAdapter<S7Message>
|
||||
{
|
||||
CacheTimeout = TimeSpan.FromMilliseconds(Channel.ChannelOptions.CacheTimeout),
|
||||
IsSingleThread = false
|
||||
//IsSingleThread = false
|
||||
};
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user