diff --git a/SensorHub.Noise/Noise.cs b/SensorHub.Noise/Noise.cs index f316062..3a4501b 100644 --- a/SensorHub.Noise/Noise.cs +++ b/SensorHub.Noise/Noise.cs @@ -59,7 +59,6 @@ //具体业务处理 String collectDate = ""; - String timestamp = ""; //16进制形式 int cell = -1; int? pci = null; int? rsrp = null; @@ -263,7 +262,6 @@ { byte[] responseFrame = buildAccelerationDataReceived(devCode, new byte[2] { 0x05, 0x82 }); string responseBase64 = Convert.ToBase64String(responseFrame); // 转成base64下发 - Common.SendAEPCommand(session, responseBase64, source); if (AccelerationDatas.accelerationDataSeqMap[devCode] == 0xFFFFFFFFFFFFFFFF) // 判断数据包是否完整接收 { @@ -301,9 +299,10 @@ AccelerationDatas.accelerationDataLowSeqMap.Remove(devCode); AccelerationDatas.accelerationDataValueMap.Remove(devCode); AccelerationDatas.accelerationDataFinishMap.Remove(devCode); - - return; } + + // 发送响应 + Common.SendAEPCommand(session, responseBase64, source); } return; } @@ -331,7 +330,8 @@ return; } - // Common.sendConfig(session, devCode, routeFlag, source, btPdu); + // 回复校时信息 + Common.sendConfig(session, devCode, routeFlag, source, btPdu); } private bool IsAccelerationDatafinished(String pduType) diff --git a/SensorHub.Noise/Noise.cs b/SensorHub.Noise/Noise.cs index f316062..3a4501b 100644 --- a/SensorHub.Noise/Noise.cs +++ b/SensorHub.Noise/Noise.cs @@ -59,7 +59,6 @@ //具体业务处理 String collectDate = ""; - String timestamp = ""; //16进制形式 int cell = -1; int? pci = null; int? rsrp = null; @@ -263,7 +262,6 @@ { byte[] responseFrame = buildAccelerationDataReceived(devCode, new byte[2] { 0x05, 0x82 }); string responseBase64 = Convert.ToBase64String(responseFrame); // 转成base64下发 - Common.SendAEPCommand(session, responseBase64, source); if (AccelerationDatas.accelerationDataSeqMap[devCode] == 0xFFFFFFFFFFFFFFFF) // 判断数据包是否完整接收 { @@ -301,9 +299,10 @@ AccelerationDatas.accelerationDataLowSeqMap.Remove(devCode); AccelerationDatas.accelerationDataValueMap.Remove(devCode); AccelerationDatas.accelerationDataFinishMap.Remove(devCode); - - return; } + + // 发送响应 + Common.SendAEPCommand(session, responseBase64, source); } return; } @@ -331,7 +330,8 @@ return; } - // Common.sendConfig(session, devCode, routeFlag, source, btPdu); + // 回复校时信息 + Common.sendConfig(session, devCode, routeFlag, source, btPdu); } private bool IsAccelerationDatafinished(String pduType) diff --git a/SensorHub.Servers/Common.cs b/SensorHub.Servers/Common.cs index c0d7515..86233f2 100644 --- a/SensorHub.Servers/Common.cs +++ b/SensorHub.Servers/Common.cs @@ -886,7 +886,7 @@ { if (routeFlag == "03") //GPRS,3G网络,电信平台 { - senderGPRSConfig(session, devCode, btPdu, source); + senderSM4Config(session, devCode, btPdu, source); } else if (routeFlag == "01") //433 {