zhunk 1 éve
szülő
commit
f53325d9e4

+ 3 - 16
q6_felgo_iot/header/app_curlFunc.h

@@ -5,10 +5,6 @@
 #include <QObject>
 #include <QObject>
 #include <QString>
 #include <QString>
 #include <curl/curl.h>
 #include <curl/curl.h>
-#include <QFuture>
-#include <QQueue>
-#include <QAtomicInt>
-
 
 
 class CurlFtpUploader : public QObject
 class CurlFtpUploader : public QObject
 {
 {
@@ -26,29 +22,20 @@ public:
                       const QString &remotePath);
                       const QString &remotePath);
 
 
     // 异步上传文件(非阻塞)
     // 异步上传文件(非阻塞)
-    //void uploadFileAsync(const QString &localFilePath);
-public slots:
-    void uploadFilesAsync(const QStringList &filePaths);
+    void uploadFileAsync(const QString &localFilePath);
+
 signals:
 signals:
     void progressChanged(double uploadedPercent);  // 进度百分比 (0.0 ~ 100.0)
     void progressChanged(double uploadedPercent);  // 进度百分比 (0.0 ~ 100.0)
-    void progressChanged_file(const QString &currentFile, double percent);
     void finished(bool success, const QString &error); // 完成信号
     void finished(bool success, const QString &error); // 完成信号
-    void allUploadsFinished();
-    void fileUploaded(const QString &filePath);
 
 
 private:
 private:
-    QMutex m_queueMutex;
-    QQueue<QString> m_uploadQueue;
-    QString m_currentUploadingFile;
-
-    void processNextFile();
     // 静态回调函数(供 CURL 调用)
     // 静态回调函数(供 CURL 调用)
     static size_t readCallback(char *buffer, size_t size, size_t nitems, void *userdata);
     static size_t readCallback(char *buffer, size_t size, size_t nitems, void *userdata);
     static int progressCallback(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow);
     static int progressCallback(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow);
 
 
     // 内部上传逻辑
     // 内部上传逻辑
     void performUpload(const QString &localFilePath);
     void performUpload(const QString &localFilePath);
-    QFuture<void> ftp_Thread;
+
     // FTP 参数
     // FTP 参数
     QString m_username;
     QString m_username;
     QString m_password;
     QString m_password;

+ 4 - 1
q6_felgo_iot/header/cameramanager.h

@@ -236,7 +236,8 @@ signals:
     void signal_photoerr();
     void signal_photoerr();
     void stopGrabbing(bool sta_cam);
     void stopGrabbing(bool sta_cam);
 
 
-    void signal_photo_saved(const QStringList &piclist);
+    void signal_photo_saved();
+    void signal_wait_upload(const QString &path);
 public slots:
 public slots:
 
 
     void onMovDone(){
     void onMovDone(){
@@ -326,6 +327,8 @@ public slots:
         #endif
         #endif
     }
     }
     void parseFrame(const cv::Mat& frame);
     void parseFrame(const cv::Mat& frame);
+    void upload_handle(void);
+    void handle_reult_upload(bool success, const QString &error);
 #if 0
 #if 0
     void sendImage(QImage frame);
     void sendImage(QImage frame);
 #endif
 #endif

+ 21 - 79
q6_felgo_iot/src/app_curlFunc.cpp

@@ -3,24 +3,10 @@
 #include <QFileInfo>  // 添加此行
 #include <QFileInfo>  // 添加此行
 #include <QThread>
 #include <QThread>
 #include <QDebug>
 #include <QDebug>
