Merge branch 'feature-1007583' into 'release'

过滤特殊的日志05

See merge request !93

MediaFaceImage.cpp

@@ -250,7 +250,7 @@ int MediaFaceImage::FaceImageCallBack(XSDK_HANDLE hMedia, int nChannel, cv::Mat
     const int BufferSize = 1024 * 1024 * 2; // 缓冲区大小
     const int BufferSize = 1024 * 1024 * 2; // 缓冲区大小
     image.release();                        // 释放之前的图像
     image.release();                        // 释放之前的图像
     std::unique_ptr<unsigned char[]> pOutBuffer(new unsigned char[BufferSize]); // 智能指针管理内存
     std::unique_ptr<unsigned char[]> pOutBuffer(new unsigned char[BufferSize]); // 智能指针管理内存
-    int pInOutBufferSize = 0;
+    int pInOutBufferSize = -1;
     
     
     int ret = XSDK_DevSnapSyn(hMedia, nChannel, "", pOutBuffer.get(), &pInOutBufferSize);
     int ret = XSDK_DevSnapSyn(hMedia, nChannel, "", pOutBuffer.get(), &pInOutBufferSize);
     if (ret < 0 || pInOutBufferSize <= 0) {
     if (ret < 0 || pInOutBufferSize <= 0) {

mainwindow.cpp

@@ -96,7 +96,6 @@ MainWindow::MainWindow():isResetting(false)
     NET_DVR_Init();
     NET_DVR_Init();
     hk_Device =-1;
     hk_Device =-1;
     this->nvr_status =config.nvrConfig.isOn;
     this->nvr_status =config.nvrConfig.isOn;
-    qInfo() << QString("nvr_status状态: %1").arg(config.nvrConfig.isOn ? "true" : "false");
     connect(this, SIGNAL(shutdownSignals(QString,int)), this, SLOT(clearHandle(QString,int)),Qt::QueuedConnection);
     connect(this, SIGNAL(shutdownSignals(QString,int)), this, SLOT(clearHandle(QString,int)),Qt::QueuedConnection);
     
     
     
     
@@ -578,7 +577,7 @@ void MainWindow::startCamera(const QString &httpurl){
     reStatus.mac=std::move(is_mac);
     reStatus.mac=std::move(is_mac);
     HttpService httpService(httpurl);
     HttpService httpService(httpurl);
     vides_data::response *re= httpService.httpFindCameras(serialNumber,devices);
     vides_data::response *re= httpService.httpFindCameras(serialNumber,devices);
-    qInfo() << QString("config.nvrConfig.isOn getDeviceStatus").arg(getDeviceStatus(hk_Device));
+
     if(config.nvrConfig.isOn && !getDeviceStatus(hk_Device) ){
     if(config.nvrConfig.isOn && !getDeviceStatus(hk_Device) ){
         nvr_status =true;
         nvr_status =true;
         loginNetDvr(config.nvrConfig.ip,config.nvrConfig.username,config.nvrConfig.password,config.nvrConfig.port);
         loginNetDvr(config.nvrConfig.ip,config.nvrConfig.username,config.nvrConfig.password,config.nvrConfig.port);