Merge branch 'feature-1007583' into 'release'

新增d92e8e4ff3912954走nvr

See merge request !99

CameraHandle.cpp

@@ -217,11 +217,12 @@ int XNetSDK_MediaCallBack(XSDK_HANDLE hMedia, int nDataType, int nDataLen, int n
             }
             }
         }
         }
     }
     }
-    
 }
 }
+
 int CameraHandle::sdkDevSetAlarmListener(XSDK_HANDLE hDevice, int bListener) {
 int CameraHandle::sdkDevSetAlarmListener(XSDK_HANDLE hDevice, int bListener) {
     return XSDK_DevSetAlarmListener(hDevice,bListener);
     return XSDK_DevSetAlarmListener(hDevice,bListener);
 }
 }
+
 void CameraHandle::setHkDevice(bool hk_status,int hk_Device){
 void CameraHandle::setHkDevice(bool hk_status,int hk_Device){
     this->hk_Device=hk_Device;
     this->hk_Device=hk_Device;
     this->hk_status=hk_status;
     this->hk_status=hk_status;
@@ -230,6 +231,7 @@ void CameraHandle::setHkDevice(bool hk_status,int hk_Device){
 int CameraHandle::getChannel(){
 int CameraHandle::getChannel(){
     return channel;
     return channel;
 }
 }
+
 int CameraHandle::getHdevice() {
 int CameraHandle::getHdevice() {
     return hDevice;
     return hDevice;
 }
 }
@@ -478,10 +480,10 @@ void CameraHandle::sdkDevSnapSyn(XSDK_HANDLE hDevice, int nChannel){
     MediaFaceImage* mediaFaceImage= MediaFaceImage::getInstance();
     MediaFaceImage* mediaFaceImage= MediaFaceImage::getInstance();
     qint64 currentTime= QDateTime::currentSecsSinceEpoch();
     qint64 currentTime= QDateTime::currentSecsSinceEpoch();
      int ret =-1;
      int ret =-1;
-    if(sSn!="9189806d008ac359"){
+    if(sSn!="9189806d008ac359" || sSn!="d92e8e4ff3912954"){
          ret=mediaFaceImage->FaceImageCallBack(hDevice,nChannel, image,sSn);
          ret=mediaFaceImage->FaceImageCallBack(hDevice,nChannel, image,sSn);
     }
     }
-    if (ret < 0 || image.empty()) {
+    if (ret < 0 ) {
         if(!hk_status){
         if(!hk_status){
           if(threeConsecutiveImage())return;
           if(threeConsecutiveImage())return;
         }else {
         }else {