-#include <QtConcurrent/QtConcurrent>
-#include <m_loger.h>
-CurlFtpUploader::CurlFtpUploader(QObject *parent) : QObject(parent), m_port(21) {
-    static std::once_flag curl_init_flag;
-    std::call_once(curl_init_flag, [](){
-        curl_global_init(CURL_GLOBAL_ALL);
-    });
-     connect(this, &CurlFtpUploader::fileUploaded, [this](const QString &filePath) {
-         m_uploadQueue.removeAll(filePath); // 线程安全移除
-         processNextFile();
-    });
-}
 
 
-CurlFtpUploader::~CurlFtpUploader() {
-    if (ftp_Thread.isRunning()) {
-        ftp_Thread.waitForFinished();  // wait for finish thread
-    }
-}
+CurlFtpUploader::CurlFtpUploader(QObject *parent) : QObject(parent), m_port(21) {}
+
+CurlFtpUploader::~CurlFtpUploader() {}
 
 
 void CurlFtpUploader::setFtpParams(const QString &username,
 void CurlFtpUploader::setFtpParams(const QString &username,
                                    const QString &password,
                                    const QString &password,
@@ -34,23 +20,17 @@ void CurlFtpUploader::setFtpParams(const QString &username,
     m_remotePath = remotePath;
     m_remotePath = remotePath;
 }
 }
 
 
-void CurlFtpUploader::uploadFilesAsync(const QStringList &filePaths) {
-    LOG("uploadFilesAsync...");
-    {
-        // 遍历并添加每个文件路径
-        for (const QString &path : filePaths) {
-            m_uploadQueue.enqueue(path);
-        }
-    }
-
-    if (m_currentUploadingFile.isEmpty()) {
-        processNextFile();
-    }
+void CurlFtpUploader::uploadFileAsync(const QString &localFilePath) {
+    // 在子线程中执行上传(避免阻塞主线程)
+    QThread *thread = QThread::create([this, localFilePath]() {
+        performUpload(localFilePath);
+    });
+    connect(thread, &QThread::finished, thread, &QThread::deleteLater);
+    thread->start();
 }
 }
 
 
-
 void CurlFtpUploader::performUpload(const QString &localFilePath) {
 void CurlFtpUploader::performUpload(const QString &localFilePath) {
-
+    curl_global_init(CURL_GLOBAL_ALL);
     CURL *curl = curl_easy_init();
     CURL *curl = curl_easy_init();
     if (!curl) {
     if (!curl) {
         emit finished(false, "Failed to initialize CURL");
         emit finished(false, "Failed to initialize CURL");
@@ -82,60 +62,25 @@ void CurlFtpUploader::performUpload(const QString &localFilePath) {
     curl_easy_setopt(curl, CURLOPT_READFUNCTION, &CurlFtpUploader::readCallback);
     curl_easy_setopt(curl, CURLOPT_READFUNCTION, &CurlFtpUploader::readCallback);
     curl_easy_setopt(curl, CURLOPT_INFILESIZE_LARGE, (curl_off_t)file.size());
     curl_easy_setopt(curl, CURLOPT_INFILESIZE_LARGE, (curl_off_t)file.size());
     curl_easy_setopt(curl, CURLOPT_FTP_CREATE_MISSING_DIRS, 1L); // 自动创建目录
     curl_easy_setopt(curl, CURLOPT_FTP_CREATE_MISSING_DIRS, 1L); // 自动创建目录
-    curl_easy_setopt(curl, CURLOPT_TIMEOUT, 180L);       // 传输超时 180 秒
-    curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10L); // 连接超时 10 秒
+    curl_easy_setopt(curl, CURLOPT_TIMEOUT, 180L);       // 传输超时 120 秒
+    curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 20L); // 连接超时 10 秒
     // 进度回调
     // 进度回调
-    #if 0
     curl_easy_setopt(curl, CURLOPT_XFERINFOFUNCTION, &CurlFtpUploader::progressCallback);
     curl_easy_setopt(curl, CURLOPT_XFERINFOFUNCTION, &CurlFtpUploader::progressCallback);
     curl_easy_setopt(curl, CURLOPT_XFERINFODATA, this);
     curl_easy_setopt(curl, CURLOPT_XFERINFODATA, this);
     curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L);
     curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L);
-    #endif
+
     // 执行上传
     // 执行上传
     CURLcode res = curl_easy_perform(curl);
     CURLcode res = curl_easy_perform(curl);
     file.close();
     file.close();
 
 
     // 处理结果
     // 处理结果
-    // 切换到主线程触发完成信号
-    QMetaObject::invokeMethod(this, [this, res, localFilePath]() {
-        if (res != CURLE_OK) {
-            emit finished(false, curl_easy_strerror(res));
-            ERROR("FTP上传失败:{}",localFilePath.toStdString());
-        } else {
-            emit finished(true, "");
-            LOG("上传成功:{}",localFilePath.toStdString());
-            //emit fileUploaded(localFilePath);
-            // 不使用信号和槽,直接调用
-            QMetaObject::invokeMethod(this, [this](){
-                this->processNextFile();
-            }, Qt::QueuedConnection);
-        }
-    }, Qt::QueuedConnection);
-
-    curl_easy_cleanup(curl);
-}
-
-void CurlFtpUploader::processNextFile() {
-    LOG("处理下一个文件,队列剩余:{}", m_uploadQueue.size());
-
-    QString nextFile;
-    {
-        if (!m_uploadQueue.isEmpty()) {
-            nextFile = m_uploadQueue.dequeue();
-        }
-    }
-
-    if (!nextFile.isEmpty()) {
-        QtConcurrent::run(QThreadPool::globalInstance(), [this, nextFile]() {
-            performUpload(nextFile);
-
-            // 切换回主线程清理并处理下个任务
-            QMetaObject::invokeMethod(this, [this]() {
-                processNextFile();
-            }, Qt::QueuedConnection);
-        });
+    if (res != CURLE_OK) {
+        emit finished(false, curl_easy_strerror(res));
     } else {
     } else {
-        emit allUploadsFinished();
+        emit finished(true, "");
     }
     }
+
+    curl_easy_cleanup(curl);
 }
 }
 
 
 // 静态回调:读取文件内容
 // 静态回调:读取文件内容
