Merge remote-tracking branch 'origin/feature-1007479' into feature-1011006

8bd021ba · “liusq” · 22c70dd0 · 84cd25bb · 8bd021ba · 8bd021ba
Commit 8bd021ba authored Sep 18, 2024 by “liusq”
17 changed files
--- a/AlgorithmTaskManage.cpp
+++ b/AlgorithmTaskManage.cpp
@@ -153,7 +153,7 @@ void* AlgorithmTaskManage::schedulingAlgorithm(int scheType) {
    } else if (scheType == 0x03) {
        return schedulingAlgorithmTemplate(faceReconitionHandles, mtxFace);
    } else {
-        qInfo() << "参数错误";
+        qDebug() << "参数错误";
        return nullptr;
    }
 }
@@ -170,10 +170,10 @@ void AlgorithmTaskManage::executeFindDoesItExistEmployee(const cv::Mat &source,s
    if (selectedFaceReconition!=nullptr && !selectedFaceReconition->getImageChanged()) {
        selectedFaceReconition->setIsRunning(true);
        // 调用选定对象的doesItExistEmployee函数
-        qInfo() << "人脸识别算法抢到===>sn"<<sSn<<selectedFaceReconition;
+        qDebug() << "人脸识别算法抢到===>sn"<<sSn<<selectedFaceReconition;
-        selectedFaceReconition->doesItExistEmployee(source, faces);
+        selectedFaceReconition->doesItExistEmployee(sSn,source, faces);
    } else {
-        qInfo() << "没有可用的selectedFaceReconition对象可以调度";
+        qDebug() << "没有可用的selectedFaceReconition对象可以调度";
        return ;
    }
 }
@@ -192,10 +192,10 @@ void AlgorithmTaskManage::executeFindlicensePlateNumber(const cv::Mat &source, Q
    if (selectedLicensePlate!=nullptr) {
        selectedLicensePlate->setIsRunning(true);
        // 调用选定对象的findHuManCar函数
-        qInfo() << "车牌调度算法抢到===>sn"<<sSn<<selectedLicensePlate;
+        qDebug() << "车牌调度算法抢到===>sn"<<sSn<<selectedLicensePlate;
        selectedLicensePlate->licensePlateNumber(source, lpNumber,plate, currentTime);
    } else {
-        qInfo() << "没有可用的selectedLicensePlate对象可以调度";
+        qDebug() << "没有可用的selectedLicensePlate对象可以调度";
        return ;
    }
 }
@@ -214,11 +214,11 @@ int AlgorithmTaskManage::executeFindHuManCar(const cv::Mat &source, int res,
        selectedHumanDetection->setIsRunning(true);
        // 调用选定对象的findHuManCar函数
-        qInfo() << "人形调度算法抢到===>sn"<<sSn<<"res"<<selectedHumanDetection;
+        qDebug() << "人形调度算法抢到===>sn"<<sSn<<"res"<<selectedHumanDetection;
-        int detectionResult = selectedHumanDetection->findHuManCar(source, res,resMap, heightReference,currentPlate);
+        int detectionResult = selectedHumanDetection->findHuManCar(source, res,resMap, sSn,heightReference,currentPlate);
        return detectionResult;
    } else {
-        qInfo() << "没有可用的HumanDetection对象可以调度";
+        qDebug() << "没有可用的HumanDetection对象可以调度";
        return -2;
    }
 }
--- a/CameraHandle.cpp
+++ b/CameraHandle.cpp
--- a/CameraHandle.h
+++ b/CameraHandle.h
@@ -127,6 +127,10 @@ public:
    void setMediaHandle(int mediaHandle);
    void initAlgorithmPermissions(__uint8_t algorithm);
+    void initFaceFrequency(uint64 face_frequency);
    void initParkingSpaceInfo(const std::list<vides_data::responseArea>&areas);
    bool compareLists(const std::list<vides_data::responseArea>& newAreas);

