From 6c5048a85cd2bcc07d7e76d1d694b77a1b48d1cd Mon Sep 17 00:00:00 2001 From: "parallelbgls@outlook.com" Date: Mon, 23 Nov 2015 15:04:29 +0800 Subject: [PATCH] 2015-11-23 update 1 continue fix bugs in fboxconnection --- Modbus.Net/ModBus.Net/FBox/SignalRConnector.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Modbus.Net/ModBus.Net/FBox/SignalRConnector.cs b/Modbus.Net/ModBus.Net/FBox/SignalRConnector.cs index 499a024..13aa9d5 100644 --- a/Modbus.Net/ModBus.Net/FBox/SignalRConnector.cs +++ b/Modbus.Net/ModBus.Net/FBox/SignalRConnector.cs @@ -236,12 +236,19 @@ namespace ModBus.Net.FBox _boxUidSessionId[getBoxUid] = sessionId; _httpClient2[getBoxUid].DefaultRequestHeaders.Remove("X-FBox-Session"); _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) { var localDataGroups = _boxUidDataGroups[getBoxUid]; foreach (var localDataGroup in localDataGroups) { + await + _httpClient2[getBoxUid].PostAsync( + "dmon/group/" + localDataGroup.Uid + "/stop", null); await _httpClient2[getBoxUid].PostAsync( "dmon/group/" + localDataGroup.Uid + "/start", null); @@ -288,8 +295,6 @@ namespace ModBus.Net.FBox _httpClient2.Add(boxUid, client2); } - - if (!_machineDataType.ContainsKey(groupName)) { _machineDataType.Add(groupName, new Dictionary()); @@ -446,6 +451,7 @@ namespace ModBus.Net.FBox { if (!_machineData.ContainsKey(ConnectionToken) || !_machineDataType.ContainsKey(ConnectionToken)) { + //Console.WriteLine("Return Value Rejected"); return null; } var machineDataValue = _machineData[ConnectionToken];