Merge branch 'feature-1007583' into 'release'

过滤特殊的sn01

See merge request !88

CameraHandle.cpp

@@ -405,10 +405,8 @@ int CameraHandle::callbackFunction(XSDK_HANDLE hObject, QString &szString) {
     cv::Mat image;
     MediaFaceImage* mediaFaceImage= MediaFaceImage::getInstance();
     qint64 currentTime= QDateTime::currentSecsSinceEpoch();
-    if(sSn!="9189806d008ac359"){
-        mediaFaceImage->FaceImageCallBack(hObject,this->channel,image,sSn);
-    }
-    
+    mediaFaceImage->FaceImageCallBack(hObject,this->channel,image,sSn);
+
     if (image.empty())
     {
              qInfo() << "FaceImageCallBack抓图失败，尝试调用FaceHkImageCallBack";
@@ -479,18 +477,22 @@ void CameraHandle::sdkDevSnapSyn(XSDK_HANDLE hDevice, int nChannel){
     cv::Mat image;
     MediaFaceImage* mediaFaceImage= MediaFaceImage::getInstance();
     qint64 currentTime= QDateTime::currentSecsSinceEpoch();
-    int ret=mediaFaceImage->FaceImageCallBack(hDevice,nChannel, image,sSn);
+     int ret =-1;
+    if(sSn!="9189806d008ac359"){
+         ret=mediaFaceImage->FaceImageCallBack(hDevice,nChannel, image,sSn);
+    }
     if (ret < 0) {
         if(!hk_status){
           if(threeConsecutiveImage())return;
         }else {
             int hk_channel= mediaFaceImage->getIPChannelInfo(hk_Device,QString(loginParam->sDevId));
             if(hk_channel<0){
-                qInfo() <<QString("SN(%1): sdkDevSnapSyn 通过IP获取到对应通道号失败").arg(sSn);
+                qInfo() <<QString("SN(%1): NVR=>sdkDevSnapSyn 通过IP获取到对应通道号失败").arg(sSn);
                 return ;
             }
             int retHk = mediaFaceImage->FaceHkImageCallBack(hk_Device, hk_channel, image, sSn);
              if(retHk<0){
+                 qInfo() <<QString("SN(%1): NVR=>FaceHkImageCallBack 句柄获取图片失败").arg(sSn);
                  if(threeConsecutiveImage())return;
             }else {
                 // NVR抓图成功，则重置计数器