--- a/FaceReconitionHandle.cpp
+++ b/FaceReconitionHandle.cpp
@@ -192,7 +192,7 @@ cv::Mat FaceReconitionHandle::loadImageFromByteStream(const QString& filePath) {
-void FaceReconitionHandle::doesItExistEmployee(const cv::Mat &source,std::list<vides_data::faceRecognitionResult>&faces){
+void FaceReconitionHandle::doesItExistEmployee(const QString &sn,const cv::Mat &source,std::list<vides_data::faceRecognitionResult>&faces){
    thread_time.store(QDateTime::currentMSecsSinceEpoch(), std::memory_order_release);
    ScopeSemaphoreExit streamGuard([this]() {
        isRunning.store(false, std::memory_order_release);
@@ -211,14 +211,14 @@ void FaceReconitionHandle::doesItExistEmployee(const cv::Mat &source,std::list<v
    ret = HF_CreateImageStream(&imageData, &imageSteamHandle);
    if (ret != HSUCCEED) {
-        qInfo()<<QString("image handle error:%1").arg((long) imageSteamHandle,0,10);
+        qInfo()<<QString("SN(%1): image handle error:%2").arg(sn).arg((long)imageSteamHandle,0,10);
        return ;
    }
    HF_MultipleFaceData multipleFaceData = {0};
    HF_FaceContextRunFaceTrack(ctxHandle, imageSteamHandle, &multipleFaceData);
    if (multipleFaceData.detectedNum <= 0) {
-        qInfo()<<QString("search 未检测到人脸");
+        qInfo()<<QString("SN(%1): 未检测到人脸").arg(sn);
        return ;
    }
@@ -227,11 +227,12 @@ void FaceReconitionHandle::doesItExistEmployee(const cv::Mat &source,std::list<v
    HInt32 featureNum;
    HF_GetFeatureLength(ctxHandle, &featureNum);
    for(int j=0;j< multipleFaceData.detectedNum; ++j){
-        qInfo()<<QString("doesItExistEmployee==>面部索引: %1").arg(j);
+        //qInfo()<<QString("doesItExistEmployee==>面部索引: %1").arg(j);
+        qDebug() << QString("SN(%1): 面部索引:%2").arg(sn).arg(j);
        std::vector<float> newfeature(featureNum,0.0f);
        ret = HF_FaceFeatureExtractCpy(ctxHandle, imageSteamHandle, multipleFaceData.tokens[j], newfeature.data());
        if(ret != HSUCCEED) {
-            qInfo()<<QString("特征提取出错: %1").arg(ret);
+            qInfo() << QString("SN(%1): 特征提取出错:%2").arg(sn).arg(ret);
            HF_ReleaseImageStream(imageSteamHandle);
            return ;
        }
@@ -248,13 +249,12 @@ void FaceReconitionHandle::doesItExistEmployee(const cv::Mat &source,std::list<v
        HFloat confidence;
        ret = HF_FeaturesGroupFeatureSearch(ctxHandle, feature, &confidence, &searchIdentity);
        if (ret != HSUCCEED) {
-            qInfo()<<QString("搜索失败: %1").arg(ret);
+            qInfo() << QString("SN(%1): 搜索失败:%2").arg(sn).arg(ret);
            return ;
        }
+        qInfo() << QString("SN(%1): 搜索置信度:%2").arg(sn).arg(confidence);
-        qInfo()<<QString("搜索置信度: %1").arg(confidence);
+        qInfo() << QString("SN(%1): 匹配到的tag:%2").arg(sn).arg(searchIdentity.tag);
-        qInfo()<<QString("匹配到的tag: %1").arg(searchIdentity.tag);
+        qInfo() << QString("SN(%1): 匹配到的customId:%2").arg(sn).arg(searchIdentity.customId);
-        qInfo()<<QString("匹配到的customId: %1").arg(searchIdentity.customId);
        // Face Pipeline
        //printf("人脸特征数量: %d", faceNum);
        if (confidence > configConfidence) {
@@ -275,7 +275,7 @@ void FaceReconitionHandle::doesItExistEmployee(const cv::Mat &source,std::list<v
        // printf("image released");
    } else {
        //printf("image release error: %ld", ret);
-        qInfo()<<QString("image release error: %1").arg(ret);
+        qInfo() << QString("SN(%1): image release error:%2").arg(sn).arg(ret);
    }
 }
--- a/FaceReconitionHandle.h
+++ b/FaceReconitionHandle.h
@@ -33,7 +33,7 @@ public:
    void setImageChanged(bool imageChanged);
-    void doesItExistEmployee(const cv::Mat &source,std::list<vides_data::faceRecognitionResult>&face);
+    void doesItExistEmployee(const QString &sn,const cv::Mat &source,std::list<vides_data::faceRecognitionResult>&face);
    void initSourceImageMap(std::map<QString,QString>&maps,int numberFaces,float confidence);

--- a/HttpService.cpp
+++ b/HttpService.cpp
@@ -354,11 +354,6 @@ vides_data::response *HttpService::httpPostFacePopulation(QByteArray &img,int &h
        resp->code=map["code"].toInt();
        resp->msg=map["message"].toString();
    }else{
-        qInfo()<<"httpPostFacePopulation===>";
-        qInfo()<<m_httpClient.errorCode();
-        qInfo()<<m_httpClient.errorString();
-        qInfo()<<"httpPostFacePopulation===>end";
        resp->code=2;
        resp->msg=m_httpClient.errorCode();
    }
@@ -511,7 +506,6 @@ vides_data::response *HttpService::httpDeviceConfig(const QString &serialNumber,
        QJsonObject faceConfigObj = dataObj["faceConfig"].toObject();
        config.faceConfig.isOn = faceConfigObj["isOn"].toBool();
        config.faceConfig.faceNumbers = faceConfigObj["faceNumbers"].toInt();
-        config.faceConfig.faceFrequency = faceConfigObj["faceFrequency"].toInt();
        config.faceConfig.confidence = faceConfigObj["confidence"].toVariant().toFloat();
        config.faceConfig.updateAt = faceConfigObj["updateAt"].toVariant().toULongLong();
        config.faceConfig.faceLen=faceConfigObj["faceLen"].toInt();
@@ -542,6 +536,7 @@ vides_data::response *HttpService::httpDeviceConfig(const QString &serialNumber,
        QJsonObject humanConfigObj = dataObj["humanConfig"].toObject();
        config.humanConfig.isOn=humanConfigObj["isOn"].toBool();
        config.humanConfig.updateAt = humanConfigObj["updateAt"].toVariant().toULongLong();
+        config.humanConfig.faceFrequency = humanConfigObj["faceFrequency"].toVariant().toUInt();
        // 解析 devicesConfig
        QJsonObject devicesConfigObj = dataObj["camera"].toObject();

--- a/HumanDetection.cpp
+++ b/HumanDetection.cpp
@@ -77,7 +77,7 @@ void HumanDetection::setHuManParameter(int &uniformColor){
 }
 //0 人形 1 车形 2 工服
-int HumanDetection::findHuManCar(const cv::Mat &source, int res,std::map<int,int>&reMap, float &heightReference, std::vector<vides_data::ParkingArea> &currentPlate) {
+int HumanDetection::findHuManCar(const cv::Mat &source, int res,std::map<int,int>&reMap,QString &sSn, float &heightReference, std::vector<vides_data::ParkingArea> &currentPlate) {
    thread_time.store(QDateTime::currentMSecsSinceEpoch(), std::memory_order_release);
    TCV_CameraStream *stream = TCV_CreateCameraStream();
@@ -100,8 +100,7 @@ int HumanDetection::findHuManCar(const cv::Mat &source, int res,std::map<int,int
    if (res == 0x00 || res == 0x02) {
        num = TCV_HumanDetectorGetNumOfHuman(detector);
-        qInfo()<<"TCV_HumanDetectorGetNumOfHuman==>"<<num;
+        qInfo() << QString("SN(%1): 获取人形数量:%2").arg(sSn).arg(num);
        if (num == 0) return num; // 无行人检测结果，提前返回
        std::vector<TCV_ObjectLocation> results(num);
        TCV_HumanDetectorGetHumanLocation(detector, results.data(), num);
@@ -133,8 +132,6 @@ int HumanDetection::findHuManCar(const cv::Mat &source, int res,std::map<int,int
        }
        reMap[0x02] = count_no_uniform; // 未穿工服的行人数量
        reMap[0x00] = count_all; // 所有满足条件的行人数量
-        qInfo()<<"count_all==>"<<count_all;
-        qInfo()<<"count_no_uniform==>"<<count_no_uniform;
        num = (res == 0x00) ? count_all : count_no_uniform;
    }

--- a/HumanDetection.h
+++ b/HumanDetection.h
@@ -16,7 +16,7 @@ public:
                   float carShapeConfidence);
    ~HumanDetection();
-    int findHuManCar(const cv::Mat &source,int res,std::map<int,int>&reMap,
+    int findHuManCar(const cv::Mat &source,int res,std::map<int,int>&reMap,QString &sSn,
                     float &heightReference,  std::vector<vides_data::ParkingArea> &currentPlate);
    void setHuManParameter(int &uniformColor);

--- a/LicensePlateRecognition.cpp
+++ b/LicensePlateRecognition.cpp
@@ -82,7 +82,6 @@ void LicensePlateRecognition::oldLicensePlateNumber(const cv::Mat &source,const 
        } else {
            type = types[results.plates[i].type];
        }
-        qInfo()<<QString("车牌号:%1").arg(results.plates[i].code);
        QString plateResult = QString("第%1个,%2,车牌号:%3,置信度:%4,左上角点x坐标:%5,左上角点y坐标:%6,右下角点x坐标:%7,右下角点y坐标:%8")
                .arg(i + 1).arg(type.c_str()).arg(results.plates[i].code)
                .arg(results.plates[i].text_confidence).arg(results.plates[i].x1, 0, 'Q', 4)
@@ -168,7 +167,6 @@ void LicensePlateRecognition::licensePlateNumber(const cv::Mat &source, QString 
        newPlate.new_color=QString::fromStdString(type);
        QString car_nuber=QString::fromUtf8(results.plates[i].code);
        replaceWith1And0(car_nuber);
-        qInfo()<<"I O (i o)大小写替换为 1 0结果:==>"<<car_nuber;
        newPlate.new_plate=car_nuber;
        newPlate.text_confidence=results.plates[i].text_confidence;
        vides_data::ParkingArea area;

--- a/LogHandle.h
+++ b/LogHandle.h
@@ -12,7 +12,7 @@
 #include <QTextStream>
 #include <QTextCodec>
-const int g_logLimitSize = 5;
+const int g_logLimitSize = 45;
 struct LogHandlerPrivate {
    LogHandlerPrivate();

--- a/LogHandler.cpp
+++ b/LogHandler.cpp
@@ -25,13 +25,13 @@ LogHandlerPrivate::LogHandlerPrivate() {
    openAndBackupLogFile();
    // 十分钟检查一次日志文件创建时间
-    renameLogFileTimer.setInterval(1000*2); // TODO: 可从配置文件读取
+    renameLogFileTimer.setInterval(1000 * 60 * 10); // TODO: 可从配置文件读取
    renameLogFileTimer.start();
    QObject::connect(&renameLogFileTimer, &QTimer::timeout, [this] {
        QMutexLocker locker(&LogHandlerPrivate::logMutex);
        openAndBackupLogFile(); // 打开日志文件
        checkLogFiles(); // 检测当前日志文件大小
-       // autoDeleteLog(); // 自动删除30天前的日志
+        // autoDeleteLog(); // 自动删除30天前的日志
    });
    // 定时刷新日志输出到文件，尽快的能在日志文件里看到最新的日志
@@ -91,10 +91,17 @@ void LogHandlerPrivate::openAndBackupLogFile() {
        logFile->close();
        delete logOut;
        delete logFile;
+        QDate renameDate = logFileCreatedDate;
+        if (logFileCreatedDate == QDate::currentDate()) {
+            renameDate = QDate::currentDate().addDays(-1);  // 设置为昨天的日期
+        }
-        QString newLogPath = logDir.absoluteFilePath(logFileCreatedDate.toString("yyyy-MM-dd.log"));
+        QString newLogPath = logDir.absoluteFilePath(renameDate.toString("yyyy-MM-dd.log"));
-        QFile::rename(logPath, newLogPath); // 将原始日志文件重命名为新的文件名
+        // QFile::rename(logPath, newLogPath); // 将原始日志文件重命名为新的文件名
+        QFile::copy(logPath, newLogPath);
+        QFile::remove(logPath);
        logFile = new QFile(logPath);
        logOut  = (logFile->open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append)) ?  new QTextStream(logFile) : nullptr;
        logFileCreatedDate = QDate::currentDate();
@@ -105,8 +112,8 @@ void LogHandlerPrivate::openAndBackupLogFile() {
 // 检测当前日志文件大小
 void LogHandlerPrivate::checkLogFiles() {
-    // 如果 protocal.log 文件大小超过5M，重新创建一个日志文件，原文件存档为yyyy-MM-dd_hhmmss.log
+    // 如果 protocal.log 文件大小超过55M，重新创建一个日志文件，原文件存档为yyyy-MM-dd_hhmmss.log
-    if (logFile->size() > 1024*g_logLimitSize) {
+    if (logFile->size() > 1024*1024*g_logLimitSize) {
        logFile->flush();
        logFile->close();
        delete logOut;
@@ -114,7 +121,11 @@ void LogHandlerPrivate::checkLogFiles() {
        QString logPath = logDir.absoluteFilePath("today.log"); // 日志的路径
        QString newLogPath = logDir.absoluteFilePath(logFileCreatedDate.toString("yyyy-MM-dd.log"));
-         QFile::rename(logPath, newLogPath);
+        // QFile::rename(logPath, newLogPath);
+        QFile::copy(logPath, newLogPath);
+        QFile::remove(logPath);
        logFile = new QFile(logPath);
        logOut  = (logFile->open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append)) ?  new QTextStream(logFile) : NULL;
        logFileCreatedDate = QDate::currentDate();

--- a/MediaFaceImage.cpp
+++ b/MediaFaceImage.cpp
@@ -62,7 +62,7 @@ static int sdkInitCallback(XSDK_HANDLE hObject, int nMsgId, int nParam1,
            auto taskCallBack=std::bind(&CameraHandle::callbackFunction, cameraHandle, hObject, qString);
            auto taskRunnable = new TaskRunnable(taskCallBack, hObject,cameraHandle->getChannel(), RunFunction::SdkCallbackFunction);
            threadPool->start(taskRunnable);
        }
    }
        break;
@@ -92,8 +92,8 @@ int MediaFaceImage::SdkSearchDevicesSyn(std::map<QString, vides_data::localDevic
        for (int i = 0; i < nActualCount; i++)
        {
            qInfo() << QString("[%1][IP:%2.%3.%4.%5][SN:%6][Mac:%7]")
-                        .arg(i)
+                       .arg(i)
-                        .arg(pRet[i].HostIP.c[0])
+                       .arg(pRet[i].HostIP.c[0])
                    .arg(pRet[i].HostIP.c[1])
                    .arg(pRet[i].HostIP.c[2])
                    .arg(pRet[i].HostIP.c[3])
@@ -230,54 +230,54 @@ int MediaFaceImage::ToFile(const char* pFileName, const void* pData, int nLength
 //    return pInOutBufferSize; // pOutBuffer由智能指针管理，此处无需手动释放
 //}
-int MediaFaceImage::FaceImageCallBack(XSDK_HANDLE hMedia, int nChannel, cv::Mat &image) {
+int MediaFaceImage::FaceImageCallBack(XSDK_HANDLE hMedia, int nChannel, cv::Mat &image,QString &sSn) {
    const int BufferSize = 1024 * 1024 * 2; // 缓冲区大小
    image.release();                        // 释放之前的图像
    std::unique_ptr<unsigned char[]> pOutBuffer(new unsigned char[BufferSize]); // 智能指针管理内存
    int pInOutBufferSize = 0;
    int ret = XSDK_DevSnapSyn(hMedia, nChannel, "", pOutBuffer.get(), &pInOutBufferSize);
    if (ret < 0 || pInOutBufferSize <= 0) {
-        qInfo() << "同步设备端抓图失败";
+        qInfo() << QString("SN(%1): 同步设备端抓图失败").arg(sSn);;
        return -1;
    }
    // 使用 std::vector 管理缓冲区数据
    std::vector<uchar> buffer(pInOutBufferSize);
    memcpy(buffer.data(), pOutBuffer.get(), pInOutBufferSize);
    try {
        cv::Mat decodedImage = cv::imdecode(buffer, cv::IMREAD_UNCHANGED);
        if (decodedImage.empty()) {
-            qInfo() << "图像解码失败";
+            qInfo() <<  QString("SN(%1): 图像解码失败").arg(sSn);;
            return -1;
        }
        image = std::move(decodedImage);
    } catch (const cv::Exception& e) {
-        qInfo() << "图像解码过程中捕获异常：" << e.what();
+        qInfo() << QString("SN(%1): 图像解码过程中捕获异常：%2").arg(sSn).arg(e.what());  
        return -1;
    }
    return pInOutBufferSize;
 }
 int MediaFaceImage::CameraImage(XSDK_HANDLE hMedia,int nChannel,std::vector<uchar> &buffer){
    static const int BufferSize = 1024 * 1024 * 2; // 2MB buffer size
    static unsigned char pOutBuffer[BufferSize];
    // 初始化为0，用于接收实际填充的大小
    int pInOutBufferSize = 0;
    // 尝试从设备获取快照数据
    int ret = XSDK_DevSnapSyn(hMedia, nChannel, "", pOutBuffer, &pInOutBufferSize);
    if (ret < 0 || pInOutBufferSize <= 0) {
        qInfo() << "同步设备端抓图失败";
        return -1; // 返回-1表示失败
    }
    // 用pOutBuffer里的数据初始化vector，复制数据到vector中
    buffer = std::vector<uchar>(pOutBuffer, pOutBuffer + pInOutBufferSize);
    // 返回实际填入Vector的数据大小
    return pInOutBufferSize;
 }

--- a/MediaFaceImage.h
+++ b/MediaFaceImage.h
@@ -18,7 +18,7 @@ public:
    static MediaFaceImage* getInstance();  // 单例模式获取实例的静态成员函数
    void ParserImageData(const unsigned char* pData, int nDataLen, char* pJpg, int* nJpgLen, char* pJson);
-    int FaceImageCallBack(XSDK_HANDLE hMedia,int nChannel,cv::Mat &image);
+    int FaceImageCallBack(XSDK_HANDLE hMedia,int nChannel,cv::Mat &image,QString &sSn);
    int CameraImage(XSDK_HANDLE hMedia,int nChannel,std::vector<uchar> &buffer);
    int ToFile(const char* pFileName, const void* pData, int nLenght);

--- a/ParkingSpaceInfo.cpp
+++ b/ParkingSpaceInfo.cpp
@@ -10,7 +10,6 @@ ParkingSpaceInfo::ParkingSpaceInfo(){
 }
 ParkingSpaceInfo::~ParkingSpaceInfo(){
    qInfo() <<  "ParkingSpaceInfo:关闭";
 }
 void ParkingSpaceInfo::addQueue(RecognizedInfo &info){
    QMutexLocker locker(&queueMutex);

--- a/VidesData.h
+++ b/VidesData.h
@@ -250,7 +250,6 @@ struct Camera {
 struct FaceConfig {
    bool isOn;
    int faceNumbers;
-    uint64 faceFrequency;
    float confidence;
    int faceLen;
    quint64 updateAt;
@@ -281,7 +280,7 @@ struct UniformConfig {
 };
 struct HumanConfig{
    bool isOn;
-    int humanDetectionLen;
+    uint64 faceFrequency;
    quint64 updateAt;
 };

--- a/gamera_videos.pro
+++ b/gamera_videos.pro
@@ -13,6 +13,8 @@ TEMPLATE = app
 # deprecated API in order to know how to port your code away from it.
 DEFINES += QT_DEPRECATED_WARNINGS
 DEFINES += APP_VERSION=\\\"1.3.2\\\"
+DEFINES += QT_MESSAGELOGCONTEXT
+DEFINES += QT_NO_DEBUG_OUTPUT
 QMAKE_LIBDIR += /usr/local/lib
@@ -24,6 +26,9 @@ INCLUDEPATH+=/usr/local/include/human
 INCLUDEPATH+=/usr/local/include/CImg
 INCLUDEPATH+=/usr/local/include/mqtt
 # 禁用所有警告
 QMAKE_CXXFLAGS += -w

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -557,7 +557,8 @@ void MainWindow::startCamera(const QString &httpurl){
                            reStatus.camera_info_list.push_front(camera_info);
                            __uint8_t new_algorithm= intToUint8t(devConfig.faceConfig.isOn,devConfig.licensePlateConfig.isOn,devConfig.uniformConfig.isOn,devConfig.humanConfig.isOn);
+                             uint64 face_frequency=devConfig.humanConfig.faceFrequency;
+                             offlineCameraHandle->initFaceFrequency(face_frequency);
                            offlineCameraHandle->cameraParameterUpdate(devConfig);
                            offlineCameraHandle->initAlgorithmPermissions(new_algorithm);
                            if(!offlineCameraHandle->compareLists(device.areas)){
@@ -724,7 +725,6 @@ void MainWindow::initEncodeToString(QString &enCodeJson) {
 }
 bool MainWindow::iniWorkSpVMn(vides_data::responseGb28181 *gb28181,QString &workSpWMn,QString &sn){
-    qInfo()<<"iniWorkSpVMn=="<<sn;
    QString jsonfile=QCoreApplication::applicationDirPath()+"/camera_config.json";
    bool isEqual=true;
@@ -975,8 +975,6 @@ __uint8_t MainWindow::intToUint8t(bool faceAlgorithm, bool licensePlateAlgorithm
    // 车牌识别对应最低位（第0位）
    result |= (licensePlateAlgorithm ? 1 : 0);
-    qInfo()<<"算法结果"<<result;
    return result;
 }
 void MainWindow::initCameras(vides_data::cameraParameters &parameter,vides_data::responseConfig &devConfig,const std::list<vides_data::responseArea>&areas,std::list<vides_data::requestCameraInfo>&camera_info_list){
@@ -988,9 +986,10 @@ void MainWindow::initCameras(vides_data::cameraParameters &parameter,vides_data:
    CameraHandle * cameraHandle =new CameraHandle(parameter.sDevId,parameter.httpUrl,parameter.sSn,parameter.channel,image_save,heightReference,devConfig);
    int sdk_handle=cameraHandle->sdkDevLoginSyn(parameter.sDevId,parameter.nDevPort,parameter.sUserName,parameter.sPassword,3000);
-    qInfo()<<"句柄为2:"<<sdk_handle;
+    qDebug() << QString("SN(%1): 句柄为%2").arg(parameter.sSn).arg(sdk_handle);
    if(sdk_handle<=0){
-        qInfo() << "登录失败";
+        qInfo() << QString("SN(%1): 登录失败").arg(parameter.sSn);
        return ;
    }
    mediaFaceImage->setMap(sdk_handle,cameraHandle);
@@ -1002,7 +1001,7 @@ void MainWindow::initCameras(vides_data::cameraParameters &parameter,vides_data:
    int synTime=devConfig.camera.devSnapSynTimer;
-    uint64 face_frequency=devConfig.faceConfig.faceFrequency;
+    uint64 face_frequency=devConfig.humanConfig.faceFrequency;
    float carConfidenceMax=devConfig.licensePlateConfig.carConfidenceMax;
    float carConfidenceMin=devConfig.licensePlateConfig.carConfidenceMin;
@@ -1019,7 +1018,7 @@ void MainWindow::initCameras(vides_data::cameraParameters &parameter,vides_data:
    camera_info_list.push_front(camera_info);
-    __uint8_t new_algorithm= (devConfig.faceConfig.isOn,devConfig.licensePlateConfig.isOn,devConfig.uniformConfig.isOn,devConfig.humanConfig.isOn);
+    __uint8_t new_algorithm= intToUint8t(devConfig.faceConfig.isOn,devConfig.licensePlateConfig.isOn,devConfig.uniformConfig.isOn,devConfig.humanConfig.isOn);
    cameraHandle->initAlgorithmPermissions(new_algorithm);
    cameraHandle->initParkingSpaceInfo(areas);