1、识别结果增加车厢开始结束时间

2、来车检测后，对来车状态改为存储在txt中，模型推理时读取来判定帧所对应的车厢状态

nvidia_ascend_engine/common/AppCommon.h

@@ -516,6 +516,7 @@ typedef struct
     uint64_t i64TimeStamp = 0;              //帧数据时间戳
     std::shared_ptr<DecodedData> pDecodeData = nullptr;
     int iDirection = 0;                     //行驶方向(0-未知; 1-向左; 2-向右)
+    int nMonitorState = MONITOR_MODEL_INIT_STATE;
 } SaveImgData;
 
 //识别处理数据

nvidia_ascend_engine/common_engine/MergerEngine/MergerAllEngine.cpp

@@ -113,6 +113,8 @@ void MergerAllEngine::PushData(std::shared_ptr<Train> pTrain)
             << "集装箱2: " << pTrain->container2.strContainerNo << "\n"
             << "集装箱2图片: " << pTrain->container2.strBestImg << "\n"
             << "集装箱2时间戳: " << pTrain->container2.i64TimeStamp << "\n"
+            << "车厢开始时间: " << MyUtils::getins()->Stamp2Time(pTrain->i64StartTimeStamp, true) << "\n"
+            << "车厢结束时间: " << MyUtils::getins()->Stamp2Time(pTrain->i64EndTimeStamp, true) << "\n"
             << " ---所有信息合并结果 END--- ";
     if (pTrain->bIsEnd)
     {

nvidia_ascend_engine/common_engine/SaveEngine/SaveImgEngine.cpp

@@ -154,6 +154,7 @@ APP_ERROR SaveImgEngine::Process()
             Json::Value jvFrameInfo;
             jvFrameInfo["timeStamp"] = pSaveImgData->i64TimeStamp;
             jvFrameInfo["status"] = iStatus;
+            jvFrameInfo["moveType"] = pSaveImgData->nMonitorState;
             jvFrameInfo["direction"] = pSaveImgData->iDirection;
             jvFrameInfo["width"] = iWidth;
             jvFrameInfo["height"] = iHeight;

nvidia_ascend_engine/common_engine/SocketEngine/SocketEngine.cpp

@@ -1,4 +1,4 @@
-#include "SocketEngine.h"
+#include "SocketEngine.h"
 
 
 

nvidia_ascend_engine/nvidia_engine/DecodeEngine/HardH264FFmpegDecode.cpp

@@ -190,7 +190,7 @@ int HardH264FFmpegDecode::HardH264FFmpegDecoderConfigureVideoFilters(AVFilterGra
     pDecoderFilterIn  = pFiltSrc;
     pDecoderFilterOut = pFiltDst;
 
-    fail:
+fail:
     return ret;
 }
 

nvidia_ascend_engine/nvidia_engine/MoveEngine/MoveEngine.cpp

@@ -211,6 +211,7 @@ void MoveEngine::SingleDeviceProcess(std::shared_ptr<ProcessData> pProcessData,
     pSaveImgData->bIsEnd = pProcessData->bIsEnd;
     pSaveImgData->bSaveToFtp = true;
     pSaveImgData->i64TimeStamp = pProcessData->i64TimeStamp;
+    pSaveImgData->nMonitorState = nType;
     outputQueMap_[strPort0_]->push(std::static_pointer_cast<void>(pSaveImgData));
 }