Merge branch 'feature-1007488' into 'release'

Feature 1007488

See merge request !72

AlgorithmTaskManage.cpp

@@ -60,6 +60,8 @@ void AlgorithmTaskManage::initLicensePlateManage(const QString &modelPaths,bool
 }
 }
 void AlgorithmTaskManage::initFaceReconitionHandle(std::map<QString,QString>&maps,int numberFaces,float confidence){
 void AlgorithmTaskManage::initFaceReconitionHandle(std::map<QString,QString>&maps,int numberFaces,float confidence){
     for (int i = 0; i < faceLen; ++i) {
     for (int i = 0; i < faceLen; ++i) {
+        static int i11=0;
+        qInfo()<<"人脸initSourceImageMap次数"<<++i11;
         FaceReconitionHandle *faceReconitionHandle=  new FaceReconitionHandle();
         FaceReconitionHandle *faceReconitionHandle=  new FaceReconitionHandle();
         faceReconitionHandle->initSourceImageMap(maps,numberFaces,confidence);
         faceReconitionHandle->initSourceImageMap(maps,numberFaces,confidence);
         
         

FaceReconitionHandle.cpp

@@ -5,6 +5,7 @@
 #include <iostream>
 #include <iostream>
 
 
 #define cimg_display 0
 #define cimg_display 0
+#define cimg_use_jpeg
 
 
 #include "CImg.h"
 #include "CImg.h"
 using namespace cimg_library;
 using namespace cimg_library;

MqttSubscriber.cpp

@@ -80,7 +80,7 @@ void MqttSubscriber::start() {
     
     
     // 设置连接选项
     // 设置连接选项
     MQTTAsync_connectOptions conn_opts = MQTTAsync_connectOptions_initializer;
     MQTTAsync_connectOptions conn_opts = MQTTAsync_connectOptions_initializer;
-    conn_opts.keepAliveInterval = 20;
+    conn_opts.keepAliveInterval = 35;
     conn_opts.cleansession = 1;
     conn_opts.cleansession = 1;
     
     
     QByteArray bUsername = config.username.toUtf8();
     QByteArray bUsername = config.username.toUtf8();
@@ -165,7 +165,7 @@ void MqttSubscriber::onSubscribeFailure(MQTTAsync_failureData* response) {
 }
 }
 
 
 void MqttSubscriber::connectionLost(char* cause) {
 void MqttSubscriber::connectionLost(char* cause) {
-    qInfo() << "连接丢失";
+    qInfo() << "连接丢失"<<cause;
     if (cause) {
     if (cause) {
         qInfo() << "Cause:" << cause;
         qInfo() << "Cause:" << cause;
     }
     }

mainwindow.cpp

@@ -433,6 +433,8 @@ void MainWindow::updateLocalFace(const QString &httpurl) {
         if (cloudImageMap.empty()) {
         if (cloudImageMap.empty()) {
             // 如果云端映射现在为空，移除所有特征
             // 如果云端映射现在为空，移除所有特征
             //faceRecognition.featureRemove();
             //faceRecognition.featureRemove();
+            static int i11=0;
+            qInfo()<<"algorithmTaskManage.modifyImageFeature次数"<<++i11;
             algorithmTaskManage.modifyImageFeature(localImageMap,faceNumbers,confidence,true);
             algorithmTaskManage.modifyImageFeature(localImageMap,faceNumbers,confidence,true);
         } else {
         } else {
             //float confidence=qSetting->value("devices/confidence").toFloat();
             //float confidence=qSetting->value("devices/confidence").toFloat();
@@ -574,10 +576,6 @@ void MainWindow::startCamera(const QString &httpurl){
                     this->initCameras(parameter,devConfig,device.areas,reStatus.camera_info_list);
                     this->initCameras(parameter,devConfig,device.areas,reStatus.camera_info_list);
                 }
                 }
                 else {     
                 else {     
-                    CameraHandle *indexHandle=findHandle(device.sSn);
-                    if(indexHandle!=nullptr &&device.is_reboot){
-                        indexHandle->deviceReboot();
-                    }else {
                         auto it = this->faceDetectionParkingPushs.find(key);
                         auto it = this->faceDetectionParkingPushs.find(key);
                         if (it != this->faceDetectionParkingPushs.end()) {
                         if (it != this->faceDetectionParkingPushs.end()) {
                             CameraHandle* offlineCameraHandle = it->second; // 注意使用->second获取值
                             CameraHandle* offlineCameraHandle = it->second; // 注意使用->second获取值
@@ -616,7 +614,6 @@ void MainWindow::startCamera(const QString &httpurl){
                     
                     
                 }
                 }
         }
         }
-        }
         
         
         this->deleteCloudNotCamer(localDevices, devices.list);
         this->deleteCloudNotCamer(localDevices, devices.list);