diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0EH/AFN14_F1_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0EH/AFN14_F1_Analysis.cs index 8676e55..b2177a6 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0EH/AFN14_F1_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0EH/AFN14_F1_Analysis.cs @@ -76,7 +76,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0EH { times.Reverse(); time = $"{DateTime.Now.ToString("yyyy").Substring(0, 2)}{times[0]}-{times[1]}-{times[2]} {times[3]}:{times[4]}:00"; - } catch { } return time; diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F1_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F1_Analysis.cs index ba3eba1..5f79647 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F1_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F1_Analysis.cs @@ -34,13 +34,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H { ArgumentNullException.ThrowIfNull(input); ArgumentNullException.ThrowIfNull(input.BaseHexMessage.HexMessageList); - ArgumentNullException.ThrowIfNull(input.UnitData.HexMessageList); + ArgumentNullException.ThrowIfNull(input.UnitData.HexMessageString); // TODO: 待定,等确认如何匹配规则 - string value = string.Join(" ", input.BaseHexMessage.HexMessageList!); + string value = input.UnitData.HexMessageString; if (value.Contains(F10TranspondMatch.ReadNormal)) { if (value.Contains(F10TranspondMatch.PowerHz))//电网频率 - await _analysisStrategyContext.ExecuteAsync("AFN16_F97_Analysis", input, dto => + await _analysisStrategyContext.ExecuteAsync(nameof(AFN16_F97_Analysis), input, dto => { result?.Invoke(dto); }); diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F97_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F97_Analysis.cs index 876c6fb..2589603 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F97_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F97_Analysis.cs @@ -58,7 +58,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H Data = data, HexMessage = input.BaseHexMessage.HexMessageString, MessageId = input.MessageId, - TimeDensity = 1,//密度-间隔分钟数, + TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Hour, ReceivedTime = input.ReceivedTime };