dev #2

Merged
admin merged 176 commits from dev into master 2025-04-18 01:31:49 +00:00
Showing only changes of commit 8f2aeee59f - Show all commits

View File

@ -27,19 +27,28 @@ namespace JiShe.CollectBus.Protocol
var aTuple = (Tuple<string, int>)hexStringList.GetAnalyzeValue(CommandChunkEnum.A); var aTuple = (Tuple<string, int>)hexStringList.GetAnalyzeValue(CommandChunkEnum.A);
var afn = (int)hexStringList.GetAnalyzeValue(CommandChunkEnum.AFN); var afn = (int)hexStringList.GetAnalyzeValue(CommandChunkEnum.AFN);
var fn = (int)hexStringList.GetAnalyzeValue(CommandChunkEnum.FN); var fn = (int)hexStringList.GetAnalyzeValue(CommandChunkEnum.FN);
if (afn == (int)AFN.) switch ((AFN)afn)
{ {
case AFN.:
AnalyzeAnswerDataAsync(messageReceived, sendAction);
break;
case AFN.: break;
case AFN.: break;
case AFN.:
if (Enum.IsDefined(typeof(ATypeOfDataItems), fn)) //Enum.TryParse(afn.ToString(), out ATypeOfDataItems parseResult) if (Enum.IsDefined(typeof(ATypeOfDataItems), fn)) //Enum.TryParse(afn.ToString(), out ATypeOfDataItems parseResult)
{ {
AnalyzeReadingDataAsync(messageReceived, sendAction); AnalyzeReadingDataAsync(messageReceived, sendAction);
} }
} break;
else if(afn == (int)AFN.) case AFN.:
{
if (Enum.IsDefined(typeof(IIdataTypeItems), fn)) if (Enum.IsDefined(typeof(IIdataTypeItems), fn))
{ {
AnalyzeReadingTdcDataAsync(messageReceived, sendAction); AnalyzeReadingTdcDataAsync(messageReceived, sendAction);
} }
break;
case AFN.:
AnalyzeTransparentForwardingAnswerAsync(messageReceived, sendAction);
break;
} }
throw new NotImplementedException(); throw new NotImplementedException();