Merge branch 'feature-1007583' into 'release'

过滤特殊的sn02

See merge request !89

CameraHandle.cpp

@@ -477,7 +477,7 @@ void CameraHandle::sdkDevSnapSyn(XSDK_HANDLE hDevice, int nChannel){
     cv::Mat image;
     cv::Mat image;
     MediaFaceImage* mediaFaceImage= MediaFaceImage::getInstance();
     MediaFaceImage* mediaFaceImage= MediaFaceImage::getInstance();
     qint64 currentTime= QDateTime::currentSecsSinceEpoch();
     qint64 currentTime= QDateTime::currentSecsSinceEpoch();
-     int ret =-1;
+     int ret =0;
     if(sSn!="9189806d008ac359"){
     if(sSn!="9189806d008ac359"){
          ret=mediaFaceImage->FaceImageCallBack(hDevice,nChannel, image,sSn);
          ret=mediaFaceImage->FaceImageCallBack(hDevice,nChannel, image,sSn);
     }
     }

mainwindow.cpp

@@ -179,9 +179,9 @@ bool MainWindow::getDeviceStatus(int UserId) {
     if(UserId<0)return  false;
     if(UserId<0)return  false;
     bool devStatus =NET_DVR_RemoteControl(UserId, NET_DVR_CHECK_USER_STATUS, nullptr, 0);
     bool devStatus =NET_DVR_RemoteControl(UserId, NET_DVR_CHECK_USER_STATUS, nullptr, 0);
     if (devStatus) {
     if (devStatus) {
-        qInfo() << "设备在线";
+        qInfo() << "NET_DVR_RemoteControl 设备在线";
     } else {
     } else {
-        qInfo() << "设备不在线";
+        qInfo() << "NET_DVR_RemoteControl 设备不在线";
     }
     }
     return devStatus;
     return devStatus;
 }
 }