@@ -152,11 +97,8 @@ int CurlFtpUploader::progressCallback(void *clientp, curl_off_t dltotal, curl_of
 
 
     CurlFtpUploader *uploader = static_cast<CurlFtpUploader*>(clientp);
     CurlFtpUploader *uploader = static_cast<CurlFtpUploader*>(clientp);
     if (ultotal > 0) {
     if (ultotal > 0) {
-        double percent = qMin(100.0, (static_cast<double>(ulnow) / ultotal) * 100.0);
-        // 切换到主线程触发信号
-        QMetaObject::invokeMethod(uploader, [uploader, percent]() {
-            emit uploader->progressChanged(percent);
-        }, Qt::QueuedConnection);
+        double percent = (static_cast<double>(ulnow) / ultotal) * 100.0;
+        emit uploader->progressChanged(percent);
     }
     }
     return 0;
     return 0;
 }
 }

+ 21 - 3
q6_felgo_iot/src/cameramanager.cpp

@@ -285,12 +285,17 @@ Frames::Frames(QObject * parent)
     connect(this,&Frames::stopGrabbing,
     connect(this,&Frames::stopGrabbing,
             this,&Frames::setCameraSw);
             this,&Frames::setCameraSw);
 
 
+    connect(this,&Frames::signal_photo_saved,
+            this,&Frames::upload_handle);
+
     connect(&sender_custom,&SenderCustom::signalToSend,
     connect(&sender_custom,&SenderCustom::signalToSend,
             this,&Frames::parseFrame);
             this,&Frames::parseFrame);
 
 
     connect(&sender_custom,&SenderCustom::signalQStr,
     connect(&sender_custom,&SenderCustom::signalQStr,
             this,&Frames::processUvchandle);
             this,&Frames::processUvchandle);
 
 
+
+
     initCam();
     initCam();
 }
 }
 
 
@@ -630,7 +635,7 @@ Frames::setCameraSw(bool stat_cam)
     emit serial_data(m_json.setLedState(camera_sta));    //设置补光灯状态
     emit serial_data(m_json.setLedState(camera_sta));    //设置补光灯状态
     if(!param::ptlist.empty())
     if(!param::ptlist.empty())
     {
     {
-        emit signal_photo_saved(param::ptlist);
+        emit signal_photo_saved();
     }
     }
 }
 }
 
 
@@ -674,8 +679,21 @@ Frames::newFrame( const QVideoFrame & frame )
 
 
 }
 }
 
 
+void
+Frames::upload_handle()
+{
+    if(!param::ptlist.empty()){
+        emit signal_wait_upload(param::ptlist.first());
+        param::ptlist.removeFirst();
+    }
+}
 
 
-
+void
+Frames::handle_reult_upload(bool success, const QString &error)
+{
+    LOG("上传结果:{}  - {}",success,error.toStdString());
+    upload_handle();
+}
 void
 void
 Frames::handleGrab(bool sta_cam){
 Frames::handleGrab(bool sta_cam){
     #if 1
     #if 1
@@ -757,7 +775,7 @@ Frames::handleGrab(bool sta_cam){
                                 param::camera_tc = 0;
                                 param::camera_tc = 0;
                                 QString pic_name = picture_path_floader + "/" + currentDateTimeString + "z" + QString::number(z_step) + "x" + QString::number(x_step) +".jpg";
                                 QString pic_name = picture_path_floader + "/" + currentDateTimeString + "z" + QString::number(z_step) + "x" + QString::number(x_step) +".jpg";
                                 LOG("图片名称:{}",pic_name.toStdString());
                                 LOG("图片名称:{}",pic_name.toStdString());
-                                if(m_image.save(pic_name,"jpg",100))
+                                if(m_image.save(pic_name,"jpg",80))
                                 {
                                 {
                                     param::ptlist.append(pic_name);
                                     param::ptlist.append(pic_name);
 
 

+ 4 - 2
q6_felgo_iot/src/main.cpp

@@ -624,8 +624,10 @@ int main(int argc, char *argv[])
                         sqlConfig->CloseDb();
                         sqlConfig->CloseDb();
                     });
                     });
                     // 修改信号槽连接方式
                     // 修改信号槽连接方式
-                    QObject::connect(m_frames, &Qt6QCamera::Frames::signal_photo_saved,
-                                     &uploader_ftp, &CurlFtpUploader::uploadFilesAsync);
+                    QObject::connect(m_frames, &Qt6QCamera::Frames::signal_wait_upload,
+                                     &uploader_ftp, &CurlFtpUploader::uploadFileAsync);
+                    QObject::connect(&uploader_ftp, &CurlFtpUploader::finished,
+                                     m_frames,&Qt6QCamera::Frames::handle_reult_upload);
                     isConnect_frame = true;
                     isConnect_frame = true;
                 }else{
                 }else{
                     qDebug() << "m_frames no !!!!!";
                     qDebug() << "m_frames no !!!!!";