luosheng/Modbus.Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change TParamOut to class

Browse Source
This commit is contained in:
parallelbgls
2017-05-23 16:24:51 +08:00
parent 12500b5af2
commit ae2d085ba1
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modbus.Net/src/Base.Common/BaseProtocal.cs
View File

@@ -38,7 +38,7 @@ namespace Modbus.Net
/// 基本协议 /// 基本协议
/// </summary> /// </summary>
public abstract class BaseProtocal<TParamIn, TParamOut, TProtocalUnit> : public abstract class BaseProtocal<TParamIn, TParamOut, TProtocalUnit> :
IProtocal<TParamIn, TParamOut, TProtocalUnit> where TProtocalUnit : ProtocalUnit<TParamIn, TParamOut> IProtocal<TParamIn, TParamOut, TProtocalUnit> where TProtocalUnit : ProtocalUnit<TParamIn, TParamOut> where TParamOut : class
{ {
/// <summary> /// <summary>
/// 构造器 /// 构造器

2
Modbus.Net/src/Base.Common/BaseUtility.cs
View File

@@ -44,7 +44,7 @@ namespace Modbus.Net
/// 基础Api入口 /// 基础Api入口
/// </summary> /// </summary>
public abstract class BaseUtility<TParamIn, TParamOut, TProtocalUnit> : IUtilityProperty, IUtilityMethodData public abstract class BaseUtility<TParamIn, TParamOut, TProtocalUnit> : IUtilityProperty, IUtilityMethodData
where TProtocalUnit : ProtocalUnit<TParamIn, TParamOut> where TProtocalUnit : ProtocalUnit<TParamIn, TParamOut> where TParamOut : class
{ {
/// <summary> /// <summary>
/// 协议收发主体 /// 协议收发主体

8
Modbus.Net/src/Base.Common/ProtocalLinker.cs
View File

@@ -70,7 +70,7 @@ namespace Modbus.Net
/// <summary> /// <summary>
/// 基本的协议连接器 /// 基本的协议连接器
/// </summary> /// </summary>
public abstract class ProtocalLinker<TParamIn, TParamOut> : IProtocalLinker<TParamIn, TParamOut> public abstract class ProtocalLinker<TParamIn, TParamOut> : IProtocalLinker<TParamIn, TParamOut> where TParamOut : class
{ {
/// <summary> /// <summary>
/// 传输连接器 /// 传输连接器
@@ -106,8 +106,7 @@ namespace Modbus.Net
{ {
var extBytes = BytesExtend(content); var extBytes = BytesExtend(content);
var receiveBytes = await SendReceiveWithoutExtAndDecAsync(extBytes); var receiveBytes = await SendReceiveWithoutExtAndDecAsync(extBytes);
if (receiveBytes != null) return receiveBytes; return receiveBytes;
throw new NullReferenceException();
} }
/// <summary> /// <summary>
@@ -132,8 +131,7 @@ namespace Modbus.Net
//容错处理 //容错处理
var checkRight = CheckRight(receiveBytes); var checkRight = CheckRight(receiveBytes);
//返回字符 //返回字符
if (checkRight == true) return receiveBytes; return checkRight == true ? receiveBytes : null;
throw new NullReferenceException();
} }
/// <summary> /// <summary>