Merge branch 'feature-1007583' into 'release'

完善NVR处理01

See merge request !95

CameraHandle.cpp

@@ -481,8 +481,7 @@ void CameraHandle::sdkDevSnapSyn(XSDK_HANDLE hDevice, int nChannel){
     if(sSn!="9189806d008ac359"){
          ret=mediaFaceImage->FaceImageCallBack(hDevice,nChannel, image,sSn);
     }
-    qInfo() <<QString("SN(%1): NVR=>sdkDevSnapSyn 通过IP获取到对应通道号").arg(sSn);
-    if (ret < 0) {
+    if (ret < 0 || image.empty()) {
         if(!hk_status){
           if(threeConsecutiveImage())return;
         }else {

mainwindow.cpp

@@ -583,8 +583,12 @@ void MainWindow::startCamera(const QString &httpurl){
     vides_data::response *re= httpService.httpFindCameras(serialNumber,devices);
 
     if(config.nvrConfig.isOn && !getDeviceStatus(hk_Device) ){
-        nvr_status =true;
-        loginNetDvr(config.nvrConfig.ip,config.nvrConfig.username,config.nvrConfig.password,config.nvrConfig.port);
+        int res= loginNetDvr(config.nvrConfig.ip,config.nvrConfig.username,config.nvrConfig.password,config.nvrConfig.port);
+        if( res<0 ){
+             nvr_status =false;
+        }else{
+            nvr_status =true;
+        }
     }else if(!config.nvrConfig.isOn){
         nvr_status = false;
     }