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

2015-11-23 update 1 continue fix bugs in fboxconnection

Browse Source
This commit is contained in:
parallelbgls@outlook.com
2015-11-23 15:04:29 +08:00
parent 2783426536
commit 6c5048a85c
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Modbus.Net/ModBus.Net/FBox/SignalRConnector.cs
View File

@@ -236,12 +236,19 @@ namespace ModBus.Net.FBox
_boxUidSessionId[getBoxUid] = sessionId; _boxUidSessionId[getBoxUid] = sessionId;
_httpClient2[getBoxUid].DefaultRequestHeaders.Remove("X-FBox-Session"); _httpClient2[getBoxUid].DefaultRequestHeaders.Remove("X-FBox-Session");
_httpClient2[getBoxUid].DefaultRequestHeaders.Add("X-FBox-Session", sessionId.ToString()); _httpClient2[getBoxUid].DefaultRequestHeaders.Add("X-FBox-Session", sessionId.ToString());
_hubConnections[getBoxUid].Headers.Remove("X-FBox-Session");
_hubConnections[getBoxUid].Headers.Add("X-FBox-Session", sessionId.ToString());
_hubConnections[getBoxUid].Stop();
await _hubConnections[getBoxUid].Start();
if (newStatus == 1 && IsConnected) if (newStatus == 1 && IsConnected)
{ {
var localDataGroups = _boxUidDataGroups[getBoxUid]; var localDataGroups = _boxUidDataGroups[getBoxUid];
foreach (var localDataGroup in localDataGroups) foreach (var localDataGroup in localDataGroups)
{ {
await
_httpClient2[getBoxUid].PostAsync(
"dmon/group/" + localDataGroup.Uid + "/stop", null);
await await
_httpClient2[getBoxUid].PostAsync( _httpClient2[getBoxUid].PostAsync(
"dmon/group/" + localDataGroup.Uid + "/start", null); "dmon/group/" + localDataGroup.Uid + "/start", null);
@@ -288,8 +295,6 @@ namespace ModBus.Net.FBox
_httpClient2.Add(boxUid, client2); _httpClient2.Add(boxUid, client2);
} }
if (!_machineDataType.ContainsKey(groupName)) if (!_machineDataType.ContainsKey(groupName))
{ {
_machineDataType.Add(groupName, new Dictionary<string, Type>()); _machineDataType.Add(groupName, new Dictionary<string, Type>());
@@ -446,6 +451,7 @@ namespace ModBus.Net.FBox
{ {
if (!_machineData.ContainsKey(ConnectionToken) || !_machineDataType.ContainsKey(ConnectionToken)) if (!_machineData.ContainsKey(ConnectionToken) || !_machineDataType.ContainsKey(ConnectionToken))
{ {
//Console.WriteLine("Return Value Rejected");
return null; return null;
} }
var machineDataValue = _machineData[ConnectionToken]; var machineDataValue = _machineData[ConnectionToken];