zhunk před 3 měsíci
rodič
revize
d0f075eca1

+ 3 - 1
app_bzy_armhf_7/android/src/com/yfkj/bzyv1/Backlight.java

@@ -102,7 +102,9 @@ public class Backlight {
         }
         }
     }
     }
     //控制系统导航栏的隐藏/显示。
     //控制系统导航栏的隐藏/显示。
-
+    public void Maichong_Exit(Context context) {
+        MaiChongStartRawLauncher(context);
+    }
 
 
     // 修改系统的亮度值
     // 修改系统的亮度值
     public void setScreenLight(Context context, int brightness) {
     public void setScreenLight(Context context, int brightness) {

+ 40 - 0
app_bzy_armhf_7/docs/Readme.md

@@ -1,3 +1,43 @@
+## 20260731
+    #define APP_VERSION "1.19.11"
+    1、取消模糊检测;
+    2、同时上传清晰照片和融合照片;
+    #define APP_VERSION "1.19.10"
+    1、把所有使用qdebug打印log的函数修改为SPDLOG;
+    2、降低图像融合前图像检测的阈值;
+    #define APP_VERSION "1.18.10"
+        融合前的推荐检测顺序
+        1. 空图 / 加载失败
+        2. 全黑 (mean < 15)
+        3. 全白 (mean > 240)
+        4. 过曝截断 (overRatio > 0.05)
+        5. 欠曝截断 (underRatio > 0.10)
+        6. 低纹理 (stdDev < 5)
+        7. 低边缘密度 (edgeRatio < 0.005)
+        8. 运动模糊 (Laplacian var < 100)
+        9. 高噪 (noiseVar > 400)
+        10. 镜头遮挡 (blockVariance 某块 < 全局20%)
+    
+## 20260730
+    #define APP_VERSION "1.18.9"
+    1、增加景深融合的MQTT开关:
+        {
+            "jsonrpc": "2.0",
+            "method": "fusion_sw",
+            "params": {
+              "enable": 0
+            },
+            "id": 1
+        }
+## 20260730
+    #define APP_VERSION "1.17.9"
+    1、使用静态融合,动态融合性能不足实现复杂;
+    2、增加融合过程展示;
+    3、拍照界面的图像信息展示优化;
+## 20260725
+    #define APP_VERSION "1.16.9"
+    1、修复迈冲屏输入156715无法退出;
+    2、引入动态景深融合;
 ## 20260724
 ## 20260724
     #define APP_VERSION "1.15.9"
     #define APP_VERSION "1.15.9"
     1、修复同一张图片上传两次;
     1、修复同一张图片上传两次;

+ 2 - 2
app_bzy_armhf_7/header/SerialEvent.h

@@ -33,7 +33,7 @@ public:
                         {
                         {
                             PDEV_BROADCAST_PORT lpdbv = (PDEV_BROADCAST_PORT)lpdb;
                             PDEV_BROADCAST_PORT lpdbv = (PDEV_BROADCAST_PORT)lpdb;
                             QString portName = QString::fromWCharArray(lpdbv->dbcp_name);
                             QString portName = QString::fromWCharArray(lpdbv->dbcp_name);
-                            qDebug() << "device arrival:" << portName;
+                            DEBUG("device arrival: {}", portName.toStdString());
 
 
                             emit comDevArriaval(portName);
                             emit comDevArriaval(portName);
                         }
                         }
@@ -44,7 +44,7 @@ public:
                         {
                         {
                             PDEV_BROADCAST_PORT lpdbv = (PDEV_BROADCAST_PORT)lpdb;
                             PDEV_BROADCAST_PORT lpdbv = (PDEV_BROADCAST_PORT)lpdb;
                             QString portName = QString::fromWCharArray(lpdbv->dbcp_name);
                             QString portName = QString::fromWCharArray(lpdbv->dbcp_name);
-                            qDebug() << "device remove complete:" << portName;
+                            DEBUG("device remove complete: {}", portName.toStdString());
 
 
                             emit comDevRemoveComplete(portName);
                             emit comDevRemoveComplete(portName);
                         }
                         }

+ 10 - 0
app_bzy_armhf_7/header/app_sq_save.h

@@ -14,6 +14,7 @@ class OfflineStorage : public QObject
     Q_PROPERTY(int maxImageEntries READ maxImageEntries WRITE setMaxImageEntries NOTIFY maxImageEntriesChanged)
     Q_PROPERTY(int maxImageEntries READ maxImageEntries WRITE setMaxImageEntries NOTIFY maxImageEntriesChanged)
     Q_PROPERTY(int JsonEntries_saved READ JsonEntries_saved NOTIFY JsonEntries_savedChanged);
     Q_PROPERTY(int JsonEntries_saved READ JsonEntries_saved NOTIFY JsonEntries_savedChanged);
     Q_PROPERTY(int ImageEntries_saved READ ImageEntries_saved NOTIFY ImageEntries_savedChanged);
     Q_PROPERTY(int ImageEntries_saved READ ImageEntries_saved NOTIFY ImageEntries_savedChanged);
+    Q_PROPERTY(bool fusionEnabled READ fusionEnabled WRITE setFusionEnabled NOTIFY fusionEnabledChanged)
 
 
 public:
 public:
     explicit OfflineStorage(QObject *parent = nullptr);
     explicit OfflineStorage(QObject *parent = nullptr);
@@ -34,6 +35,10 @@ public:
     // 批量删除(可选优化)
     // 批量删除(可选优化)
     bool cleanupUploaded();
     bool cleanupUploaded();
 
 
+    // 应用配置:景深融合开关、JSON 缓存上限等键值对
+    bool fusionEnabled() const { return m_fusionEnabled; }
+    void setFusionEnabled(bool enabled);
+
 
 
 
 
 
 
@@ -61,16 +66,21 @@ signals:
 
 
     void JsonEntries_savedChanged();
     void JsonEntries_savedChanged();
     void ImageEntries_savedChanged();
     void ImageEntries_savedChanged();
+    void fusionEnabledChanged(bool enabled);
 private:
 private:
     QSqlDatabase m_db;
     QSqlDatabase m_db;
 
 
     bool createTables();
     bool createTables();
+    bool loadAppConfig();                                       // 启动时加载配置项(融合开关等)
+    bool readConfigBool(const QString &key, bool defaultValue); // 通用:读 bool 配置
+    bool writeConfigBool(const QString &key, bool value);       // 通用:写 bool 配置
     int m_JsonEntries_saved = 0;    //json存储数量
     int m_JsonEntries_saved = 0;    //json存储数量
     int m_ImageEntries_saved = 0;   //图片存储数量
     int m_ImageEntries_saved = 0;   //图片存储数量
     int m_maxJsonEntries = 1000;     // 默认上限
     int m_maxJsonEntries = 1000;     // 默认上限
     int m_maxImageEntries = 1000;
     int m_maxImageEntries = 1000;
     bool m_jsonCacheEnabled = true;  // 默认启用 JSON 缓存
     bool m_jsonCacheEnabled = true;  // 默认启用 JSON 缓存
     bool m_imageCacheEnabled = true; // 默认启用图片缓存
     bool m_imageCacheEnabled = true; // 默认启用图片缓存
+    bool m_fusionEnabled = true;     // 默认开启景深融合
     bool enforceLimit(const QString &table, int maxCount); // 核心函数
     bool enforceLimit(const QString &table, int maxCount); // 核心函数
 };
 };
 
 

+ 26 - 16
app_bzy_armhf_7/header/cameramanager.h

@@ -12,6 +12,7 @@
 #include <QImageCapture>
 #include <QImageCapture>
 #include <QPointer>
 #include <QPointer>
 #include <QThread>
 #include <QThread>
+#include <QThreadPool>
 #include <m_opencv.h>
 #include <m_opencv.h>
 #include <m_workthread.h>
 #include <m_workthread.h>
 #include <mqtthandler.h>
 #include <mqtthandler.h>
@@ -185,6 +186,8 @@ public:
 signals:
 signals:
     //! Video sink changed.
     //! Video sink changed.
     void videoSinkChanged();
     void videoSinkChanged();
+    void fusionVideoSinkChanged();
+    void fusionPreviewVisibleChanged();
     void cameraOpenFailed(const QString &err);
     void cameraOpenFailed(const QString &err);
     void formatStringChanged();
     void formatStringChanged();
     void fpsStringChanged();
     void fpsStringChanged();
@@ -209,22 +212,14 @@ signals:
 
 
     void signal_photo_saved();
     void signal_photo_saved();
     void signal_wait_upload(const QString &path);
     void signal_wait_upload(const QString &path);
+    void signal_fusion_progress(const QString &message, int percent);
 
 
     void stepCountChanged(const QString step);
     void stepCountChanged(const QString step);
 public slots:
 public slots:
 
 
-    void onMovDone(const QString stepcount){
-        if(!camera_sw()){
-            ERROR("Camera error!");
-            setCameraSw(false);
-            return;
-        }
-        m_qulityString  = m_opencvfunc.Tenengrad(m_frame);
-        LOG("onMovDone:{}",m_qulityString.toStdString());
-        emit serial_data(m_json.ImageFunc(m_qulityString.toDouble()));
-        emit qulityStringChanged();
-        emit stepCountChanged(stepcount);
-    }
+    void onMovDone(const QString stepcount);
+    void finishDynamicFusion();
+
     //    void parseFrame(const cv::Mat& frame);
     //    void parseFrame(const cv::Mat& frame);
     void upload_handle(void);
     void upload_handle(void);
     void handle_reult_upload(bool success, const QString &error);
     void handle_reult_upload(bool success, const QString &error);
@@ -237,20 +232,26 @@ private slots:
     void handleGrab(bool sta_cam);
     void handleGrab(bool sta_cam);
     //! 1s timer.
     //! 1s timer.
     void timer();
     void timer();
-    //!
-    void update_qulstr(QString q_str);
     //
     //
     void saveMatAsJpeg(const QVideoFrame &frame);
     void saveMatAsJpeg(const QVideoFrame &frame);
     //void sendData(QByteArray m_byte);
     //void sendData(QByteArray m_byte);
     void displayFrame(const QVideoFrame &frame);
     void displayFrame(const QVideoFrame &frame);
     void processFrameAsync(const RawFrame& frame);
     void processFrameAsync(const RawFrame& frame);
 private:
 private:
+    // 图片质量检测辅助函数
+    // 返回: 0=正常, 1=黑图, 2=白图, 4=过曝, 5=欠曝, 6=低纹理, 7=模糊/低清晰度, 8=镜头遮挡
+    int detectImageQuality(const cv::Mat& img) const;
+    // 过滤图片列表:去除黑图、白图、无内容图和重复图
+    // 返回过滤后的图片列表
+    QStringList filterImages(const QStringList& paths,
+                             std::function<void(const QString&, int)> progressCallback) const;
+
     Q_DISABLE_COPY( Frames )
     Q_DISABLE_COPY( Frames )
 
 
     //声明相机捕获对象
     //声明相机捕获对象
     //! Video sink of video output.
     //! Video sink of video output.
     //QPointer< QVideoSink > m_videoSink;
     //QPointer< QVideoSink > m_videoSink;
-    QVideoSink *m_videoSink;
+    QVideoSink *m_videoSink = nullptr;
     //! Format string.
     //! Format string.
     QString m_formatString;
     QString m_formatString;
     //! FPS string.
     //! FPS string.
@@ -274,7 +275,7 @@ private:
     bool m_streaming_active = false;
     bool m_streaming_active = false;
 
 
     QImage m_image;
     QImage m_image;
-    int stitch_des;
+    int fusion_num; //
     int m_width;
     int m_width;
     int m_height;
     int m_height;
     QString m_fExposureTime;
     QString m_fExposureTime;
@@ -282,6 +283,9 @@ private:
 
 
     //libuvc
     //libuvc
     mutable QMutex m_frameMutex;  // 互斥锁,用于对帧队列的访问进行同步
     mutable QMutex m_frameMutex;  // 互斥锁,用于对帧队列的访问进行同步
+    bool m_fusionFinishing = false;
+    bool m_fusionActive = false;
+    bool m_fusionFirstSaved = false;  // 首次保存后触发融合
 
 
     FPSTimer* m_fps_timer = nullptr;
     FPSTimer* m_fps_timer = nullptr;
     cv::Mat m_frame;
     cv::Mat m_frame;
@@ -298,6 +302,12 @@ private:
     QString picture_path_floader;
     QString picture_path_floader;
     QVector<cv::Mat> m_frame_buffer;
     QVector<cv::Mat> m_frame_buffer;
 
 
+    // 焦点清晰图路径(景深融合后清晰度对比用)
+    QString m_sharpPath;
+
+    // 参考清晰度(Laplacian方差),由 ptlist[0] 初始化,后续图片以此为基准判断模糊程度
+    double m_refSharpness = 0.0;
+
     int testJNI();
     int testJNI();
 
 
     static inline QImage  cvMatToQImage( const cv::Mat &inMat )
     static inline QImage  cvMatToQImage( const cv::Mat &inMat )

+ 4 - 0
app_bzy_armhf_7/header/m_opencv.h

@@ -96,6 +96,8 @@ public:
 
 
     // ==================== DWT多聚焦融合算法 ====================
     // ==================== DWT多聚焦融合算法 ====================
     QString fuseImages(const QStringList& imagePaths);
     QString fuseImages(const QStringList& imagePaths);
+    // 带进度回调的融合版本(回调在主线程执行)
+    QString fuseImages(const QStringList& imagePaths, std::function<void(const QString&, int)> progressCallback);
     // 主融合函数:融合多张不同焦点的图像(从QML调用,异步)
     // 主融合函数:融合多张不同焦点的图像(从QML调用,异步)
     // imagePaths: 输入图像文件路径列表
     // imagePaths: 输入图像文件路径列表
     Q_INVOKABLE void fuseImagesAsync(const QStringList& imagePaths);
     Q_INVOKABLE void fuseImagesAsync(const QStringList& imagePaths);
@@ -150,6 +152,8 @@ public:
     cv::Mat unsharpMask(const cv::Mat& src, double amount = 1.0, double sigma = 1.5);
     cv::Mat unsharpMask(const cv::Mat& src, double amount = 1.0, double sigma = 1.5);
 
 
 signals:
 signals:
+    // 融合进度信号
+    void fusionProgress(const QString& message, int percent);
     // 融合完成信号
     // 融合完成信号
     void fuseFinished(const QString& resultPath);
     void fuseFinished(const QString& resultPath);
     // 对比度增强完成信号(异步任务用)
     // 对比度增强完成信号(异步任务用)

+ 2 - 1
app_bzy_armhf_7/header/main.h

@@ -37,7 +37,7 @@
 #include <opencv2/features2d/features2d.hpp>
 #include <opencv2/features2d/features2d.hpp>
 #include <opencv2/xfeatures2d/nonfree.hpp>
 #include <opencv2/xfeatures2d/nonfree.hpp>
 
 
-#define APP_VERSION "1.15.9"
+#define APP_VERSION "1.19.11"
 
 
 using namespace std;
 using namespace std;
 
 
@@ -140,6 +140,7 @@ public:
     static int  maxImageEntries;
     static int  maxImageEntries;
     static int  x_init;
     static int  x_init;
     static int  y_init;
     static int  y_init;
+    static int  fusion_enable;     // 景深融合开关:1=开, 0=关(持久化在 SQLite app_config 表)
 
 
     //网络
     //网络
     static bool net_alive;
     static bool net_alive;

+ 3 - 3
app_bzy_armhf_7/header/mqtthandler.h

@@ -207,17 +207,17 @@ protected:
                     emit downloadFinished(true,update_type);
                     emit downloadFinished(true,update_type);
                 } else {
                 } else {
                     emit downloadFinished(false,update_type);
                     emit downloadFinished(false,update_type);
-                    qDebug() << "Download failed:" << curl_easy_strerror(res);
+                    ERROR("Download failed: {}", curl_easy_strerror(res));
                 }
                 }
                 curl_easy_cleanup(curl);
                 curl_easy_cleanup(curl);
             }
             }
             else{
             else{
-                qDebug() << "Failed to open local file for writing.";
+                WARN("Failed to open local file for writing.");
             }
             }
             localFile.close();
             localFile.close();
             curl_global_cleanup();
             curl_global_cleanup();
         }else{
         }else{
-            qDebug() << "Failed to open local file for writing.";
+            WARN("Failed to open local file for writing.");
         }
         }
 
 
     }
     }

+ 15 - 4
app_bzy_armhf_7/header/mserial.h

@@ -80,13 +80,23 @@ public:
     Q_INVOKABLE void setHt_xy_dis(int xdis ,int ydis){
     Q_INVOKABLE void setHt_xy_dis(int xdis ,int ydis){
         sendData(m_json.CmdParamconf_xy_dis(xdis,ydis));
         sendData(m_json.CmdParamconf_xy_dis(xdis,ydis));
     }
     }
+    Q_INVOKABLE void Maichong_Exit(){
+        QJniObject qtContext = QNativeInterface::QAndroidApplication::context();
+        if (qtContext.isValid()) {
+            QJniObject backlight("com/yfkj/bzyv1/Backlight");
+            if (backlight.isValid()) {
+                backlight.callMethod<void>("Maichong_Exit",
+                                           "(Landroid/content/Context;)V",
+                                           qtContext.object());
+            }
+        }
+    }
 
 
     Q_INVOKABLE void setLightness(int val){
     Q_INVOKABLE void setLightness(int val){
         auto qtContext = QJniObject(QNativeInterface::QAndroidApplication::context());    //activity
         auto qtContext = QJniObject(QNativeInterface::QAndroidApplication::context());    //activity
         if (qtContext.isValid()) {
         if (qtContext.isValid()) {
             QJniObject jClass("com/yfkj/bzyv1/Backlight");
             QJniObject jClass("com/yfkj/bzyv1/Backlight");
             jClass.callMethod<void>("setScreenLight","(Landroid/content/Context;I)V",qtContext.object(),val);
             jClass.callMethod<void>("setScreenLight","(Landroid/content/Context;I)V",qtContext.object(),val);
-            //jClass.callStaticMethod<void>("turnScreenOff", "()V");
         }
         }
 #if 0
 #if 0
         if(val==-255){
         if(val==-255){
@@ -130,6 +140,7 @@ signals:
     void translatedone();
     void translatedone();
     void netMessage(const QByteArray &data);
     void netMessage(const QByteArray &data);
     void autoFocusDone();
     void autoFocusDone();
+    void autoFocusComplete();  // 自动对焦完成,保存焦点图片
     void autoFocusStart();
     void autoFocusStart();
     void lwjsonStreamDONE(const QByteArray &data);
     void lwjsonStreamDONE(const QByteArray &data);
     void signal_movy(const QString stepcount);
     void signal_movy(const QString stepcount);
@@ -211,7 +222,7 @@ private:
         QDir directory(directoryPath);
         QDir directory(directoryPath);
 
 
         if (!directory.exists()) {
         if (!directory.exists()) {
-            qDebug() << "Directory does not exist.";
+            DEBUG("Directory does not exist.");
             return;
             return;
         }
         }
 
 
@@ -234,7 +245,7 @@ private:
         QDir directory(directoryPath);
         QDir directory(directoryPath);
         DirectoryStats stats;
         DirectoryStats stats;
         if (!directory.exists()) {
         if (!directory.exists()) {
-            qDebug() << "Directory does not exist.";
+            DEBUG("Directory does not exist.");
         }
         }
 
 
         qint64 totalSize = 0;
         qint64 totalSize = 0;
@@ -263,7 +274,7 @@ private:
     }
     }
     // 使用示例
     // 使用示例
     void analyzeDirectory(const QString &directoryPath) {
     void analyzeDirectory(const QString &directoryPath) {
-        qDebug() << "Analyzing directory:" << directoryPath;
+        DEBUG("Analyzing directory: {}", directoryPath.toStdString());
 
 
         DirectoryStats stats = getDirectoryStats(directoryPath);
         DirectoryStats stats = getDirectoryStats(directoryPath);
         qst_dirPath = directoryPath;
         qst_dirPath = directoryPath;

+ 7 - 0
app_bzy_armhf_7/header/wif_service.h

@@ -143,6 +143,13 @@ public:
     /** 便捷封装: OTA 更新, filePath 完整路径. */
     /** 便捷封装: OTA 更新, filePath 完整路径. */
     Q_INVOKABLE int otaUpdate(const QString &filePath);
     Q_INVOKABLE int otaUpdate(const QString &filePath);
 
 
+    /** 服务是否已连接 (仅 Android 有效). */
+    Q_PROPERTY(bool connected READ isConnected NOTIFY connectedChanged)
+    bool isConnected() const;
+
+    /** 由 JNI 回调设置连接状态. */
+    void setConnected(bool connected);
+
     /** 便捷封装: 重命名包别名. */
     /** 便捷封装: 重命名包别名. */
     Q_INVOKABLE int setAlias(const QString &packageName, const QString &alias);
     Q_INVOKABLE int setAlias(const QString &packageName, const QString &alias);
 
 

+ 20 - 14
app_bzy_armhf_7/main.cpp

@@ -27,8 +27,7 @@ QString param::table_config = "config";         //参数配置表
 
 
 void traverseQmlObject(QObject *qmlObject, int depth = 0) {
 void traverseQmlObject(QObject *qmlObject, int depth = 0) {
     QString indentation = QString("  ").repeated(depth);
     QString indentation = QString("  ").repeated(depth);
-    qDebug() << indentation << "Type:" << qmlObject->metaObject()->className()
-             << "Name:" << qmlObject->objectName();
+    DEBUG("{} Type:{} Name:{}", indentation.toStdString(), qmlObject->metaObject()->className(), qmlObject->objectName().toStdString());
 
 
     for (QObject *child : qmlObject->children()) {
     for (QObject *child : qmlObject->children()) {
         traverseQmlObject(child, depth + 1);
         traverseQmlObject(child, depth + 1);
@@ -214,12 +213,12 @@ void sendBroadcastFromQt(QString btn_type) {
             }
             }
         }else if(btn_type=="install"){
         }else if(btn_type=="install"){
             QJniObject jClass("com/yfkj/bzyv1/StatusBarCtr");
             QJniObject jClass("com/yfkj/bzyv1/StatusBarCtr");
-            qDebug() << "install process start!";
+            DEBUG("install process start!");
             jClass.callMethod<void>("installApp","(Landroid/content/Context;)V",qtContext.object());
             jClass.callMethod<void>("installApp","(Landroid/content/Context;)V",qtContext.object());
         }else if(btn_type=="rebootSystem"){
         }else if(btn_type=="rebootSystem"){
             jClass.callMethod<void>("rebootSystem","(Landroid/content/Context;)V",qtContext.object());
             jClass.callMethod<void>("rebootSystem","(Landroid/content/Context;)V",qtContext.object());
         }else if(btn_type=="service"){
         }else if(btn_type=="service"){
-            qDebug() <<"启动android服务";
+            DEBUG("启动android服务");
             QAndroidIntent serviceIntent(qtContext.object(),
             QAndroidIntent serviceIntent(qtContext.object(),
                                          "com/yfkj/bzyv1/QtAndroidService");
                                          "com/yfkj/bzyv1/QtAndroidService");
             QJniObject result = qtContext.callObjectMethod(
             QJniObject result = qtContext.callObjectMethod(
@@ -306,14 +305,14 @@ void clearAllCaches() {
     for (const QString &cachePath : cacheLocations) {
     for (const QString &cachePath : cacheLocations) {
         QDir cacheDir(cachePath);
         QDir cacheDir(cachePath);
         if (cacheDir.exists()) {
         if (cacheDir.exists()) {
-            qDebug() << "Scanning cache location:" << cachePath;
+            DEBUG("Scanning cache location: {}", cachePath.toStdString());
             
             
             // 清理指定目录
             // 清理指定目录
             for (const QString &subDir : cacheDirs) {
             for (const QString &subDir : cacheDirs) {
                 QDir sub(cacheDir.filePath(subDir));
                 QDir sub(cacheDir.filePath(subDir));
                 if (sub.exists()) {
                 if (sub.exists()) {
                     sub.removeRecursively();
                     sub.removeRecursively();
-                    qDebug() << "Cleared cache directory:" << sub.absolutePath();
+                    DEBUG("Cleared cache directory: {}", sub.absolutePath().toStdString());
                 }
                 }
             }
             }
             
             
@@ -322,7 +321,7 @@ void clearAllCaches() {
             QStringList files = cacheDir.entryList(QDir::Files);
             QStringList files = cacheDir.entryList(QDir::Files);
             for (const QString &file : files) {
             for (const QString &file : files) {
                 cacheDir.remove(file);
                 cacheDir.remove(file);
-                qDebug() << "Removed cache file:" << cacheDir.filePath(file);
+                DEBUG("Removed cache file: {}", cacheDir.filePath(file).toStdString());
             }
             }
         }
         }
     }
     }
@@ -341,11 +340,11 @@ void clearAllCaches() {
             } else {
             } else {
                 tempDir.remove(tempFile);
                 tempDir.remove(tempFile);
             }
             }
-            qDebug() << "Removed temp file/dir:" << tempDir.filePath(tempFile);
+            DEBUG("Removed temp file/dir: {}", tempDir.filePath(tempFile).toStdString());
         }
         }
     }
     }
     
     
-    qDebug() << "All caches cleared successfully!";
+    DEBUG("All caches cleared successfully!");
 #endif
 #endif
 }
 }
 
 
@@ -525,6 +524,11 @@ int main(int argc, char *argv[])
     mqttHandler.storage()->setMaxJsonEntries(param::maxJsonEntries);
     mqttHandler.storage()->setMaxJsonEntries(param::maxJsonEntries);
     mqttHandler.storage()->setMaxImageEntries(param::maxImageEntries);
     mqttHandler.storage()->setMaxImageEntries(param::maxImageEntries);
 
 
+    // 启动时从 SQLite 把景深融合开关同步到 param::fusion_enable
+    // 这样未经 MQTT 指令也能在重启后保留上次设置
+    param::fusion_enable = mqttHandler.storage()->fusionEnabled() ? 1 : 0;
+    LOG("[main] 启动时加载 fusion_enable={}", param::fusion_enable);
+
     CurlHandler curlHandler("ftp://8.136.98.49/_UPDATE_FILE/Android/BZYV2/armv7a/app.apk",appDataPath+"/app.apk");    //app升级
     CurlHandler curlHandler("ftp://8.136.98.49/_UPDATE_FILE/Android/BZYV2/armv7a/app.apk",appDataPath+"/app.apk");    //app升级
 
 
     NetworkInfoHelper networkMonitor;
     NetworkInfoHelper networkMonitor;
@@ -546,7 +550,6 @@ int main(int argc, char *argv[])
         if (connected) {
         if (connected) {
             // 服务已连接,可以安全调用
             // 服务已连接,可以安全调用
             wifService->setKioskMode(true);
             wifService->setKioskMode(true);
-            wifService->setEthernet("192.168.100.101","255.255.255.0","192.168.100.1","192.168.100.1","8.8.8.8");
         }
         }
     });
     });
     wifService->bind();
     wifService->bind();
@@ -602,7 +605,7 @@ int main(int argc, char *argv[])
     QObject::connect(&mqttHandler,&MqttHandler::configChange,[&](){
     QObject::connect(&mqttHandler,&MqttHandler::configChange,[&](){
         sqlConfig->OpenDb();
         sqlConfig->OpenDb();
         if(sqlConfig->isTableExist(param::table_camera)){
         if(sqlConfig->isTableExist(param::table_camera)){
-            qDebug() << "UpdateData stitch_photonum !!!!!";
+            DEBUG("UpdateData stitch_photonum !!!!!");
             sqlConfig->UpdateData(param::table_camera,"stitch_photonum",QString::number(param::stitch_photonum));
             sqlConfig->UpdateData(param::table_camera,"stitch_photonum",QString::number(param::stitch_photonum));
         }
         }
         sqlConfig->CloseDb();
         sqlConfig->CloseDb();
@@ -656,7 +659,7 @@ int main(int argc, char *argv[])
         QObject::connect(&mqttHandler,&MqttHandler::autotakephoto,[&](bool stat){
         QObject::connect(&mqttHandler,&MqttHandler::autotakephoto,[&](bool stat){
             QObject *Navigation_main = rootItem->findChild<QObject*>("Navigation_main");
             QObject *Navigation_main = rootItem->findChild<QObject*>("Navigation_main");
             if(Navigation_main){
             if(Navigation_main){
-                qDebug() << "Navigation_main is !!!!!"<<stat;
+                DEBUG("Navigation_main is !!!!! {}", stat);
                 QMetaObject::invokeMethod(Navigation_main, "setCurrentTab", Q_ARG(QVariant, 1));
                 QMetaObject::invokeMethod(Navigation_main, "setCurrentTab", Q_ARG(QVariant, 1));
                 //打开相机
                 //打开相机
                 QObject *autoFocus_Page = rootItem->findChild<QObject*>("autoFocus_Page");
                 QObject *autoFocus_Page = rootItem->findChild<QObject*>("autoFocus_Page");
@@ -669,7 +672,7 @@ int main(int argc, char *argv[])
         QObject::connect(&serialThread,&SerialThread::auto_takephoto,[&](){
         QObject::connect(&serialThread,&SerialThread::auto_takephoto,[&](){
             QObject *Navigation_main = rootItem->findChild<QObject*>("Navigation_main");
             QObject *Navigation_main = rootItem->findChild<QObject*>("Navigation_main");
             if(Navigation_main){
             if(Navigation_main){
-                qDebug() << "Navigation_main is !!!!!";
+                DEBUG("Navigation_main is !!!!!");
                 QMetaObject::invokeMethod(Navigation_main, "setCurrentTab", Q_ARG(QVariant, 1));
                 QMetaObject::invokeMethod(Navigation_main, "setCurrentTab", Q_ARG(QVariant, 1));
                 //打开相机
                 //打开相机
                 QObject *autoFocus_Page = rootItem->findChild<QObject*>("autoFocus_Page");
                 QObject *autoFocus_Page = rootItem->findChild<QObject*>("autoFocus_Page");
@@ -728,12 +731,15 @@ int main(int argc, char *argv[])
                     QObject::connect(&serialThread,&SerialThread::takephotodone,m_frames,&Qt6QCamera::Frames::saveImage);      //串口到QML,控制qml跳转到自动对焦界面
                     QObject::connect(&serialThread,&SerialThread::takephotodone,m_frames,&Qt6QCamera::Frames::saveImage);      //串口到QML,控制qml跳转到自动对焦界面
                     //QObject::connect(m_frames,&Qt6QCamera::Frames::signal_stitch,&imagestitcher,&ImageStitcher::stitch_thread);
                     //QObject::connect(m_frames,&Qt6QCamera::Frames::signal_stitch,&imagestitcher,&ImageStitcher::stitch_thread);
                     QObject::connect(&serialThread,&SerialThread::signal_movy,m_frames,&Qt6QCamera::Frames::onMovDone);
                     QObject::connect(&serialThread,&SerialThread::signal_movy,m_frames,&Qt6QCamera::Frames::onMovDone);
+                    QObject::connect(&serialThread,&SerialThread::autoFocusDone,m_frames,&Qt6QCamera::Frames::finishDynamicFusion);
                     QObject::connect(m_frames,&Qt6QCamera::Frames::dataUpload,&mqttHandler,&MqttHandler::publish_m);     //frames到MQTT
                     QObject::connect(m_frames,&Qt6QCamera::Frames::dataUpload,&mqttHandler,&MqttHandler::publish_m);     //frames到MQTT
                     // 修改信号槽连接方式
                     // 修改信号槽连接方式
                     QObject::connect(m_frames, &Qt6QCamera::Frames::signal_wait_upload,
                     QObject::connect(m_frames, &Qt6QCamera::Frames::signal_wait_upload,
                                      &uploader_ftp, &CurlFtpUploader::uploadFileAsync);
                                      &uploader_ftp, &CurlFtpUploader::uploadFileAsync);
                     QObject::connect(&uploader_ftp, &CurlFtpUploader::finished,
                     QObject::connect(&uploader_ftp, &CurlFtpUploader::finished,
                                      m_frames,&Qt6QCamera::Frames::handle_reult_upload);
                                      m_frames,&Qt6QCamera::Frames::handle_reult_upload);
+                    QObject::connect(m_frames, &Qt6QCamera::Frames::signal_fusion_progress,
+                                     &opencvFunc, &OpencvFunc::fusionProgress);
 
 
                     isConnect_frame = false;
                     isConnect_frame = false;
                 }else{
                 }else{
@@ -742,7 +748,7 @@ int main(int argc, char *argv[])
             });
             });
 
 
         }else{
         }else{
-            qDebug() << "autofocus_item no !!!!!";
+            DEBUG("autofocus_item no !!!!!");
         }
         }
 
 
     }else{
     }else{

+ 108 - 0
app_bzy_armhf_7/qml/Main.qml

@@ -1,4 +1,5 @@
 import QtQuick
 import QtQuick
+import QtQuick.Layouts
 import Felgo
 import Felgo
 import QtQuick.Controls
 import QtQuick.Controls
 import "pages"
 import "pages"
@@ -257,6 +258,113 @@ App {
         }
         }
     }
     }
 
 
+    // ========== 全局融合进度弹窗 ==========
+    property bool isGlobalFusing: false
+    property string globalFusionMessage: ""
+    property int globalFusionPercent: 0
+
+    Connections {
+        target: opencvFunc
+        function onFusionProgress(message, percent) {
+            console.log("[Main] 融合进度:", message, percent + "%")
+            if (percent >= 100) {
+                // 完成后延迟关闭弹窗,让用户看到完成状态
+                globalFusionMessage = message
+                globalFusionPercent = percent
+                Qt.callLater(function() {
+                    isGlobalFusing = false
+                })
+            } else {
+                isGlobalFusing = true
+                globalFusionMessage = message
+                globalFusionPercent = percent
+            }
+        }
+        function onFuseFinished(resultPath) {
+            isGlobalFusing = false
+            console.log("[Main] 融合结束:", resultPath)
+        }
+    }
+
+    Popup {
+        id: globalFusionPopup
+        anchors.centerIn: parent
+        width: Math.min(parent.width * 0.8, 360)
+        modal: true
+        focus: true
+        closePolicy: Popup.NoAutoClose
+        visible: isGlobalFusing
+        padding: 20
+        z: 99999
+
+        background: Rectangle {
+            color: "white"
+            radius: 8
+            border.color: "#28a779"
+            border.width: 2
+        }
+
+        contentItem: ColumnLayout {
+            spacing: 16
+
+            Text {
+                Layout.fillWidth: true
+                text: "图像融合中"
+                font.pixelSize: 18
+                font.bold: true
+                color: "#28a779"
+                horizontalAlignment: Text.AlignHCenter
+            }
+
+            BusyIndicator {
+                Layout.alignment: Qt.AlignHCenter
+                running: globalFusionPopup.visible
+                width: 48
+                height: 48
+            }
+
+            Text {
+                Layout.fillWidth: true
+                text: globalFusionMessage
+                font.pixelSize: 14
+                color: "#333"
+                horizontalAlignment: Text.AlignHCenter
+                wrapMode: Text.WordWrap
+            }
+
+            ProgressBar {
+                id: globalFusionProgressBar
+                Layout.fillWidth: true
+                from: 0
+                to: 100
+                value: globalFusionPercent
+
+                background: Rectangle {
+                    implicitHeight: 8
+                    color: "#eee"
+                    radius: 4
+                }
+                contentItem: Item {
+                    implicitHeight: 8
+                    Rectangle {
+                        width: globalFusionProgressBar.visualPosition * parent.width
+                        height: parent.height
+                        radius: 4
+                        color: "#28a779"
+                    }
+                }
+            }
+
+            Text {
+                Layout.fillWidth: true
+                text: globalFusionPercent.toFixed(0) + "%"
+                font.pixelSize: 12
+                color: "#666"
+                horizontalAlignment: Text.AlignHCenter
+            }
+        }
+    }
+
     Component.onCompleted: {
     Component.onCompleted: {
         console.log("App Component.onCompleted, starting phased loading...")
         console.log("App Component.onCompleted, starting phased loading...")
     }
     }

+ 7 - 3
app_bzy_armhf_7/qml/model/DataModel.qml

@@ -113,9 +113,13 @@ Item {
             {
             {
                  _.userLoggedIn = true
                  _.userLoggedIn = true
             }else if(password==="156715"){
             }else if(password==="156715"){
-                serial.setLightness(255)
-                wifService.setKioskMode(false)
-                wifService.startHome()
+                if(wifService && wifService.connected) {
+                    wifService.setKioskMode(false)
+                    wifService.startHome()
+                } else {
+                    console.warn("wifService not connected, skipping kiosk mode operations")
+                }
+                serial.Maichong_Exit()
             }
             }
             else
             else
             {
             {

+ 10 - 12
app_bzy_armhf_7/qml/pages/PhotostitcherPage.qml

@@ -30,23 +30,14 @@ AppPage {
             if (selectedImages.length >= 2) {
             if (selectedImages.length >= 2) {
                 isFusing = true
                 isFusing = true
                 console.log("开始融合", selectedImages.length, "张图片")
                 console.log("开始融合", selectedImages.length, "张图片")
+                app.isGlobalFusing = true
+                app.globalFusionMessage = "开始融合..."
+                app.globalFusionPercent = 0
                 opencvFunc.fuseImagesAsync(selectedImages)
                 opencvFunc.fuseImagesAsync(selectedImages)
             }
             }
         }
         }
     }
     }
 
 
-    // 融合加载动画
-    BusyIndicator {
-        id: fuseBusyIndicator
-        anchors.bottom: parent.bottom
-        anchors.right: parent.right
-        anchors.margins: 20
-        visible: isFusing
-        width: 60
-        height: 60
-        z: 100
-    }
-
     // 取消选择按钮
     // 取消选择按钮
     AppButton {
     AppButton {
         id: cancelButton
         id: cancelButton
@@ -68,6 +59,7 @@ AppPage {
         target: opencvFunc
         target: opencvFunc
         function onFuseFinished(resultPath) {
         function onFuseFinished(resultPath) {
             isFusing = false
             isFusing = false
+            app.isGlobalFusing = false
             if (resultPath) {
             if (resultPath) {
                 console.log("融合完成:", resultPath)
                 console.log("融合完成:", resultPath)
                 // 显示融合结果
                 // 显示融合结果
@@ -78,6 +70,12 @@ AppPage {
                 console.error("融合失败")
                 console.error("融合失败")
             }
             }
         }
         }
+
+        // 融合进度信号
+        function onFusionProgress(message, percent) {
+            console.log("融合进度:", message, percent + "%")
+            // 全局弹窗由 Main.qml 监听
+        }
     }
     }
 
 
     function clearSelection() {
     function clearSelection() {

+ 1 - 1
app_bzy_armhf_7/qml/pages/TestPage.qml

@@ -266,7 +266,7 @@ AppPage {
                   id: photoclarity2_text
                   id: photoclarity2_text
                   anchors.top:  photoclarity_text.bottom
                   anchors.top:  photoclarity_text.bottom
                   width: parent.width
                   width: parent.width
-                  text: frames.qulityString
+                  text: "清晰度:" + frames.qulityString
                   color:  "green"
                   color:  "green"
                 }
                 }
             }
             }

+ 5 - 5
app_bzy_armhf_7/src/EasyTableModel.cpp

@@ -1,6 +1,6 @@
 //EasyTableModel.cpp
 //EasyTableModel.cpp
 #include "EasyTableModel.h"
 #include "EasyTableModel.h"
-#include <QDebug>
+#include <m_loger.h>
 
 
 EasyTableModel::EasyTableModel(QObject *parent)
 EasyTableModel::EasyTableModel(QObject *parent)
     : QAbstractTableModel(parent)
     : QAbstractTableModel(parent)
@@ -47,12 +47,12 @@ void EasyTableModel::setInitData(const QJsonArray &jsonArr)
 
 
 void EasyTableModel::classBegin()
 void EasyTableModel::classBegin()
 {
 {
-    qDebug()<<"EasyTableModel::classBegin()";
+    DEBUG("EasyTableModel::classBegin()");
 }
 }
 
 
 void EasyTableModel::componentComplete()
 void EasyTableModel::componentComplete()
 {
 {
-    qDebug()<<"EasyTableModel::componentComplete()";
+    DEBUG("EasyTableModel::componentComplete()");
     _completed=true;
     _completed=true;
     if(!_initData.isEmpty()){
     if(!_initData.isEmpty()){
         loadData(_initData,_table_name);
         loadData(_initData,_table_name);
@@ -129,7 +129,7 @@ bool EasyTableModel::setData(const QModelIndex &index, const QVariant &value, in
     if (value.isValid()&&index.isValid()&&(data(index, role) != value)) {
     if (value.isValid()&&index.isValid()&&(data(index, role) != value)) {
         if(Qt::EditRole==role){
         if(Qt::EditRole==role){
             _modelData[index.row()][index.column()]=value;
             _modelData[index.row()][index.column()]=value;
-            qDebug() << "_modelData:"<< _modelData << index.row()<< index.column();
+            DEBUG("_modelData: row={} col={}", index.row(), index.column());
             //emit dataChanged(index, index, QVector<int>() << role); //
             //emit dataChanged(index, index, QVector<int>() << role); //
             emit dataChanged();
             emit dataChanged();
             return true;
             return true;
@@ -147,7 +147,7 @@ Qt::ItemFlags EasyTableModel::flags(const QModelIndex &index) const
 
 
 void EasyTableModel::loadData(const QJsonArray &data,QString &table_name)
 void EasyTableModel::loadData(const QJsonArray &data,QString &table_name)
 {
 {
-    qDebug() << "tbname:" << table_name;
+    DEBUG("tbname: {}", table_name.toStdString());
     //如果要区分类型的话,可以用role,
     //如果要区分类型的话,可以用role,
     //这样ui中就能使用model.role来获取对应index的参数
     //这样ui中就能使用model.role来获取对应index的参数
     QVector<QVector<QVariant>> newData;
     QVector<QVector<QVariant>> newData;

+ 4 - 4
app_bzy_armhf_7/src/TreeModel.cpp

@@ -55,7 +55,7 @@ TreeModel::TreeModel(QObject *parent)
     , m_rootItem(new TreeItem(TreeItem::Root, "Pictures", ""))
     , m_rootItem(new TreeItem(TreeItem::Root, "Pictures", ""))
     , m_picturesPath(QStandardPaths::writableLocation(QStandardPaths::PicturesLocation))
     , m_picturesPath(QStandardPaths::writableLocation(QStandardPaths::PicturesLocation))
 {
 {
-    qDebug() << "Pictures Location:" << m_picturesPath;
+    DEBUG("Pictures Location: {}", m_picturesPath.toStdString());
     QTimer::singleShot(0, this, [this]() {
     QTimer::singleShot(0, this, [this]() {
         resetModel();
         resetModel();
     });
     });
@@ -231,9 +231,9 @@ void TreeModel::loadMonths(TreeItem *yearItem, const QModelIndex &parentIndex)
         }
         }
     }
     }
 
 
-    qDebug() << "Loading months for:" << yearItem->path();
-    qDebug() << "Found entries:" << entries.size();
-    qDebug() << "Matching months:" << months.size();
+    DEBUG("Loading months for: {}", yearItem->path().toStdString());
+    DEBUG("Found entries: {}", entries.size());
+    DEBUG("Matching months: {}", months.size());
 
 
     std::sort(months.begin(), months.end(), [](const QFileInfo &a, const QFileInfo &b) {
     std::sort(months.begin(), months.end(), [](const QFileInfo &a, const QFileInfo &b) {
         return a.fileName() < b.fileName();
         return a.fileName() < b.fileName();

+ 97 - 8
app_bzy_armhf_7/src/app_sq_save.cpp

@@ -11,29 +11,48 @@
 #include <QDateTime>
 #include <QDateTime>
 #include <QFileInfo>
 #include <QFileInfo>
 #include <QFile>
 #include <QFile>
-#include <QDir>
+#include <QThread>
 OfflineStorage::OfflineStorage(QObject *parent)
 OfflineStorage::OfflineStorage(QObject *parent)
     : QObject(parent)
     : QObject(parent)
 {
 {
     QString dbPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/offline.db";
     QString dbPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/offline.db";
     QDir().mkpath(QFileInfo(dbPath).absolutePath());
     QDir().mkpath(QFileInfo(dbPath).absolutePath());
 
 
-    m_db = QSqlDatabase::addDatabase("QSQLITE", "OFFLINE_DB");
+    // 连接名带实例地址,避免同一进程多实例/线程同时持有同名连接引发 "connection is in use"
+    const QString connName = QString("OFFLINE_DB_%1").arg(reinterpret_cast<quintptr>(this));
+    m_db = QSqlDatabase::addDatabase("QSQLITE", connName);
     m_db.setDatabaseName(dbPath);
     m_db.setDatabaseName(dbPath);
 
 
-    if (!m_db.open()) {
+    // 启动早期偶发 sqlite 锁/文件系统未就绪,带 3 次重试 + 每次 80ms 退避
+    bool opened = false;
+    for (int attempt = 1; attempt <= 3 && !opened; ++attempt) {
+        opened = m_db.open();
+        if (!opened) {
+            qWarning() << "[OfflineStorage] open 失败,第" << attempt
+                       << "次重试,err:" << m_db.lastError();
+            QThread::msleep(80);
+        }
+    }
+    if (!opened) {
         qWarning() << "无法打开数据库:" << m_db.lastError();
         qWarning() << "无法打开数据库:" << m_db.lastError();
         return;
         return;
     }
     }
 
 
     createTables();
     createTables();
+    loadAppConfig();
 }
 }
 
 
 OfflineStorage::~OfflineStorage()
 OfflineStorage::~OfflineStorage()
 {
 {
+    const QString connName = m_db.connectionName();
     if (m_db.isOpen()) {
     if (m_db.isOpen()) {
         m_db.close();
         m_db.close();
     }
     }
+    // 把 addDatabase 时使用的连接名也释放掉,否则 QSqlDatabase 全局表会持续增长
+    m_db = QSqlDatabase();
+    if (!connName.isEmpty()) {
+        QSqlDatabase::removeDatabase(connName);
+    }
 }
 }
 
 
 bool OfflineStorage::createTables()
 bool OfflineStorage::createTables()
@@ -65,6 +84,67 @@ bool OfflineStorage::createTables()
         return false;
         return false;
     }
     }
 
 
+    // 应用配置表(key/value 形式,存景深融合开关等)
+    if (!query.exec(R"(
+        CREATE TABLE IF NOT EXISTS app_config (
+            key   TEXT PRIMARY KEY NOT NULL,
+            value TEXT NOT NULL
+        )
+    )")) {
+        qWarning() << "创建 app_config 表失败:" << query.lastError();
+        return false;
+    }
+
+    // 首次启动时写入默认开关(默认开启融合),保证后面能正确读取
+    query.prepare("INSERT OR IGNORE INTO app_config (key, value) VALUES (?, ?)");
+    query.addBindValue("fusion_enabled");
+    query.addBindValue("1");
+    if (!query.exec()) {
+        qWarning() << "写入默认 fusion_enabled 失败:" << query.lastError();
+    }
+
+    return true;
+}
+
+// 通用:从 app_config 读 bool 配置项,找不到或失败时返回默认值
+bool OfflineStorage::readConfigBool(const QString &key, bool defaultValue)
+{
+    QSqlQuery query(m_db);
+    query.prepare("SELECT value FROM app_config WHERE key = ?");
+    query.addBindValue(key);
+    if (!query.exec() || !query.next()) {
+        return defaultValue;
+    }
+    const QString v = query.value(0).toString();
+    if (v == "1" || v.compare("true", Qt::CaseInsensitive) == 0) return true;
+    if (v == "0" || v.compare("false", Qt::CaseInsensitive) == 0) return false;
+    return defaultValue;
+}
+
+// 通用:把 bool 配置写到 app_config(INSERT 或 REPLACE)
+bool OfflineStorage::writeConfigBool(const QString &key, bool value)
+{
+    QSqlQuery query(m_db);
+    query.prepare("INSERT OR REPLACE INTO app_config (key, value) VALUES (?, ?)");
+    query.addBindValue(key);
+    query.addBindValue(value ? "1" : "0");
+    if (!query.exec()) {
+        qWarning() << "写配置失败:" << key << query.lastError();
+        return false;
+    }
+    return true;
+}
+
+// 启动时加载所有持久化配置到内存字段
+bool OfflineStorage::loadAppConfig()
+{
+    bool wasFusion = m_fusionEnabled;
+    m_fusionEnabled = readConfigBool("fusion_enabled", true);
+    if (wasFusion != m_fusionEnabled) {
+        emit fusionEnabledChanged(m_fusionEnabled);
+    }
+    LOG("[OfflineStorage] loadAppConfig: fusion_enabled={}",
+        m_fusionEnabled ? "true" : "false");
     return true;
     return true;
 }
 }
 
 
@@ -73,7 +153,7 @@ bool OfflineStorage::cacheJsonMessage(const QString &topic, const QByteArray &js
     // 获取当前本地时间(基于系统时区)
     // 获取当前本地时间(基于系统时区)
     QDateTime localNow = QDateTime::currentDateTime();
     QDateTime localNow = QDateTime::currentDateTime();
     qint64 secTimestamp = localNow.toSecsSinceEpoch();
     qint64 secTimestamp = localNow.toSecsSinceEpoch();
-    qDebug() << "本地秒级时间戳:" << secTimestamp;
+    DEBUG("本地秒级时间戳: {}", secTimestamp);
     if (!m_jsonCacheEnabled) {
     if (!m_jsonCacheEnabled) {
         qWarning() << "JSON缓存已禁用,拒绝缓存数据";
         qWarning() << "JSON缓存已禁用,拒绝缓存数据";
         return false;
         return false;
@@ -116,7 +196,7 @@ bool OfflineStorage::cacheImagePath(const QString &imagePath)
     // 获取当前本地时间(基于系统时区)
     // 获取当前本地时间(基于系统时区)
     QDateTime localNow = QDateTime::currentDateTime();
     QDateTime localNow = QDateTime::currentDateTime();
     qint64 secTimestamp = localNow.toSecsSinceEpoch();
     qint64 secTimestamp = localNow.toSecsSinceEpoch();
-    qDebug() << "本地秒级时间戳:" << secTimestamp;
+    DEBUG("本地秒级时间戳: {}", secTimestamp);
     if (!m_imageCacheEnabled) {
     if (!m_imageCacheEnabled) {
         qWarning() << "图片缓存已禁用,拒绝缓存路径";
         qWarning() << "图片缓存已禁用,拒绝缓存路径";
         return false;
         return false;
@@ -245,8 +325,7 @@ bool OfflineStorage::markImageUploaded(const QString &imagePath)
         qWarning() << "失败 SQL:" << query.lastQuery();  // 打印实际执行的 SQL(调试用)
         qWarning() << "失败 SQL:" << query.lastQuery();  // 打印实际执行的 SQL(调试用)
         return false;
         return false;
     } else {
     } else {
-        qDebug() << "成功删除图片路径记录,路径:" << imagePath
-                 << ",受影响行数:" << query.numRowsAffected();
+        DEBUG("成功删除图片路径记录,路径:{},受影响行数:{}", imagePath.toStdString(), query.numRowsAffected());
         return true;
         return true;
     }
     }
 }
 }
@@ -289,7 +368,7 @@ bool OfflineStorage::enforceLimit(const QString &table, int maxCount)
         return false;
         return false;
     }
     }
 
 
-    qDebug() << "已删除最老记录 from" << table << ", 当前数量:" << count;
+    DEBUG("已删除最老记录 from {},当前数量: {}", table.toStdString(), count);
     return true;
     return true;
 }
 }
 
 
@@ -320,6 +399,16 @@ void OfflineStorage::setImageCacheEnabled(bool enabled)
     }
     }
 }
 }
 
 
+void OfflineStorage::setFusionEnabled(bool enabled)
+{
+    if (m_fusionEnabled == enabled) return;
+    m_fusionEnabled = enabled;
+    // 持久化到 SQLite,保证重启后状态保留
+    writeConfigBool("fusion_enabled", enabled);
+    LOG("[OfflineStorage] setFusionEnabled: {}", enabled ? "true" : "false");
+    emit fusionEnabledChanged(enabled);
+}
+
 void OfflineStorage::setMaxImageEntries(int max)
 void OfflineStorage::setMaxImageEntries(int max)
 {
 {
     if (m_maxImageEntries != max) {
     if (m_maxImageEntries != max) {

+ 493 - 59
app_bzy_armhf_7/src/cameramanager.cpp

@@ -41,6 +41,11 @@
 #include <main.h>
 #include <main.h>
 #include <m_loger.h>
 #include <m_loger.h>
 #include <QMessageBox>
 #include <QMessageBox>
+#include <QFileInfo>
+
+// OpenCV include.
+#include <opencv2/imgproc.hpp>
+#include <opencv2/core.hpp>
 
 
 // #include "im2d.hpp"
 // #include "im2d.hpp"
 // #include "im2d_common.h"
 // #include "im2d_common.h"
@@ -121,7 +126,9 @@ Frames::Frames(QObject * parent)
     }
     }
 
 
 
 
-    stitch_des = 0;
+    fusion_num = 0;
+    m_height = 0;
+    m_width = 0;
 
 
     connect( m_1s, &QTimer::timeout, this, &Frames::timer);
     connect( m_1s, &QTimer::timeout, this, &Frames::timer);
     m_1s->setInterval( 500 );   //1000
     m_1s->setInterval( 500 );   //1000
@@ -153,7 +160,7 @@ Frames::Frames(QObject * parent)
 
 
 Frames::~Frames()
 Frames::~Frames()
 {
 {
-    qDebug() << "=== Frames Destructor Start ===";
+    DEBUG("=== Frames Destructor Start ===");
     // 1. 先停止所有定时器
     // 1. 先停止所有定时器
     if (m_1s && m_1s->isActive()) {
     if (m_1s && m_1s->isActive()) {
         m_1s->stop();
         m_1s->stop();
@@ -169,7 +176,7 @@ Frames::~Frames()
     {
     {
         // 先停止抓图
         // 先停止抓图
         if (MV_CC_StopGrabbing(handle) != MV_OK) {
         if (MV_CC_StopGrabbing(handle) != MV_OK) {
-            qDebug() << "Warning: Failed to stop grabbing";
+            WARN("Warning: Failed to stop grabbing");
         }
         }
         // 等待抓图线程结束
         // 等待抓图线程结束
         if (m_grabThread.isRunning()) {
         if (m_grabThread.isRunning()) {
@@ -178,7 +185,7 @@ Frames::~Frames()
         }
         }
         // 关闭设备
         // 关闭设备
         if (MV_CC_CloseDevice(handle) != MV_OK) {
         if (MV_CC_CloseDevice(handle) != MV_OK) {
-            qDebug() << "Warning: Failed to close device";
+            WARN("Warning: Failed to close device");
         }
         }
         MV_CC_DestroyHandle(handle);
         MV_CC_DestroyHandle(handle);
         handle  = NULL;
         handle  = NULL;
@@ -203,17 +210,17 @@ Frames::~Frames()
         delete m_videoSink;
         delete m_videoSink;
         m_videoSink = nullptr;
         m_videoSink = nullptr;
     }
     }
-    qDebug() << "=== Frames Destructor End ===";
+    DEBUG("=== Frames Destructor End ===");
 }
 }
 
 
 
 
 void
 void
 Frames::setVideoSink( QVideoSink * newVideoSink )
 Frames::setVideoSink( QVideoSink * newVideoSink )
 {
 {
-    qDebug() << "setVideoSink:"<<newVideoSink;
+    DEBUG("setVideoSink: {}", fmt::ptr(newVideoSink));
     if( m_videoSink == newVideoSink )
     if( m_videoSink == newVideoSink )
     {
     {
-        qDebug() << "m_videoSink == newVideoSink";
+        DEBUG("m_videoSink == newVideoSink");
         return;
         return;
     }
     }
 
 
@@ -222,11 +229,15 @@ Frames::setVideoSink( QVideoSink * newVideoSink )
     emit videoSinkChanged();
     emit videoSinkChanged();
 }
 }
 
 
+
 void
 void
 Frames::setChange(bool stat_t)
 Frames::setChange(bool stat_t)
 {
 {
     LOG("开始自动对焦,发送指令到控制板,{}!",stat_t);
     LOG("开始自动对焦,发送指令到控制板,{}!",stat_t);
     if(stat_t){
     if(stat_t){
+        m_fusionFirstSaved = false;
+        m_fusionFinishing = false;
+        m_fusionActive = false;
         emit serial_data(m_json.Autofocus());
         emit serial_data(m_json.Autofocus());
     }
     }
 
 
@@ -246,7 +257,7 @@ Frames::setCameraSw(bool stat_cam)
     auto qtContext = QJniObject(QNativeInterface::QAndroidApplication::context());
     auto qtContext = QJniObject(QNativeInterface::QAndroidApplication::context());
     jboolean javaState  = stat_cam ? JNI_TRUE :JNI_FALSE;
     jboolean javaState  = stat_cam ? JNI_TRUE :JNI_FALSE;
     param::camera_tc = 0;
     param::camera_tc = 0;
-    stitch_des = 0;
+    fusion_num = 0;
     camera_sta = stat_cam;
     camera_sta = stat_cam;
     if(camera_sta && m_streaming_active) return;  //如果已经是打开状态,退出
     if(camera_sta && m_streaming_active) return;  //如果已经是打开状态,退出
     MVCC_FLOATVALUE stExposureTime = {0};
     MVCC_FLOATVALUE stExposureTime = {0};
@@ -357,7 +368,7 @@ Frames::setCameraSw(bool stat_cam)
                         if (NULL == pDeviceInfo)
                         if (NULL == pDeviceInfo)
                         {
                         {
                             emit cameraOpenFailed("pDeviceInfo is NULL!");
                             emit cameraOpenFailed("pDeviceInfo is NULL!");
-                            qDebug() << "pDeviceInfo is NULL!";
+                            DEBUG("pDeviceInfo is NULL!");
                             return;
                             return;
                         }
                         }
                     }
                     }
@@ -413,10 +424,10 @@ Frames::setCameraSw(bool stat_cam)
                  if (MV_OK != nRet)
                  if (MV_OK != nRet)
                  {
                  {
                      unsigned int unsignedValue = static_cast<unsigned int>(nRet);
                      unsigned int unsignedValue = static_cast<unsigned int>(nRet);
-                     qDebug() << "MV_CC_RegisterImageCallBackEx fail! nRet" << QString::number(unsignedValue, 16).toUpper();
+                     DEBUG("MV_CC_RegisterImageCallBackEx fail! nRet: {:x}", unsignedValue);
                      return ;
                      return ;
                  }else{
                  }else{
-                     qDebug() << "MV_CC_RegisterImageCallBackEx Success!";
+                     DEBUG("MV_CC_RegisterImageCallBackEx Success!");
                  }
                  }
 #endif
 #endif
             MVCC_INTVALUE_EX width,height;
             MVCC_INTVALUE_EX width,height;
@@ -511,7 +522,7 @@ Frames::setCameraSw(bool stat_cam)
             if (MV_OK != nRet)
             if (MV_OK != nRet)
             {
             {
                 unsigned int unsignedValue = static_cast<unsigned int>(nRet);
                 unsigned int unsignedValue = static_cast<unsigned int>(nRet);
-                qDebug() << "MV_CC_RegisterImageCallBackEx fail! nRet:" << QString::number(unsignedValue, 16).toUpper();
+                DEBUG("MV_CC_RegisterImageCallBackEx fail! nRet: {:x}", unsignedValue);
             }
             }
 #endif
 #endif
             // close device
             // close device
@@ -538,11 +549,6 @@ Frames::setCameraSw(bool stat_cam)
     LOG("设置相机状态:{}",camera_sta);
     LOG("设置相机状态:{}",camera_sta);
     emit cameraStaChanged(camera_sta);                   //同步状态到qml
     emit cameraStaChanged(camera_sta);                   //同步状态到qml
     emit serial_data(m_json.setLedState(camera_sta));    //设置补光灯状态
     emit serial_data(m_json.setLedState(camera_sta));    //设置补光灯状态
-    if(!param::ptlist.empty())
-    {
-        //emit signal_photo_saved();
-        //开始景深融合
-    }
 }
 }
 
 
 void
 void
@@ -607,33 +613,40 @@ Frames::saveMatAsJpeg(const QVideoFrame &frame){
     QString ts = QDateTime::currentDateTime().toString("yyyyMMddhhmmss");
     QString ts = QDateTime::currentDateTime().toString("yyyyMMddhhmmss");
     if (frame.isValid()) {
     if (frame.isValid()) {
         QString name = picture_path_floader + "/" + ts +
         QString name = picture_path_floader + "/" + ts +
-                       "z" + QString::number(z_step) +
-                       "x" + QString::number(x_step) + ".jpg";
+                       "_y" + QString::number(fusion_num) + ".jpg";
         QString name_sharp = picture_path_floader + "/" + ts +
         QString name_sharp = picture_path_floader + "/" + ts +
-                       "z" + QString::number(z_step) +
-                       "x" + QString::number(x_step) + "_sharp.jpg";
+                       "_y" + QString::number(fusion_num) + "_sharp.jpg";
         if (frame.toImage().save(name,"jpg",100)) {
         if (frame.toImage().save(name,"jpg",100)) {
-            //param::ptlist.append(name);
             LOG("[saveMatAsJpeg] saved:{}",name.toStdString());
             LOG("[saveMatAsJpeg] saved:{}",name.toStdString());
-            #if 1
-            emit stopGrabbing(false);
-            //图像锐化
-            Mat image = imread(name.toStdString());
-            cv::Mat fused_sharp = m_opencvfunc.unsharpMask(image, 2.0, 3.0);
-            //对比度
-            cv::Mat Contrast_Image = m_opencvfunc.enhanceContrast(fused_sharp,0);
-            std::vector<int> params = {cv::IMWRITE_PNG_COMPRESSION, 3};
-            if (!cv::imwrite(name_sharp.toStdString(), Contrast_Image, params)) {
-                ERROR("Failed to save fused image:{}",name_sharp.toStdString());
-            }else{
-                param::ptlist.append(name_sharp);
-                emit signal_photo_saved();
-            }
-            #else
             param::ptlist.append(name);
             param::ptlist.append(name);
-            emit stopGrabbing(false);
-            #endif
+            if (param::fusion_enable == 0){
+                emit stopGrabbing(false);
+                //图像锐化
+                Mat image = imread(name.toStdString());
+                cv::Mat fused_sharp = m_opencvfunc.unsharpMask(image, 2.0, 3.0);
+                //对比度
+                cv::Mat Contrast_Image = m_opencvfunc.enhanceContrast(fused_sharp,0);
+                std::vector<int> jpegParams = {cv::IMWRITE_JPEG_QUALITY, 95};
+                if (!cv::imwrite(name_sharp.toStdString(), Contrast_Image, jpegParams)) {
+                    ERROR("Failed to save fused image:{}",name_sharp.toStdString());
+                } else {
+                    // 保存清晰图路径,用于景深融合后的清晰度对比
+                    m_sharpPath = name_sharp;
+                    LOG("[saveMatAsJpeg] sharp image path:{}", m_sharpPath.toStdString());
+                    param::ptlist.clear();
+                    param::ptlist.append(name_sharp);
+                    emit signal_photo_saved();
+                }
+                return;
+            }
 
 
+            // 首次保存后启动融合
+            if (!m_fusionFirstSaved) {
+                m_fusionFirstSaved = true;
+                m_fusionActive = true;
+                onMovDone("0");
+                LOG("[saveMatAsJpeg] fusion started after first save");
+            }
         } else {
         } else {
             WARN("[saveMatAsJpeg] write failed:{}",name.toStdString());
             WARN("[saveMatAsJpeg] write failed:{}",name.toStdString());
         }
         }
@@ -642,40 +655,315 @@ Frames::saveMatAsJpeg(const QVideoFrame &frame){
     }
     }
 }
 }
 
 
+void Frames::onMovDone(const QString stepcount)
+{
+    if (!camera_sw()) {
+        ERROR("Camera error!");
+        setCameraSw(false);
+        return;
+    }
+    // 1) 同步在本函数内完成清晰度计算 + 增量融合
+    if (m_fusionActive) {
+        if (stepcount != QString("0")){
+            fusion_num++;
+            param::camera_tc = 1;
+        }
+    }
+    // 2) 清晰度评价 → 串口数据
+    m_qulityString = m_opencvfunc.Tenengrad(m_frame);
+    LOG("onMovDone:{}", m_qulityString.toStdString());
+    emit serial_data(m_json.ImageFunc(m_qulityString.toDouble()));
+    emit qulityStringChanged();
+    emit stepCountChanged(stepcount);
+}
+
+void Frames::finishDynamicFusion(){
+    LOG("开始图片景深融合!");
+    setCameraSw(false);
+
+    if (param::ptlist.isEmpty()) {
+        ERROR("[finishDynamicFusion] ptlist is empty!");
+        return;
+    }
+    LOG("[finishDynamicFusion] ptlist has {} images", param::ptlist.size());
+
+    // 用 ptlist[0](第一张图,通常最清晰)建立参考清晰度基准,后续图以此判断模糊程度
+    {
+        cv::Mat refImg = cv::imread(param::ptlist[0].toStdString(), cv::IMREAD_GRAYSCALE);
+        if (!refImg.empty()) {
+            cv::Mat lap;
+            cv::Laplacian(refImg, lap, CV_32F);
+            cv::Scalar m, s;
+            cv::meanStdDev(lap, m, s);
+            m_refSharpness = s[0] * s[0];
+            LOG("[finishDynamicFusion] ref sharpness (Laplacian var): {}", m_refSharpness);
+        }
+    }
+
+    // 保存 ptlist 副本供后台线程使用
+    QStringList ptlistCopy = param::ptlist;
+
+    // 使用 QtConcurrent 异步执行融合,避免阻塞UI
+    QtConcurrent::run([this, ptlistCopy]() {
+        // 进度回调 lambda(从后台线程调用,需要回到主线程发射信号)
+        auto progress = [this](const QString &msg, int percent) {
+            QMetaObject::invokeMethod(this, [this, msg, percent]() {
+                emit signal_fusion_progress(msg, percent);
+            }, Qt::QueuedConnection);
+        };
+        progress("开始景深融合...", 0);
+
+        // 景深融合开关未启用:跳过融合,对原图做同样后处理后直接上传
+        // 注:param::fusion_enable 由 MQTT fusion_sw 指令同步更新(持久化在 SQLite)
+        if (param::fusion_enable == 0) {
+            progress("融合已关闭,使用原图...", 10);
+            LOG("[finishDynamicFusion] fusion disabled (param::fusion_enable=0), skip fusion");
+            if (ptlistCopy.isEmpty()) {
+                progress("没有图片", 0);
+                LOG("[finishDynamicFusion] ptlistCopy is empty!");
+                return;
+            }
+            QString singlePath = ptlistCopy.first();
+            cv::Mat img = cv::imread(singlePath.toStdString(), cv::IMREAD_COLOR);
+            if (img.empty()) {
+                progress("读取图片失败", 0);
+                LOG("[finishDynamicFusion] failed to read image: {}", singlePath.toStdString());
+                return;
+            }
+            progress("后处理原图...", 50);
+            cv::Mat denoised;
+            cv::bilateralFilter(img, denoised, 9, 25.0, 25.0, cv::BORDER_REFLECT_101);
+            cv::Mat sharp = m_opencvfunc.unsharpMask(denoised, 2.0, 3.0);
+            cv::Mat enhanced = m_opencvfunc.enhanceContrast(sharp, 0);
+            progress("保存图片...", 80);
+            QFileInfo fi(singlePath);
+            QString outPath = fi.absolutePath() + "/" + fi.completeBaseName() + "_enhanced.jpg";
+            std::vector<int> jpegParams = {cv::IMWRITE_JPEG_QUALITY, 95};
+            cv::imwrite(outPath.toStdString(), enhanced, jpegParams);
+            LOG("[finishDynamicFusion] (fusion disabled) saved enhanced: {}", outPath.toStdString());
+            progress("完成", 100);
+            QMetaObject::invokeMethod(this, [this, outPath]() {
+                param::ptlist.clear();
+                param::ptlist.append(outPath);
+                LOG("[finishDynamicFusion] (fusion disabled) emit signal_photo_saved");
+                emit signal_photo_saved();
+            }, Qt::QueuedConnection);
+            return;
+        }
+
+        // 过滤图片:去除黑图、白图、无内容图和重复图
+        progress("正在过滤无效图片...", 5);
+        QStringList filteredList = filterImages(ptlistCopy, progress);
+        if (filteredList.size() < 2) {
+            if (filteredList.isEmpty()) {
+                progress("使用第一张原图...", 10);
+                LOG("[finishDynamicFusion] no valid images after filtering, use first original image");
+
+                // 使用 param::ptlist 第一张图片
+                if (param::ptlist.isEmpty()) {
+                    progress("没有图片", 0);
+                    LOG("[finishDynamicFusion] ptlist is also empty!");
+                    return;
+                }
+
+                QString singlePath = param::ptlist.first();
+                cv::Mat img = cv::imread(singlePath.toStdString(), cv::IMREAD_COLOR);
+                if (img.empty()) {
+                    progress("读取图片失败", 0);
+                    LOG("[finishDynamicFusion] failed to read first image");
+                    return;
+                }
+
+                progress("锐化处理...", 50);
+
+                // 锐化 + 对比度增强
+                cv::Mat sharp = m_opencvfunc.unsharpMask(img, 2.0, 3.0);
+                cv::Mat enhanced = m_opencvfunc.enhanceContrast(sharp, 0);
+
+                progress("保存图片...", 80);
+
+                // 保存处理后的图片
+                QFileInfo fi(singlePath);
+                QString outPath = fi.absolutePath() + "/" + fi.completeBaseName() + "_enhanced.jpg";
+                std::vector<int> jpegParams = {cv::IMWRITE_JPEG_QUALITY, 95};
+                cv::imwrite(outPath.toStdString(), enhanced, jpegParams);
+                LOG("[finishDynamicFusion] saved enhanced first image: {}", outPath.toStdString());
+
+                progress("完成", 100);
+
+                // 更新 ptlist 并触发上传
+                Frames* self = this;
+                QMetaObject::invokeMethod(this, [self, outPath]() {
+                    param::ptlist.clear();
+                    param::ptlist.append(outPath);
+                    self->signal_photo_saved();
+                }, Qt::QueuedConnection);
+
+                // 通知UI
+                Frames* self2 = this;
+                QMetaObject::invokeMethod(this, [self2]() {
+                    self2->signal_fusion_progress("已保存处理后的图片", 100);
+                }, Qt::QueuedConnection);
+                return;
+            } else {
+                progress("处理单张图片...", 10);
+                LOG("[finishDynamicFusion] only %d valid image(s), skipping fusion", filteredList.size());
+
+                // 读取唯一有效的图片
+                QString singlePath = filteredList.first();
+                cv::Mat img = cv::imread(singlePath.toStdString(), cv::IMREAD_COLOR);
+                if (img.empty()) {
+                    progress("读取图片失败", 0);
+                    LOG("[finishDynamicFusion] failed to read single image");
+                    return;
+                }
+
+                progress("锐化处理...", 50);
+
+                // 锐化 + 对比度增强(与融合流程一致)
+                cv::Mat sharp = m_opencvfunc.unsharpMask(img, 2.0, 3.0);
+                cv::Mat enhanced = m_opencvfunc.enhanceContrast(sharp, 0);
+
+                progress("保存图片...", 80);
+
+                // 保存处理后的图片
+                QFileInfo fi(singlePath);
+                QString outPath = fi.absolutePath() + "/" + fi.completeBaseName() + "_enhanced.jpg";
+                std::vector<int> jpegParams = {cv::IMWRITE_JPEG_QUALITY, 95};
+                cv::imwrite(outPath.toStdString(), enhanced, jpegParams);
+                LOG("[finishDynamicFusion] saved enhanced single image: {}", outPath.toStdString());
+
+                progress("完成", 100);
+
+                // 更新 ptlist 并触发上传
+                Frames* self = this;
+                QMetaObject::invokeMethod(this, [self, outPath]() {
+                    param::ptlist.clear();
+                    param::ptlist.append(outPath);
+                    self->signal_photo_saved();
+                }, Qt::QueuedConnection);
+            }
+            return;
+        }
+
+        // 执行融合(带进度回调)
+        QString fusedPath = m_opencvfunc.fuseImages(filteredList, progress);
+
+        if (fusedPath.isEmpty()) {
+            progress("融合失败", 0);
+            LOG("[finishDynamicFusion] fusion failed!");
+            return;
+        }
+
+        progress("读取图片...", 60);
+
+        // 读取融合结果和第一张原图
+        cv::Mat fusedImg = cv::imread(fusedPath.toStdString(), cv::IMREAD_COLOR);
+        QString firstImgPath = ptlistCopy.first();
+        cv::Mat firstImg = cv::imread(firstImgPath.toStdString(), cv::IMREAD_COLOR);
+
+        if (fusedImg.empty() || firstImg.empty()) {
+            progress("读取图片失败", 0);
+            LOG("[finishDynamicFusion] failed to read images");
+            return;
+        }
+
+        progress("处理融合图...", 70);
+
+        // 融合图:锐化 + 对比度增强
+        cv::Mat fusedSharp = m_opencvfunc.unsharpMask(fusedImg, 2.0, 3.0);
+        cv::Mat fusedFinal = m_opencvfunc.enhanceContrast(fusedSharp, 0);
+
+        progress("处理原图...", 75);
+
+        // 第一张原图:锐化 + 对比度增强
+        cv::Mat firstSharp = m_opencvfunc.unsharpMask(firstImg, 2.0, 3.0);
+        cv::Mat firstFinal = m_opencvfunc.enhanceContrast(firstSharp, 0);
+
+        progress("保存锐化图...", 80);
+
+        // 保存锐化后的第一张图片
+        QFileInfo fi(firstImgPath);
+        QString firstSharpPath = fi.absolutePath() + "/" + fi.completeBaseName() + "_sharp.jpg";
+        std::vector<int> jpegParams = {cv::IMWRITE_JPEG_QUALITY, 95};
+        cv::imwrite(firstSharpPath.toStdString(), firstFinal, jpegParams);
+        LOG("[finishDynamicFusion] saved first image sharpened: {}", firstSharpPath.toStdString());
+
+        progress("计算清晰度...", 85);
+
+        // 计算清晰度
+        QString fusedQuality = m_opencvfunc.Tenengrad(fusedFinal);
+        QString firstQuality = m_opencvfunc.Tenengrad(firstFinal);
+
+        LOG("[finishDynamicFusion] fused quality: {}, first quality: {}",
+            fusedQuality.toStdString(), firstQuality.toStdString());
+
+        // 选择更清晰的图片
+        QString bestPath;
+        if (fusedQuality.toDouble() >= firstQuality.toDouble()) {
+            cv::imwrite(fusedPath.toStdString(), fusedFinal, jpegParams);
+            bestPath = fusedPath;
+            LOG("[finishDynamicFusion] use fused image");
+        } else {
+            QFileInfo fi2(firstImgPath);
+            QString outPath = fi2.absolutePath() + "/" + fi2.completeBaseName() + "_enhanced.jpg";
+            cv::imwrite(outPath.toStdString(), firstFinal, jpegParams);
+            bestPath = outPath;
+            LOG("[finishDynamicFusion] use first image");
+        }
+
+        progress("完成", 100);
+
+        // 更新 param::ptlist 并触发上传(回到主线程)
+        QMetaObject::invokeMethod(this, [this, firstSharpPath,bestPath]() {
+            param::ptlist.clear();
+            param::ptlist.append(firstSharpPath);
+            param::ptlist.append(bestPath);
+            LOG("[finishDynamicFusion] emit signal_photo_saved");
+            emit signal_photo_saved();
+        }, Qt::QueuedConnection);
+    });
+}
+
 void
 void
 Frames::processFrameAsync(const RawFrame& frame){
 Frames::processFrameAsync(const RawFrame& frame){
     //QtConcurrent::run([=]() {
     //QtConcurrent::run([=]() {
     cv::Mat raw;
     cv::Mat raw;
+    cv::Mat convertedFrame;
     switch (frame.pixelType) {
     switch (frame.pixelType) {
     case PixelType_Gvsp_BayerRG8:
     case PixelType_Gvsp_BayerRG8:
         raw = cv::Mat(frame.height, frame.width, CV_8UC1,
         raw = cv::Mat(frame.height, frame.width, CV_8UC1,
                       (void*)frame.data.constData());
                       (void*)frame.data.constData());
-        cv::cvtColor(raw, m_frame, cv::COLOR_BayerRG2BGRA);
+        cv::cvtColor(raw, convertedFrame, cv::COLOR_BayerRG2BGRA);
         break;
         break;
 
 
     case PixelType_Gvsp_BayerGR8:
     case PixelType_Gvsp_BayerGR8:
         raw = cv::Mat(frame.height, frame.width, CV_8UC1,
         raw = cv::Mat(frame.height, frame.width, CV_8UC1,
                       (void*)frame.data.constData());
                       (void*)frame.data.constData());
-        cv::cvtColor(raw, m_frame, cv::COLOR_BayerGR2BGRA);
+        cv::cvtColor(raw, convertedFrame, cv::COLOR_BayerGR2BGRA);
         break;
         break;
 
 
     case PixelType_Gvsp_BayerBG8:
     case PixelType_Gvsp_BayerBG8:
         raw = cv::Mat(frame.height, frame.width, CV_8UC1,
         raw = cv::Mat(frame.height, frame.width, CV_8UC1,
                       (void*)frame.data.constData());
                       (void*)frame.data.constData());
-        cv::cvtColor(raw, m_frame, cv::COLOR_BayerBG2BGRA);
+        cv::cvtColor(raw, convertedFrame, cv::COLOR_BayerBG2BGRA);
         break;
         break;
 
 
     case PixelType_Gvsp_YUV422_YUYV_Packed:
     case PixelType_Gvsp_YUV422_YUYV_Packed:
         raw = cv::Mat(frame.height, frame.width, CV_8UC2,
         raw = cv::Mat(frame.height, frame.width, CV_8UC2,
                       (void*)frame.data.constData());
                       (void*)frame.data.constData());
-        cv::cvtColor(raw, m_frame, cv::COLOR_YUV2RGBA_YUYV);
+        cv::cvtColor(raw, convertedFrame, cv::COLOR_YUV2RGBA_YUYV);
         break;
         break;
 
 
     default:
     default:
         return;
         return;
     }
     }
+    {
+        QMutexLocker locker(&m_frameMutex);
+        m_frame = convertedFrame;
+    }
     QVideoFrameFormat vfmt(
     QVideoFrameFormat vfmt(
-        QSize(m_frame.cols, m_frame.rows),
+        QSize(convertedFrame.cols, convertedFrame.rows),
         QVideoFrameFormat::Format_RGBA8888
         QVideoFrameFormat::Format_RGBA8888
         );
         );
 
 
@@ -683,8 +971,8 @@ Frames::processFrameAsync(const RawFrame& frame){
     if (!vf.map(QVideoFrame::WriteOnly))
     if (!vf.map(QVideoFrame::WriteOnly))
         return;
         return;
 
 
-    memcpy(vf.bits(0), m_frame.data,
-           m_frame.total() * m_frame.elemSize());
+    memcpy(vf.bits(0), convertedFrame.data,
+           convertedFrame.total() * convertedFrame.elemSize());
     vf.unmap();
     vf.unmap();
 
 
     // ✅ 投递回 UI 线程
     // ✅ 投递回 UI 线程
@@ -705,7 +993,6 @@ Frames::processFrameAsync(const RawFrame& frame){
             emit stopGrabbing(false);
             emit stopGrabbing(false);
             return;
             return;
         }
         }
-
     }
     }
     //});
     //});
 }
 }
@@ -829,11 +1116,12 @@ Frames:: camera_sw()  const
 
 
 void
 void
 Frames::onFPSUpdated(double fps){
 Frames::onFPSUpdated(double fps){
-    m_fpsString = QString( "%1x%2 at %3 %4 %5" ).arg(QString::number(m_width),
+    m_fpsString = QString( "宽:%1高:%2 图像数量:%3 帧率:%4 曝光:%5 融合:%6" ).arg(QString::number(m_width),
                                                    QString::number(m_height),
                                                    QString::number(m_height),
                                                    QString::number(param::ptlist.size()),
                                                    QString::number(param::ptlist.size()),
-                                                   QString::number(fps,'f',2) + " (FPS) ",
-                                                   cam_ExposureTime());
+                                                   QString::number(fps,'f',2),
+                                                   cam_ExposureTime(),
+                                                   param::fusion_enable ? "开":"关");
     emit fpsStringChanged();
     emit fpsStringChanged();
 }
 }
 
 
@@ -841,7 +1129,6 @@ void
 Frames::timer()
 Frames::timer()
 {
 {
     if(param::camera_tc == 10){
     if(param::camera_tc == 10){
-        emit signal_stitch();
         setCameraSw(false);
         setCameraSw(false);
     }
     }
 #ifdef focus_board
 #ifdef focus_board
@@ -850,14 +1137,6 @@ Frames::timer()
 }
 }
 
 
 void
 void
-Frames::update_qulstr(QString q_str)
-{
-    LOG("update_qulstr:{}",q_str.toStdString());
-    m_qulityString = q_str;
-    emit qulityStringChanged();
-}
-
-void
 Frames::saveImage()
 Frames::saveImage()
 {
 {
     //停止清晰度发送,关闭定时器m1s
     //停止清晰度发送,关闭定时器m1s
@@ -905,5 +1184,160 @@ Frames::captureImage(){
     });
     });
 }
 }
 
 
+// ==================== 图片质量检测实现 ====================
+
+// 内部辅助:计算灰度图的 Laplacian 方差(Laplacian var = 高频能量,聚焦时高、失焦时低)
+static double laplacianSharpness(const cv::Mat& gray) {
+    cv::Mat lap;
+    cv::Laplacian(gray, lap, CV_32F);
+    cv::Scalar mean, stddev;
+    cv::meanStdDev(lap, mean, stddev);
+    return stddev[0] * stddev[0];
+}
+
+// 内部辅助:计算灰度图的边缘密度(Scharr 梯度像素占比,检测低纹理)
+static double edgeDensity(const cv::Mat& gray) {
+    cv::Mat gx, gy;
+    cv::Sobel(gray, gx, CV_32F, 1, 0, 3);
+    cv::Sobel(gray, gy, CV_32F, 0, 1, 3);
+    cv::Mat gradientMag = cv::abs(gx) + cv::abs(gy);
+    double edgePixels = cv::countNonZero(gradientMag > 5.0);
+    return edgePixels / static_cast<double>(gray.total());
+}
+
+// 内部辅助:估计灰度图噪声水平(噪声 ≈ 原图 - 中值滤波结果 的标准差)
+static double estimateNoiseStd(const cv::Mat& gray) {
+    cv::Mat median;
+    cv::medianBlur(gray, median, 5);
+    cv::Mat diff = gray - median;
+    cv::Scalar m, s;
+    cv::meanStdDev(diff, m, s);
+    return s[0];
+}
+
+// 内部辅助:检测局部遮挡(分块 Laplacian 方差,某块远低于全局均值则判定遮挡)
+static bool hasLocalObscuration(const cv::Mat& gray, int gridSize = 4) {
+    const int bh = gray.rows / gridSize;
+    const int bw = gray.cols / gridSize;
+    if (bh < 20 || bw < 20) return false;
+
+    double globalSharp = laplacianSharpness(gray);
+    int blockCount = 0;
+    int badBlocks = 0;
+
+    for (int r = 0; r < gridSize; ++r) {
+        for (int c = 0; c < gridSize; ++c) {
+            cv::Rect roi(c * bw, r * bh, bw, bh);
+            cv::Mat block = gray(roi);
+            double blockSharp = laplacianSharpness(block);
+            // 某块清晰度低于全局 20% 且该块像素数占比合理 → 疑似遮挡
+            if (blockSharp < globalSharp * 0.2) {
+                ++badBlocks;
+            }
+            ++blockCount;
+        }
+    }
+    // 超过 1/4 的块疑似遮挡 → 整体判定有遮挡
+    return badBlocks > blockCount / 4;
+}
+
+// 质量码定义
+// 0=正常 1=全黑 2=全白 4=过曝 5=欠曝 6=低纹理 7=模糊 8=镜头遮挡/脏污
+int Frames::detectImageQuality(const cv::Mat& img) const {
+    if (img.empty()) return 3;
+
+    // 统一转灰度,后续所有计算在此之上
+    cv::Mat gray;
+    if (img.channels() == 3) {
+        cv::cvtColor(img, gray, cv::COLOR_BGR2GRAY);
+    } else if (img.channels() == 4) {
+        cv::cvtColor(img, gray, cv::COLOR_RGBA2GRAY);
+    } else {
+        gray = img.clone();
+    }
+
+    const double w = gray.cols, h = gray.rows;
+    if (w <= 0 || h <= 0) return 3;
+
+    cv::Scalar meanVal = cv::mean(gray);
+    const double meanBrightness = meanVal[0];
+
+    // ---------- 1. 全黑/全白(亮度极端) ----------
+    if (meanBrightness < 15.0)  return 1;  // 全黑
+    if (meanBrightness > 240.0) return 2;  // 全白
+
+    // ---------- 2. 过曝/欠曝(截断像素占比) ----------
+    // 过曝:高亮度像素占比过高(高光截断 → 无纹理)
+    cv::Mat overMask = (gray >= 250);
+    const double overRatio = cv::countNonZero(overMask) / static_cast<double>(gray.total());
+    if (overRatio > 0.8) return 4;  // 超过 80% 高光像素
+
+    // 欠曝:低亮度像素占比过高
+    cv::Mat underMask = (gray <= 5);
+    const double underRatio = cv::countNonZero(underMask) / static_cast<double>(gray.total());
+    if (underRatio > 0.9) return 5;  // 超过 90% 暗部像素
+
+    // ---------- 3. 低纹理(边缘密度) ----------
+    // 仅对中央 80% 区域采样,避免边框噪点干扰
+    const cv::Rect roi(static_cast<int>(w * 0.1), static_cast<int>(h * 0.1),
+                       static_cast<int>(w * 0.8), static_cast<int>(h * 0.8));
+    const double edgeRatio = edgeDensity(gray(roi));
+    if (edgeRatio < 0.005) return 6;  // 几乎无纹理
+#if 0
+    // ---------- 4. 运动模糊 / 低清晰度(相对 Laplacian 方差) ----------
+    const double lapVar = laplacianSharpness(gray(roi));
+    // m_refSharpness 由 ptlist[0](最清晰帧)初始化;若未初始化则以当前图为准
+    const double refSharp = (m_refSharpness > 0.0) ? m_refSharpness : lapVar;
+    // 低于参考值 60% 且低于绝对阈值 100 → 判定模糊
+    if (lapVar < refSharp * 0.4 || lapVar < 80.0) return 7;
+#endif
+    // ---------- 5. 镜头遮挡 / 脏污(分块 Laplacian 方差) ----------
+    if (hasLocalObscuration(gray(roi))) return 8;
+
+    return 0;  // 通过全部检测
+}
+
+QStringList Frames::filterImages(const QStringList& paths,
+                                  std::function<void(const QString&, int)> progressCallback) const {
+    QStringList filtered;
+
+    const int total = paths.size();
+
+    for (int i = 0; i < paths.size(); ++i) {
+        const QString& path = paths[i];
+
+        // 报告进度
+        if (progressCallback) {
+            progressCallback(QString("检测图片 %1/%2...").arg(i + 1).arg(total), (i * 50) / total);
+        }
+
+        // 读取图片
+        cv::Mat img = cv::imread(path.toStdString(), cv::IMREAD_COLOR);
+        if (img.empty()) {
+            LOG("[filterImages] skip invalid image: {}", path.toStdString());
+            continue;
+        }
+
+        // 检测图片质量
+        int quality = detectImageQuality(img);
+        switch (quality) {
+            case 1: LOG("[filterImages] skip (全黑): {}", path.toStdString()); break;
+            case 2: LOG("[filterImages] skip (全白): {}", path.toStdString()); break;
+            case 4: LOG("[filterImages] skip (过曝): {}", path.toStdString()); break;
+            case 5: LOG("[filterImages] skip (欠曝): {}", path.toStdString()); break;
+            case 6: LOG("[filterImages] skip (低纹理): {}", path.toStdString()); break;
+            case 7: LOG("[filterImages] skip (模糊): {}", path.toStdString()); break;
+            case 8: LOG("[filterImages] skip (镜头遮挡): {}", path.toStdString()); break;
+            default: filtered.append(path); break;
+        }
+    }
+
+    LOG("[filterImages] filtered: {} -> {} images", paths.size(), filtered.size());
+    if (progressCallback) {
+        progressCallback(QString("过滤完成: %1张有效图片").arg(filtered.size()), 50);
+    }
+
+    return filtered;
+}
 
 
 } /* namespace Qt6QCamera */
 } /* namespace Qt6QCamera */

+ 6 - 6
app_bzy_armhf_7/src/m_json.cpp

@@ -111,10 +111,10 @@ JsonFunc::BoardMessage()
                 temp_net_ipv4 = "";
                 temp_net_ipv4 = "";
             }
             }
             
             
-            qDebug() << "接口名称:" << temp_net_name;
-            qDebug() << "接口描述:" << temp_net_description;
-            qDebug() << "MAC地址:" << temp_net_mac;
-            qDebug() << "IPv4地址:" << temp_net_ipv4;
+            DEBUG("接口名称:{}", temp_net_name.toStdString());
+            DEBUG("接口描述:{}", temp_net_description.toStdString());
+            DEBUG("MAC地址:{}", temp_net_mac.toStdString());
+            DEBUG("IPv4地址:{}", temp_net_ipv4.toStdString());
             isConnected = true;
             isConnected = true;
             break;
             break;
         }
         }
@@ -395,13 +395,13 @@ JsonFunc::setmqttState_d()
 {
 {
     QByteArray transmitDataTemp;
     QByteArray transmitDataTemp;
 
 
-    qDebug() << "setmqttState_d:" <<net_value;
+    DEBUG("setmqttState_d: {}", net_value.toStdString());
 }
 }
 
 
 void
 void
 JsonFunc::setmqttState_c()
 JsonFunc::setmqttState_c()
 {
 {
 
 
-    qDebug() << "setmqttState_c:" <<net_value;
+    DEBUG("setmqttState_c: {}", net_value.toStdString());
 
 
 }
 }

+ 38 - 26
app_bzy_armhf_7/src/m_opencv.cpp

@@ -16,6 +16,7 @@
 #include <thread>
 #include <thread>
 #include <atomic>
 #include <atomic>
 #include <mutex>
 #include <mutex>
+#include <functional>
 
 
 // 非 free 模块,Felgo Android 已默认 opencv_contrib 之外的子模块编译
 // 非 free 模块,Felgo Android 已默认 opencv_contrib 之外的子模块编译
 #include <opencv2/photo.hpp>            // CLAHE
 #include <opencv2/photo.hpp>            // CLAHE
@@ -32,7 +33,7 @@ struct ScopedTimer {
     ~ScopedTimer() {
     ~ScopedTimer() {
         qint64 ms = QDateTime::currentMSecsSinceEpoch() - startMs;
         qint64 ms = QDateTime::currentMSecsSinceEpoch() - startMs;
         LOG("[{}] elapsed = {} ms", label.toStdString(), (long long)ms);
         LOG("[{}] elapsed = {} ms", label.toStdString(), (long long)ms);
-        qDebug().noquote() << "[Timing]" << label << "=" << ms << "ms";
+        DEBUG("[Timing] {} = {}ms", label.toStdString(), (long long)ms);
     }
     }
 };
 };
 
 
@@ -90,7 +91,7 @@ static void capOpenCVThreads() {
     if (hw <= 0) hw = 2;
     if (hw <= 0) hw = 2;
     int cap = std::min(hw, 2); // 显微场景硬限 2 线程,避免 OOM
     int cap = std::min(hw, 2); // 显微场景硬限 2 线程,避免 OOM
     cv::setNumThreads(cap);
     cv::setNumThreads(cap);
-    qDebug() << "[Fusion] OpenCV threads capped to" << cap;
+    DEBUG("[Fusion] OpenCV threads capped to {}", cap);
 }
 }
 
 
 // ============== 内部融合算法实现 ==============
 // ============== 内部融合算法实现 ==============
@@ -223,7 +224,7 @@ static cv::Mat pyramidBlendFusion(const std::vector<cv::Mat>& images, int reques
         while (std::min(h, w) >= 16) { ++autoMaxLevels; h /= 2; w /= 2; }
         while (std::min(h, w) >= 16) { ++autoMaxLevels; h /= 2; w /= 2; }
     }
     }
     int levels = std::max(2, std::min(requestedLevels, autoMaxLevels));
     int levels = std::max(2, std::min(requestedLevels, autoMaxLevels));
-    qDebug() << "[Pyramid] Using" << levels << "levels (max" << autoMaxLevels << ")";
+    DEBUG("[Pyramid] Using {} levels (max {})", levels, autoMaxLevels);
 
 
     capOpenCVThreads();
     capOpenCVThreads();
 
 
@@ -421,8 +422,7 @@ static cv::Mat weightedLaplacianFusion(const std::vector<cv::Mat>& images,
     const int cols = images[0].cols;
     const int cols = images[0].cols;
     const int ch = images[0].channels();
     const int ch = images[0].channels();
 
 
-    qDebug() << "[FlatFusion] N=" << N << "size=" << cols << "x" << rows
-             << "wp=" << weightPow << "sigma=" << smoothSigma;
+    DEBUG("[FlatFusion] N={} size={}x{} wp={} sigma={}", N, cols, rows, weightPow, smoothSigma);
 
 
     capOpenCVThreads();
     capOpenCVThreads();
 
 
@@ -519,6 +519,16 @@ static cv::Mat weightedLaplacianFusion(const std::vector<cv::Mat>& images,
 
 
 // 内部同步融合方法
 // 内部同步融合方法
 QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
 QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
+    return fuseImages(imagePaths, nullptr);
+}
+
+QString OpencvFunc::fuseImages(const QStringList& imagePaths, std::function<void(const QString&, int)> progressCallback) {
+    auto report = [&progressCallback](const QString &msg, int percent) {
+        if (progressCallback) {
+            progressCallback(msg, percent);
+        }
+    };
+
     QElapsedTimer totalTimer; totalTimer.start();
     QElapsedTimer totalTimer; totalTimer.start();
     QElapsedTimer stageTimer;
     QElapsedTimer stageTimer;
     try {
     try {
@@ -541,6 +551,7 @@ QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
             qWarning() << "First image invalid:" << firstPath;
             qWarning() << "First image invalid:" << firstPath;
             return QString();
             return QString();
         }
         }
+        report(QString("加载图片 1/%1...").arg(N), 5);
         cv::Mat first = cv::imread(firstPath.toStdString(), cv::IMREAD_COLOR);
         cv::Mat first = cv::imread(firstPath.toStdString(), cv::IMREAD_COLOR);
         if (first.empty()) {
         if (first.empty()) {
             qWarning() << "Failed to load first image:" << firstPath;
             qWarning() << "Failed to load first image:" << firstPath;
@@ -556,8 +567,7 @@ QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
         const size_t estMB = estimateFusionMemoryMB(rows, cols, channels, N);
         const size_t estMB = estimateFusionMemoryMB(rows, cols, channels, N);
         LOG("[fuseImages] estimated peak memory (orig-res) = {} MB for {}x{}x{}x{}",
         LOG("[fuseImages] estimated peak memory (orig-res) = {} MB for {}x{}x{}x{}",
             (long long)estMB, N, rows, cols, channels);
             (long long)estMB, N, rows, cols, channels);
-        qDebug().noquote() << "[Fusion] estimated memory (orig-res) ~" << estMB << "MB for"
-                           << N << "x" << rows << "x" << cols;
+        DEBUG("[Fusion] estimated memory (orig-res) ~ {} MB for {}x{}x{}x{}", (long long)estMB, N, rows, cols, channels);
 
 
         // 工作分辨率(与 fuseAdvanced 内部 WORK_MAX_EDGE 保持一致)
         // 工作分辨率(与 fuseAdvanced 内部 WORK_MAX_EDGE 保持一致)
         int workRows = rows, workCols = cols;
         int workRows = rows, workCols = cols;
@@ -573,8 +583,7 @@ QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
             estimateFusionMemoryMBWork(rows, cols, channels, N, workRows, workCols);
             estimateFusionMemoryMBWork(rows, cols, channels, N, workRows, workCols);
         LOG("[fuseImages] estimated peak memory (work-res {}x{}) = {} MB",
         LOG("[fuseImages] estimated peak memory (work-res {}x{}) = {} MB",
             workCols, workRows, (long long)estMBWork);
             workCols, workRows, (long long)estMBWork);
-        qDebug().noquote() << QString("[Fusion] estimated memory (work %1x%2) ~ %3 MB")
-                                  .arg(workCols).arg(workRows).arg(estMBWork);
+        DEBUG("[Fusion] estimated memory (work {}x{}) ~ {} MB", workCols, workRows, (long long)estMBWork);
 
 
         // 硬上限:使用工作分辨率估算,且区分平台(Android 更严,Linux/嵌入式宽松)
         // 硬上限:使用工作分辨率估算,且区分平台(Android 更严,Linux/嵌入式宽松)
         // - Android: 512MB
         // - Android: 512MB
@@ -595,6 +604,8 @@ QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
         }
         }
 
 
         // ---- 阶段 2:加载剩余图(受控并行:最多 4 worker)----
         // ---- 阶段 2:加载剩余图(受控并行:最多 4 worker)----
+        report(QString("加载剩余图片..."), 15);
+
         std::vector<cv::Mat> loaded;
         std::vector<cv::Mat> loaded;
         loaded.reserve(N);
         loaded.reserve(N);
         loaded.push_back(std::move(first));
         loaded.push_back(std::move(first));
@@ -640,10 +651,12 @@ QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
         }
         }
         qint64 loadMs = stageTimer.elapsed();
         qint64 loadMs = stageTimer.elapsed();
         LOG("[fuseImages] loaded {} images in {} ms", (int)loaded.size(), (long long)loadMs);
         LOG("[fuseImages] loaded {} images in {} ms", (int)loaded.size(), (long long)loadMs);
-        qDebug().noquote() << "[Fusion]" << "Loaded" << loaded.size() << "images in" << loadMs << "ms";
+        report(QString("加载完成,共%1张图片").arg(loaded.size()), 25);
+        DEBUG("[Fusion] Loaded {} images in {} ms", (int)loaded.size(), (long long)loadMs);
 
 
         // ---- 阶段 3:尺寸归一化 ----
         // ---- 阶段 3:尺寸归一化 ----
         stageTimer.restart();
         stageTimer.restart();
+        report("归一化图片尺寸...", 30);
         for (size_t i = 1; i < loaded.size(); ++i) {
         for (size_t i = 1; i < loaded.size(); ++i) {
             if (loaded[i].rows != rows || loaded[i].cols != cols || loaded[i].channels() != channels) {
             if (loaded[i].rows != rows || loaded[i].cols != cols || loaded[i].channels() != channels) {
                 cv::Size gotSize = loaded[i].size();
                 cv::Size gotSize = loaded[i].size();
@@ -672,16 +685,16 @@ QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
         qint64 totalPixels = (qint64)loaded.size() * rows * cols;
         qint64 totalPixels = (qint64)loaded.size() * rows * cols;
         LOG("[fuseImages] images={}, size={}x{}, channels={}, totalPixels={} ({:.2f} MP)",
         LOG("[fuseImages] images={}, size={}x{}, channels={}, totalPixels={} ({:.2f} MP)",
             (int)loaded.size(), rows, cols, channels, totalPixels, totalPixels / 1e6);
             (int)loaded.size(), rows, cols, channels, totalPixels, totalPixels / 1e6);
-        qDebug().noquote() << QString("[Fusion] images=%1, size=%2x%3, channels=%4, MP=%5")
-                                  .arg(loaded.size()).arg(rows).arg(cols).arg(channels)
-                                  .arg(totalPixels / 1e6, 0, 'f', 2);
+        DEBUG("[Fusion] images={}, size={}x{}, channels={}, MP={:.2f}", (int)loaded.size(), rows, cols, channels, totalPixels / 1e6);
 
 
         // ---- 阶段 4:高级融合流水线(CLAHE + ECC + 3级HaarDWT + 双边后处理)----
         // ---- 阶段 4:高级融合流水线(CLAHE + ECC + 3级HaarDWT + 双边后处理)----
         stageTimer.restart();
         stageTimer.restart();
+        report("正在进行图像融合...", 35);
         // 使用输入图片所在目录保存融合结果
         // 使用输入图片所在目录保存融合结果
         QFileInfo firstFile(firstPath);
         QFileInfo firstFile(firstPath);
         QString outDir = firstFile.absolutePath();
         QString outDir = firstFile.absolutePath();
         cv::Mat fused = fuseAdvanced(loaded, outDir);
         cv::Mat fused = fuseAdvanced(loaded, outDir);
+        report("融合完成", 45);
         qint64 fuseMs = stageTimer.elapsed();
         qint64 fuseMs = stageTimer.elapsed();
         if (fused.empty()) {
         if (fused.empty()) {
             qWarning() << "Fusion failed!";
             qWarning() << "Fusion failed!";
@@ -690,28 +703,28 @@ QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
 
 
         // ---- 阶段 5:保存 ----
         // ---- 阶段 5:保存 ----
         stageTimer.restart();
         stageTimer.restart();
+        report("保存融合结果...", 48);
         QDir().mkpath(outDir);
         QDir().mkpath(outDir);
         QString timestamp = QDateTime::currentDateTime().toString("yyyyMMdd_hhmmss");
         QString timestamp = QDateTime::currentDateTime().toString("yyyyMMdd_hhmmss");
-        QString fileName = QString("fused_%1.png").arg(timestamp);
+        QString fileName = QString("fused_%1.jpg").arg(timestamp);
         QString fullPath = outDir + "/" + fileName;
         QString fullPath = outDir + "/" + fileName;
 
 
         // 用 PNG 无损保存——JPEG 在 quality=92 仍会引入 8x8 DCT 块伪影,
         // 用 PNG 无损保存——JPEG 在 quality=92 仍会引入 8x8 DCT 块伪影,
         // 在显微多焦点融合结果(高频细节 + 局部对比拉伸)上会显现为网格阴影。
         // 在显微多焦点融合结果(高频细节 + 局部对比拉伸)上会显现为网格阴影。
         // PNG 无损,融合结果所见即所得;文件大小对显微图可接受。
         // PNG 无损,融合结果所见即所得;文件大小对显微图可接受。
-        std::vector<int> params = {cv::IMWRITE_PNG_COMPRESSION, 3};
+        std::vector<int> params = {cv::IMWRITE_JPEG_QUALITY, 95};
         if (!cv::imwrite(fullPath.toStdString(), fused, params)) {
         if (!cv::imwrite(fullPath.toStdString(), fused, params)) {
             qWarning() << "Failed to save fused image:" << fullPath;
             qWarning() << "Failed to save fused image:" << fullPath;
             return QString();
             return QString();
         }
         }
+        report("保存完成", 50);
         qint64 saveMs = stageTimer.elapsed();
         qint64 saveMs = stageTimer.elapsed();
 
 
         qint64 totalMs = totalTimer.elapsed();
         qint64 totalMs = totalTimer.elapsed();
         LOG("[fuseImages] total = {} ms (load={} norm={} fuse={} save={})",
         LOG("[fuseImages] total = {} ms (load={} norm={} fuse={} save={})",
             (long long)totalMs, (long long)loadMs, (long long)normMs,
             (long long)totalMs, (long long)loadMs, (long long)normMs,
             (long long)fuseMs, (long long)saveMs);
             (long long)fuseMs, (long long)saveMs);
-        qDebug().noquote() << QString("[Fusion] TOTAL=%1ms (load=%2 norm=%3 fuse=%4 save=%5) -> %6")
-                                  .arg(totalMs).arg(loadMs).arg(normMs).arg(fuseMs).arg(saveMs)
-                                  .arg(fullPath);
+        DEBUG("[Fusion] TOTAL={}ms (load={} norm={} fuse={} save={}) -> {}", (long long)totalMs, (long long)loadMs, (long long)normMs, (long long)fuseMs, (long long)saveMs, fullPath.toStdString());
         return fullPath;
         return fullPath;
     } catch (const cv::Exception& e) {
     } catch (const cv::Exception& e) {
         qCritical() << "OpenCV exception in fuseImages:" << e.what();
         qCritical() << "OpenCV exception in fuseImages:" << e.what();
@@ -757,7 +770,7 @@ QString OpencvFunc::brenner(cv::Mat &image)
     QString str;
     QString str;
     if (image.size==0)
     if (image.size==0)
     {
     {
-        qDebug() <<"空图片!";
+        DEBUG("空图片!");
         return "";
         return "";
     }
     }
     cv::Mat gray_img;
     cv::Mat gray_img;
@@ -766,7 +779,7 @@ QString OpencvFunc::brenner(cv::Mat &image)
     }else if(image.channels() == 3){
     }else if(image.channels() == 3){
         cv::cvtColor(image, gray_img, COLOR_BGR2GRAY);
         cv::cvtColor(image, gray_img, COLOR_BGR2GRAY);
     }else{
     }else{
-        qDebug() <<"不支持的通道数!";
+        WARN("不支持的通道数!");
     }
     }
     // 修复点1: parallel_for_ 内累加到 result(double&) 是数据竞争,UB。
     // 修复点1: parallel_for_ 内累加到 result(double&) 是数据竞争,UB。
     //          改用每行局部 double + reduce,OpenCV 的 parallel_for_ 不支持
     //          改用每行局部 double + reduce,OpenCV 的 parallel_for_ 不支持
@@ -844,7 +857,7 @@ QString OpencvFunc::calculateSharpness(const QImage& image){
 QString OpencvFunc::Laplacian(cv::Mat &image){
 QString OpencvFunc::Laplacian(cv::Mat &image){
     if (image.size==0)
     if (image.size==0)
     {
     {
-        qDebug() <<"空图片!";
+        DEBUG("空图片!");
         return "";
         return "";
     }
     }
     cv::Mat grayImage;
     cv::Mat grayImage;
@@ -962,7 +975,7 @@ Mat OpencvFunc::qim2mat(QImage &qim)
                   CV_8UC4,(void*)qim.constBits(),qim.bytesPerLine());
                   CV_8UC4,(void*)qim.constBits(),qim.bytesPerLine());
         break;
         break;
     default:
     default:
-        qDebug() <<"QImage to mat failed!";
+        DEBUG("QImage to mat failed!");
         break;
         break;
     }
     }
     return mat;
     return mat;
@@ -1551,7 +1564,7 @@ cv::Mat OpencvFunc::fuseAdvanced(const std::vector<cv::Mat>& images,
         canon.push_back(ci);
         canon.push_back(ci);
     }
     }
     const int N = (int)canon.size();
     const int N = (int)canon.size();
-    qDebug() << "[HalconFusion] N=" << N << "size=" << cols << "x" << rows;
+    DEBUG("[HalconFusion] N={} size={}x{}", N, cols, rows);
 
 
     // ---------- 2) 多尺度 AGD 清晰度图 ----------
     // ---------- 2) 多尺度 AGD 清晰度图 ----------
     //
     //
@@ -1771,8 +1784,7 @@ cv::Mat OpencvFunc::fuseAdvanced(const std::vector<cv::Mat>& images,
     }
     }
 #endif
 #endif
     //锐化
     //锐化
-    qDebug() << "[HalconFusion] done, output" << cols << "x" << rows
-             << "sigma=" << sigmaFuse;
+    DEBUG("[HalconFusion] done, output {}x{} sigma={}", cols, rows, sigmaFuse);
     cv::Mat fused_sharp = unsharpMask(fused, 2.0, 3.0);
     cv::Mat fused_sharp = unsharpMask(fused, 2.0, 3.0);
     //对比度增强
     //对比度增强
     cv::Mat fused_contrast = enhanceContrast(fused_sharp,0);
     cv::Mat fused_contrast = enhanceContrast(fused_sharp,0);
@@ -1821,7 +1833,7 @@ cv::Mat OpencvFunc::unsharpMask(const cv::Mat& src, double amount, double sigma)
     cv::Mat result;
     cv::Mat result;
     resultF32.convertTo(result, CV_8U);
     resultF32.convertTo(result, CV_8U);
 
 
-    qDebug() << "[unsharpMask] done, amount=" << amount << "sigma=" << sigma;
+    DEBUG("[unsharpMask] done, amount={} sigma={}", amount, sigma);
     return result;
     return result;
 }
 }
 
 

+ 4 - 4
app_bzy_armhf_7/src/m_workthread.cpp

@@ -4,7 +4,7 @@
 Mthreadwork::Mthreadwork(QObject *parent) :
 Mthreadwork::Mthreadwork(QObject *parent) :
     QObject(parent), m_message("")
     QObject(parent), m_message("")
 {
 {
-     qDebug() << "Mthreadwork::Mthreadwork";
+     DEBUG("Mthreadwork::Mthreadwork");
 }
 }
 
 
 
 
@@ -16,7 +16,7 @@ QString Mthreadwork::message() const
 void Mthreadwork::doWork(QVideoFrame  dframe)
 void Mthreadwork::doWork(QVideoFrame  dframe)
 {
 {
 
 
-    qDebug() <<"doWork";
+    DEBUG("doWork");
     Mat f_mat;
     Mat f_mat;
     if(dframe.isValid())
     if(dframe.isValid())
     {
     {
@@ -32,7 +32,7 @@ void Mthreadwork::doWork(QVideoFrame  dframe)
                 //qDebug() <<"camera format:"<< image.format();
                 //qDebug() <<"camera format:"<< image.format();
                 f_mat = m_opencvfunc.qim2mat(image);
                 f_mat = m_opencvfunc.qim2mat(image);
                 m_message = m_opencvfunc.brenner(f_mat);
                 m_message = m_opencvfunc.brenner(f_mat);
-                qDebug() <<"清晰度:"<< m_message;
+                DEBUG("清晰度: {}", m_message.toStdString());
                 emit sendMessage(m_message);
                 emit sendMessage(m_message);
 
 
                 if(focus_flag==1)   //串口及对焦位置初始化
                 if(focus_flag==1)   //串口及对焦位置初始化
@@ -44,7 +44,7 @@ void Mthreadwork::doWork(QVideoFrame  dframe)
                 }
                 }
             }
             }
             else{
             else{
-                qDebug() <<"camera is null:"<< image.format();
+                WARN("camera is null: format={}", image.format());
             }
             }
 
 
         }
         }

+ 82 - 12
app_bzy_armhf_7/src/mqtthandler.cpp

@@ -258,20 +258,90 @@ MqttHandler::onMessageReceived(const QByteArray &message, const QMqttTopicName &
         QJsonValue ID = jsonObject["id"];
         QJsonValue ID = jsonObject["id"];
         if(!JSONRPC.isNull()&&!METHOD.isNull()&&!ID.isNull()){
         if(!JSONRPC.isNull()&&!METHOD.isNull()&&!ID.isNull()){
             if(METHOD.isString()){
             if(METHOD.isString()){
-                if(METHOD.toString()=="upload_log"&&!PARAMS.isNull()){
+                QString methodStr = METHOD.toString();
+                // 透传原报文的 id,响应时回给远端,便于其区分多笔请求
+                const QJsonValue idVal = ID;
+                auto buildOk = [&](const QString &statusMsg, int enableInt) {
+                    QJsonObject resultObj;
+                    resultObj.insert("method", methodStr);
+                    resultObj.insert("status", "ok");
+                    resultObj.insert("enable", enableInt);
+                    resultObj.insert("message", statusMsg);
+                    QJsonObject respObj;
+                    respObj.insert("jsonrpc", "2.0");
+                    respObj.insert("result", resultObj);
+                    respObj.insert("id", idVal.isNull() ? QJsonValue(QJsonValue::Null) : idVal);
+                    return QJsonDocument(respObj).toJson(QJsonDocument::Compact);
+                };
+                auto buildErr = [&](int code, const QString &msg) {
+                    QJsonObject errObj;
+                    errObj.insert("code", code);
+                    errObj.insert("message", msg);
+                    QJsonObject respObj;
+                    respObj.insert("jsonrpc", "2.0");
+                    respObj.insert("error", errObj);
+                    respObj.insert("id", idVal.isNull() ? QJsonValue(QJsonValue::Null) : idVal);
+                    return QJsonDocument(respObj).toJson(QJsonDocument::Compact);
+                };
+                // {"jsonrpc":"2.0","method":"fusion_sw","params":{"enable":0/1},"id":1}
+                // MQTT 远端控制景深融合开关:先持久化到 SQLite,再同步更新 param 全局变量(拍照流程会读取)
+                if(methodStr=="fusion_sw"&&!PARAMS.isNull()&&PARAMS.isObject()){
+                    QJsonObject paramsObj = PARAMS.toObject();
+                    QJsonValue enableVal = paramsObj["enable"];
+                    if(!enableVal.isNull()&&enableVal.isDouble()){
+                        int enableInt = enableVal.toInt();
+                        bool enableBool = (enableInt != 0);
+                        // 1) 写 SQLite(持久化)
+                        if(m_storage){
+                            m_storage->setFusionEnabled(enableBool);
+                        }
+                        // 2) 同步全局静态变量(运行期拍照融合会读这个值)
+                        param::fusion_enable = enableBool ? 1 : 0;
+                        LOG("[MQTT] fusion_sw enable={} -> param::fusion_enable={}, stored in SQLite",
+                            enableInt, param::fusion_enable);
+                        // 3) 反馈给远端:jsonrpc 2.0 成功响应
+                        QByteArray fusionAck = buildOk(
+                            QString("融合开关已设置:%1").arg(enableInt), enableInt);
+                        publish_m(fusionAck);
+                    } else {
+                        WARN("[MQTT] fusion_sw 缺少有效 enable 参数: {}",
+                             m_client_dataBuf.constData());
+                        // jsonrpc 2.0 错误响应:-32602 Invalid params
+                        publish_m(buildErr(-32602, "params.enable 必须为 0 或 1"));
+                    }
+                }
+                if(methodStr=="upload_log"&&!PARAMS.isNull()){
                     QJsonObject params_Obj = PARAMS.toObject();
                     QJsonObject params_Obj = PARAMS.toObject();
                     QJsonValue filename_value = params_Obj["filename"];
                     QJsonValue filename_value = params_Obj["filename"];
-                    QString appDataPath = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/Android/data/com.yfkj.bzyv1/files/";//GenericDataLocation
-                    QString logFilePath = appDataPath +"/" + filename_value.toString();
-                    // 1. 创建临时副本
-                    QString tempLogFile = QDir::tempPath() + "/temp_log_" +
-                                          QDateTime::currentDateTime().toString("yyyyMMdd_hhmmss") + ".txt";
-                    if (QFile::copy(logFilePath, tempLogFile)) {
-                        // 2. 上传副本文件
-                        emit signal_upload_log(tempLogFile);
-                        // 3. 可选:设置定时器删除临时文件
-                    } else {
-                        WARN("无法复制日志文件:{}",logFilePath.toStdString());
+                    if(filename_value.isNull()||!filename_value.isString()){
+                        WARN("[MQTT] upload_log 缺少 filename 参数");
+                        publish_m(buildErr(-32602, "params.filename 缺失或非字符串"));
+                    }else{
+                        QString appDataPath = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/Android/data/com.yfkj.bzyv1/files/";//GenericDataLocation
+                        QString logFilePath = appDataPath +"/" + filename_value.toString();
+                        // 1. 创建临时副本
+                        QString tempLogFile = QDir::tempPath() + "/temp_log_" +
+                                              QDateTime::currentDateTime().toString("yyyyMMdd_hhmmss") + ".txt";
+                        if (QFile::copy(logFilePath, tempLogFile)) {
+                            // 2. 上传副本文件
+                            emit signal_upload_log(tempLogFile);
+                            // 3. 可选:设置定时器删除临时文件
+                            QJsonObject resultObj;
+                            resultObj.insert("method", methodStr);
+                            resultObj.insert("status", "ok");
+                            resultObj.insert("message", "日志文件已加入上传队列");
+                            resultObj.insert("temp_file", tempLogFile);
+                            QJsonObject respObj;
+                            respObj.insert("jsonrpc", "2.0");
+                            respObj.insert("result", resultObj);
+                            respObj.insert("id", idVal.isNull() ? QJsonValue(QJsonValue::Null) : idVal);
+                            publish_m(QJsonDocument(respObj).toJson(QJsonDocument::Compact));
+                        } else {
+                            WARN("无法复制日志文件:{}",logFilePath.toStdString());
+                            // -32001 业务级自定义错误:日志文件复制失败
+                            publish_m(buildErr(-32001,
+                                QString("无法复制日志文件:%1").arg(logFilePath)));
+                        }
                     }
                     }
                 }
                 }
             }
             }

+ 14 - 12
app_bzy_armhf_7/src/mserial.cpp

@@ -220,12 +220,14 @@ SerialThread::processJsonData(const QByteArray &jsonData)
                             emit translatedone();
                             emit translatedone();
                             emit dataUpload(jsonData);
                             emit dataUpload(jsonData);
                         }else if(statusValue.toString().contains("auto_focus")){
                         }else if(statusValue.toString().contains("auto_focus")){
-                            emit autoFocusDone();
+                            // 对焦阶段结束,焦点位置已确定(最清晰点)。
+                            // 不结束融合,因为 MCU 接下来会在焦点附近上下移动采集多帧做景深融合。
                             emit timeout_mov_stop();
                             emit timeout_mov_stop();
                             param::camera_tc = 1;
                             param::camera_tc = 1;
                         }else if(statusValue.toString().contains("focus_done")){
                         }else if(statusValue.toString().contains("focus_done")){
-                            // emit autoFocusDone();
-                            // emit timeout_mov_stop();
+                            // MCU 在焦点附近上下移动采集完成 -> 结束景深融合,保存最终融合图
+                            emit autoFocusDone();
+                            emit timeout_mov_stop();
                             param::camera_tc = 0;
                             param::camera_tc = 0;
                         }
                         }
                         else if(statusValue.toString().contains("movy")){
                         else if(statusValue.toString().contains("movy")){
@@ -237,7 +239,7 @@ SerialThread::processJsonData(const QByteArray &jsonData)
                         }
                         }
                     }
                     }
                     else{
                     else{
-                        qDebug() << "statusValue parse error:";
+                        WARN("statusValue parse error:");
                     }
                     }
                 }
                 }
 
 
@@ -256,7 +258,7 @@ SerialThread::processJsonData(const QByteArray &jsonData)
         }
         }
         //emit jsonReceived(jsonObject);
         //emit jsonReceived(jsonObject);
     } else {
     } else {
-        qDebug() << "JSON parse error:" << error.errorString();
+        WARN("JSON parse error: {}", error.errorString().toStdString());
     }
     }
 }
 }
 
 
@@ -340,13 +342,13 @@ SerialThread::selectSerialPortName()
     LOG("=== 可用串口列表 ===");
     LOG("=== 可用串口列表 ===");
     LOG("总数:{}",ports.count());
     LOG("总数:{}",ports.count());
     for (const QSerialPortInfo &port : ports) {
     for (const QSerialPortInfo &port : ports) {
-        qDebug() << "\n端口名称:" << port.portName();
-        qDebug() << "描述:" << port.description();
-        qDebug() << "制造商:" << port.manufacturer();
-        qDebug() << "序列号:" << port.serialNumber();
-        qDebug() << "系统位置:" << port.systemLocation();
-        qDebug() << "供应商ID:" << QString::number(port.vendorIdentifier(), 16);
-        qDebug() << "产品ID:" << QString::number(port.productIdentifier(), 16);
+        DEBUG("端口名称: {}", port.portName().toStdString());
+        DEBUG("描述: {}", port.description().toStdString());
+        DEBUG("制造商: {}", port.manufacturer().toStdString());
+        DEBUG("序列号: {}", port.serialNumber().toStdString());
+        DEBUG("系统位置: {}", port.systemLocation().toStdString());
+        DEBUG("供应商ID: 0x{}", QString::number(port.vendorIdentifier(), 16).toStdString());
+        DEBUG("产品ID: 0x{}", QString::number(port.productIdentifier(), 16).toStdString());
         if(port.portName()=="ttyS3"||port.portName()=="ttySR3"){
         if(port.portName()=="ttyS3"||port.portName()=="ttySR3"){
             pname = port.portName();
             pname = port.portName();
         }
         }

+ 74 - 28
app_bzy_armhf_7/src/mysql.cpp

@@ -1,5 +1,9 @@
 #include <mysql.h>
 #include <mysql.h>
 #include <cameramanager.h>
 #include <cameramanager.h>
+#include <QStandardPaths>
+#include <QDir>
+#include <QFileInfo>
+#include <QThread>
 class param;
 class param;
 
 
 
 
@@ -73,6 +77,7 @@ int param::maxJsonEntries;
 int param::maxImageEntries;
 int param::maxImageEntries;
 int param::x_init;
 int param::x_init;
 int param::y_init;
 int param::y_init;
+int param::fusion_enable = 1;     // 1=启用景深融合, 0=关闭景深融合(持久化在 SQLite)
 
 
 bool param::net_alive;
 bool param::net_alive;
 QString param::net_name;
 QString param::net_name;
@@ -81,12 +86,41 @@ QString param::net_mac;
 QString param::net_ipv4;
 QString param::net_ipv4;
 int param::datupload_remain;
 int param::datupload_remain;
 
 
+ // 内部:确保数据库父目录存在。SQLite 在缺失目录时会以 "unable to open database file" 失败。
+static bool ensureParentDirExists(const QString& dbPath) {
+    QFileInfo fi(dbPath);
+    const QString dir = fi.absolutePath();
+    if (dir.isEmpty()) return true;
+    QDir d;
+    if (d.exists(dir)) return true;
+    if (!d.mkpath(dir)) {
+        qWarning() << "[SQLite] 无法创建数据库目录:" << dir;
+        return false;
+    }
+    return true;
+}
+
+// 内部:带重试的打开。启动早期偶发被锁/文件系统尚未就绪,重试 3 次更稳健。
+static bool openWithRetry(QSqlDatabase& db, int maxAttempts = 3, int delayMs = 80) {
+    for (int i = 0; i < maxAttempts; ++i) {
+        if (db.isOpen()) return true;
+        if (db.open()) return true;
+        qWarning() << "[SQLite] open 失败,第" << (i + 1) << "次重试,err:" << db.lastError();
+        QThread::msleep(delayMs);
+    }
+    return db.isOpen();
+}
+
  SqliteOperator::SqliteOperator(QString &dbname)
  SqliteOperator::SqliteOperator(QString &dbname)
 {
 {
     LOG("实例化:SqliteOperator:{}",dbname.toStdString());
     LOG("实例化:SqliteOperator:{}",dbname.toStdString());
     if(QSqlDatabase::contains("qt_sql_default_connection"))
     if(QSqlDatabase::contains("qt_sql_default_connection"))
     {
     {
         db = QSqlDatabase::database("qt_sql_default_connection");
         db = QSqlDatabase::database("qt_sql_default_connection");
+        // 旧连接若没打开,尝试重新打开(避免上次 CloseDb 之后残留一个未打开连接)
+        if (!db.isOpen()) {
+            openWithRetry(db);
+        }
     }
     }
     else
     else
     {
     {
@@ -97,8 +131,11 @@ int param::datupload_remain;
         QString db_Path = "./";
         QString db_Path = "./";
         QString db_name = db_Path + dbname;
         QString db_name = db_Path + dbname;
 #endif
 #endif
+        // 确保父目录存在;否则 SQLite 会报 "unable to open database file"
+        ensureParentDirExists(db_name);
         db = QSqlDatabase::addDatabase("QSQLITE","qt_sql_default_connection");
         db = QSqlDatabase::addDatabase("QSQLITE","qt_sql_default_connection");
         db.setDatabaseName(db_name);
         db.setDatabaseName(db_name);
+        openWithRetry(db);
 //        db.setUserName("admin");
 //        db.setUserName("admin");
 //        db.setPassword("yf123456");
 //        db.setPassword("yf123456");
     }
     }
@@ -112,6 +149,8 @@ bool InsertJson_mqtt()
         QString db_Path = "./";
         QString db_Path = "./";
         QString db_name = "./data.db";
         QString db_name = "./data.db";
 #endif
 #endif
+    // 父目录缺失会导致 "unable to open database file",提前创建
+    ensureParentDirExists(db_name);
     QSqlDatabase mqtt_db;
     QSqlDatabase mqtt_db;
     if(QSqlDatabase::contains("qt_sql_default_connection"))
     if(QSqlDatabase::contains("qt_sql_default_connection"))
     {
     {
@@ -119,9 +158,9 @@ bool InsertJson_mqtt()
     }
     }
     QSqlQuery sql_mq;
     QSqlQuery sql_mq;
     mqtt_db.setDatabaseName(db_name);
     mqtt_db.setDatabaseName(db_name);
-    if(!mqtt_db.open())
+    if(!openWithRetry(mqtt_db))
     {
     {
-        qDebug() << "Error: Failed to connect database." << mqtt_db.lastError();
+        ERROR("Error: Failed to connect database. {}", mqtt_db.lastError().text().toStdString());
         return false;
         return false;
     }
     }
     //判断表是否存在
     //判断表是否存在
@@ -134,7 +173,7 @@ bool InsertJson_mqtt()
                                    Json_warn TEXT NOT NULL)"));
                                    Json_warn TEXT NOT NULL)"));
        if(!sql_mq.exec())
        if(!sql_mq.exec())
        {
        {
-           qDebug() << "Error: Fail to create table." << sql_mq.lastError();
+           ERROR("Error: Fail to create table. {}", sql_mq.lastError().text().toStdString());
            return false;
            return false;
        }
        }
        else
        else
@@ -149,7 +188,7 @@ bool InsertJson_mqtt()
     if(sql_mq.exec()&&sql_mq.next())
     if(sql_mq.exec()&&sql_mq.next())
     {
     {
         int row_count = sql_mq.value(0).toInt();
         int row_count = sql_mq.value(0).toInt();
-        qDebug() << "Number of rows in table: " << row_count;
+        DEBUG("Number of rows in table: {}", row_count);
     }
     }
 //    config_db_type mqtt_class_history;
 //    config_db_type mqtt_class_history;
 //    QJsonObject json_dat;
 //    QJsonObject json_dat;
@@ -189,13 +228,20 @@ bool InsertJson_mqtt()
      if(QSqlDatabase::contains("qt_sql_default_connection"))
      if(QSqlDatabase::contains("qt_sql_default_connection"))
      {
      {
          db = QSqlDatabase::database("qt_sql_default_connection");
          db = QSqlDatabase::database("qt_sql_default_connection");
-     }else{
-         db = QSqlDatabase::addDatabase("QSQLITE","qt_sql_default_connection");
-         db.setDatabaseName(db_name);
+         // 复用旧连接但未打开 → 重新打开
+         if (!db.isOpen() && !openWithRetry(db)) {
+             qWarning() << "Error: Failed to reconnect existing db." << db.lastError();
+             return false;
+         }
+         return true;
      }
      }
-     if(!db.open())
+     // 父目录不存在会导致 SQLite "unable to open database file"
+     ensureParentDirExists(db_name);
+     db = QSqlDatabase::addDatabase("QSQLITE","qt_sql_default_connection");
+     db.setDatabaseName(db_name);
+     if(!openWithRetry(db))
      {
      {
-         qDebug() << "Error: Failed to connect database." << db.lastError();
+         qWarning() << "Error: Failed to connect database." << db.lastError();
          return false;
          return false;
      }
      }
 
 
@@ -320,11 +366,11 @@ bool InsertJson_mqtt()
      sql_query.prepare(creat_sql);
      sql_query.prepare(creat_sql);
      if(!sql_query.exec())
      if(!sql_query.exec())
      {
      {
-         qDebug() << "Error: Fail to create table." << sql_query.lastError();
+         ERROR("Error: Fail to create table. {}", sql_query.lastError().text().toStdString());
      }
      }
      else
      else
      {
      {
-         qDebug() << "Table created!" << creat_sql;
+         DEBUG("Table created! {}", creat_sql.toStdString());
      }
      }
      return 0;
      return 0;
  }
  }
@@ -396,7 +442,7 @@ bool InsertJson_mqtt()
      if(!sql_query.exec())
      if(!sql_query.exec())
      {
      {
 
 
-        qDebug() <<"Error: Fail to insert data:"<< tablename << sql_query.lastError();
+        ERROR("Error: Fail to insert data:{},{}", tablename.toStdString(), sql_query.lastError().text().toStdString());
      }
      }
      else
      else
      {
      {
@@ -438,7 +484,7 @@ int SqliteOperator::UpdateData(QString tablename, QString name, QString value)
      sql_query.exec(QString("SELECT * FROM %1").arg(table_name));
      sql_query.exec(QString("SELECT * FROM %1").arg(table_name));
      if(!sql_query.exec())
      if(!sql_query.exec())
      {
      {
-        qDebug() << "Error: Fail to query table. " << sql_query.lastError();
+        WARN("Error: Fail to query table. {}", sql_query.lastError().text().toStdString());
      }
      }
      else
      else
      {
      {
@@ -573,7 +619,7 @@ int SqliteOperator::UpdateData(QString tablename, QString name, QString value)
      QSqlQuery sql_query;
      QSqlQuery sql_query;
      if(!sql_query.exec(select_sql))
      if(!sql_query.exec(select_sql))
      {
      {
-         qDebug()<<sql_query.lastError();
+         ERROR("{}", sql_query.lastError().text().toStdString());
      }
      }
      else
      else
      {
      {
@@ -581,7 +627,7 @@ int SqliteOperator::UpdateData(QString tablename, QString name, QString value)
          {
          {
              int id = sql_query.value(0).toInt();
              int id = sql_query.value(0).toInt();
              QString name = sql_query.value(1).toString();
              QString name = sql_query.value(1).toString();
-             qDebug()<<QString("id:%1    name:%2").arg(id).arg(name);
+             DEBUG("id:{} name:{}", id, name.toStdString());
          }
          }
      }
      }
      return 0;
      return 0;
@@ -603,7 +649,7 @@ int SqliteOperator::UpdateData(QString tablename, QString name, QString value)
      m_database = QSqlDatabase::addDatabase("QSQLITE");
      m_database = QSqlDatabase::addDatabase("QSQLITE");
      m_database.setDatabaseName(db_name);
      m_database.setDatabaseName(db_name);
      if (!m_database.open()) {
      if (!m_database.open()) {
-         qDebug() << "Error: Failed to connect database." << m_database.lastError();
+         ERROR("Error: Failed to connect database. {}", m_database.lastError().text().toStdString());
          return false;
          return false;
      }
      }
      return true;
      return true;
@@ -724,10 +770,10 @@ int SqliteOperator::UpdateData(QString tablename, QString name, QString value)
      sql_query.prepare(creat_sql);
      sql_query.prepare(creat_sql);
      if(!sql_query.exec())
      if(!sql_query.exec())
      {
      {
-         qDebug() << "Error: Fail to create table." << sql_query.lastError();
+         ERROR("Error: Fail to create table. {}", sql_query.lastError().text().toStdString());
          return false;
          return false;
      }else{
      }else{
-         qDebug() << "Table created!" << creat_sql;
+         DEBUG("Table created! {}", creat_sql.toStdString());
      }
      }
      return true;
      return true;
  }
  }
@@ -739,7 +785,7 @@ int SqliteOperator::UpdateData(QString tablename, QString name, QString value)
      query.bindValue(":name", name);
      query.bindValue(":name", name);
      query.bindValue(":address", address);
      query.bindValue(":address", address);
      if (!query.exec()) {
      if (!query.exec()) {
-         qDebug() << "Error: Failed to insert data." << query.lastError();
+         ERROR("Error: Failed to insert data. {}", query.lastError().text().toStdString());
          return false;
          return false;
      }
      }
      return true;
      return true;
@@ -751,7 +797,7 @@ int SqliteOperator::UpdateData(QString tablename, QString name, QString value)
      query.prepare("DELETE FROM Info WHERE ID = :id");
      query.prepare("DELETE FROM Info WHERE ID = :id");
      query.bindValue(":id", id);
      query.bindValue(":id", id);
      if (!query.exec()) {
      if (!query.exec()) {
-         qDebug() << "Error: Failed to delete data." << query.lastError();
+         ERROR("Error: Failed to delete data. {}", query.lastError().text().toStdString());
          return false;
          return false;
      }
      }
      return true;
      return true;
@@ -760,11 +806,11 @@ int SqliteOperator::UpdateData(QString tablename, QString name, QString value)
  bool DatabaseInterface::updateData(QString tablename, QString name, QVariant value)
  bool DatabaseInterface::updateData(QString tablename, QString name, QVariant value)
  {
  {
      QSqlQuery query(m_database);
      QSqlQuery query(m_database);
-     qDebug() << "Table name:" <<tablename << name << value;
+     DEBUG("Table name:{} {} {}", tablename.toStdString(), name.toStdString(), value.toString().toStdString());
      query.prepare(QString("UPDATE %1 SET %2=?").arg(tablename,name));
      query.prepare(QString("UPDATE %1 SET %2=?").arg(tablename,name));
      query.addBindValue(value);
      query.addBindValue(value);
      if (!query.exec()) {
      if (!query.exec()) {
-         qDebug() << "Error: Failed to update data." << query.lastError();
+         ERROR("Error: Failed to update data. {}", query.lastError().text().toStdString());
          return false;
          return false;
      }
      }
      return true;
      return true;
@@ -801,13 +847,13 @@ int SqliteOperator::UpdateData(QString tablename, QString name, QString value)
 
 
             }
             }
         }
         }
-        qDebug() <<"json data:"<< mqtt_array;
+        DEBUG("json data size: {}", mqtt_array.size());
         return mqtt_array;
         return mqtt_array;
      }
      }
      sql_query.exec(QString("SELECT * FROM %1").arg(table_name));
      sql_query.exec(QString("SELECT * FROM %1").arg(table_name));
      if(!sql_query.exec())
      if(!sql_query.exec())
      {
      {
-        qDebug() << "Error: Fail to query table. " << sql_query.lastError();
+        WARN("Error: Fail to query table. {}", sql_query.lastError().text().toStdString());
      }
      }
      else
      else
      {
      {
@@ -816,7 +862,7 @@ int SqliteOperator::UpdateData(QString tablename, QString name, QString value)
              data_num ++;
              data_num ++;
              if(table_name == QString::fromLocal8Bit("mqtt"))
              if(table_name == QString::fromLocal8Bit("mqtt"))
              {
              {
-                 qDebug() << "mqtt";
+                 DEBUG("query table: mqtt");
                  param_mqtt_main["id"] = sql_query.value(0).toInt();
                  param_mqtt_main["id"] = sql_query.value(0).toInt();
                  param_mqtt_main["dtype"] = sql_query.value(1).toString();
                  param_mqtt_main["dtype"] = sql_query.value(1).toString();
                  param_mqtt_main["ip"] = sql_query.value(2).toString();
                  param_mqtt_main["ip"] = sql_query.value(2).toString();
@@ -834,7 +880,7 @@ int SqliteOperator::UpdateData(QString tablename, QString name, QString value)
              }
              }
              else if(table_name == QString::fromLocal8Bit("mqtt_other"))
              else if(table_name == QString::fromLocal8Bit("mqtt_other"))
              {
              {
-                 qDebug() << "mqtt_other";
+                 DEBUG("query table: mqtt_other");
                  param_mqtt_other["id"] = sql_query.value(0).toInt();
                  param_mqtt_other["id"] = sql_query.value(0).toInt();
                  param_mqtt_other["dtype"] = sql_query.value(1).toString();
                  param_mqtt_other["dtype"] = sql_query.value(1).toString();
                  param_mqtt_other["ip"] = sql_query.value(2).toString();
                  param_mqtt_other["ip"] = sql_query.value(2).toString();
@@ -896,9 +942,9 @@ int SqliteOperator::UpdateData(QString tablename, QString name, QString value)
                 mqtt_array.append(param_camera);
                 mqtt_array.append(param_camera);
              }
              }
 
 
-             qDebug() << "data num: " << data_num;
+             DEBUG("data num: {}", data_num);
          }
          }
-         qDebug() <<"json data:"<< mqtt_array;
+         DEBUG("json data size: {}", mqtt_array.size());
 
 
      }
      }
     return mqtt_array;
     return mqtt_array;

+ 8 - 8
app_bzy_armhf_7/src/userfunc.cpp

@@ -165,7 +165,7 @@ void UserFunc::on_serial_switch_clicked(bool serial_switch, QString serial_name,
         if(serial_main->serialOpen(serial_name, serial_boud.toInt()))
         if(serial_main->serialOpen(serial_name, serial_boud.toInt()))
         {
         {
 
 
-             qDebug() << "串口打开成功!" << serial_boud.toInt();
+             DEBUG("串口打开成功! {}", serial_boud.toInt());
         }
         }
         else
         else
         {
         {
@@ -419,7 +419,7 @@ void UserFunc::on_subButton_clicked(QString &subTopic)
 // 数据操作相关处理函数
 // 数据操作相关处理函数
 QString UserFunc::on_deleteBtn1_clicked(QString originData, QString targetData1, QString targetData2)
 QString UserFunc::on_deleteBtn1_clicked(QString originData, QString targetData1, QString targetData2)
 {
 {
-    qDebug() << originData << targetData1 << targetData2;
+    DEBUG("{} {} {}", originData.toStdString(), targetData1.toStdString(), targetData2.toStdString());
     QString resultText = originData.replace(targetData1, QString("<font color=\"#ff0000\">%1</font>").arg(targetData2)); // 替换
     QString resultText = originData.replace(targetData1, QString("<font color=\"#ff0000\">%1</font>").arg(targetData2)); // 替换
     resultText = resultText.replace("\n", "<br>"); // /n在html标签内不换行,故换成html的换行标签解决此问题
     resultText = resultText.replace("\n", "<br>"); // /n在html标签内不换行,故换成html的换行标签解决此问题
     resultText.append(" "); // 解决文本尾部变色后仍有一个新增字符会与其同色的bug
     resultText.append(" "); // 解决文本尾部变色后仍有一个新增字符会与其同色的bug
@@ -428,7 +428,7 @@ QString UserFunc::on_deleteBtn1_clicked(QString originData, QString targetData1,
 
 
 QString UserFunc::on_deleteBtn2_clicked(QString originData, QString targetData1, QString targetData2)
 QString UserFunc::on_deleteBtn2_clicked(QString originData, QString targetData1, QString targetData2)
 {
 {
-    qDebug() << originData << targetData1 << targetData2;
+    DEBUG("{} {} {}", originData.toStdString(), targetData1.toStdString(), targetData2.toStdString());
     QString resultText;
     QString resultText;
     if(targetData1.contains("---",Qt::CaseInsensitive))
     if(targetData1.contains("---",Qt::CaseInsensitive))
     {
     {
@@ -462,7 +462,7 @@ QString UserFunc::on_deleteBtn2_clicked(QString originData, QString targetData1,
 
 
 QVariant UserFunc::on_findBtn1_clicked(QString originData, QString targetData1)
 QVariant UserFunc::on_findBtn1_clicked(QString originData, QString targetData1)
 {
 {
-    qDebug() << originData << targetData1;
+    DEBUG("{} {}", originData.toStdString(), targetData1.toStdString());
     // 查找数据变色原理是将其添加html标签设置颜色
     // 查找数据变色原理是将其添加html标签设置颜色
     /***********************方法一**************************/
     /***********************方法一**************************/
     QString replaceText = QString("<font color=\"#ffff00\">%1</font>").arg(targetData1); // 替换为的数据
     QString replaceText = QString("<font color=\"#ffff00\">%1</font>").arg(targetData1); // 替换为的数据
@@ -480,7 +480,7 @@ QVariant UserFunc::on_findBtn1_clicked(QString originData, QString targetData1)
 
 
 QString UserFunc::on_findBtn2_clicked(QString originData, QString targetData1)
 QString UserFunc::on_findBtn2_clicked(QString originData, QString targetData1)
 {
 {
-    qDebug() << originData << targetData1;
+    DEBUG("{} {}", originData.toStdString(), targetData1.toStdString());
     QString resultText;
     QString resultText;
     if(targetData1.contains("---",Qt::CaseInsensitive))
     if(targetData1.contains("---",Qt::CaseInsensitive))
     {
     {
@@ -563,7 +563,7 @@ void UserFunc::on_originTitle_clicked()
 
 
 void UserFunc::Serial_sendData(QByteArray DataTemp)
 void UserFunc::Serial_sendData(QByteArray DataTemp)
 {
 {
-    qDebug() << "发送数据";
+    DEBUG("发送数据");
     serial_main->sendData(DataTemp);
     serial_main->sendData(DataTemp);
 }
 }
 
 
@@ -589,10 +589,10 @@ void UserFunc::on_Autofocus_clicked()
 
 
 void UserFunc::readEvaluationImage(QString evaimage)
 void UserFunc::readEvaluationImage(QString evaimage)
 {
 {
-    qDebug() << "检测到图片清晰度为:"<< evaimage;
+    DEBUG("检测到图片清晰度为: {}", evaimage.toStdString());
     if(evaimage=="0")
     if(evaimage=="0")
     {
     {
-        qDebug() << "黑图片";
+        WARN("黑图片");
     }
     }
 }
 }
 
 

+ 16 - 1
app_bzy_armhf_7/src/wif_service.cpp

@@ -72,7 +72,7 @@ static void onConnectionChangedNative(JNIEnv *env, jclass /*clazz*/, bool connec
     }
     }
 
 
     QMetaObject::invokeMethod(svc, [svc, connected]() {
     QMetaObject::invokeMethod(svc, [svc, connected]() {
-        emit svc->connectedChanged(connected);
+        svc->setConnected(connected);
     }, Qt::QueuedConnection);
     }, Qt::QueuedConnection);
 }
 }
 
 
@@ -120,6 +120,7 @@ class WifService::Private
 {
 {
 public:
 public:
     bool bound = false;
     bool bound = false;
+    bool connected = false;
 };
 };
 
 
 WifService::WifService(QObject *parent)
 WifService::WifService(QObject *parent)
@@ -218,6 +219,20 @@ void WifService::onResponseFromJni(const QString &type, int code,
     emit responseReceived(type, code, msg, json);
     emit responseReceived(type, code, msg, json);
 }
 }
 
 
+bool WifService::isConnected() const
+{
+    return d->connected;
+}
+
+void WifService::setConnected(bool connected)
+{
+    if (d->connected == connected) {
+        return;
+    }
+    d->connected = connected;
+    emit connectedChanged(connected);
+}
+
 // ===========================================================================
 // ===========================================================================
 // 便捷封装
 // 便捷封装
 // ===========================================================================
 // ===========================================================================

+ 13 - 13
app_bzy_armhf_7/src/ymodem.cpp

@@ -117,7 +117,7 @@ int YMODEM::yTransmitRead( unsigned short timeout )
     m_serialPort->waitForReadyRead(timeout);
     m_serialPort->waitForReadyRead(timeout);
     m_serialPort->getChar(&byte);
     m_serialPort->getChar(&byte);
     byte_int = byte;
     byte_int = byte;
-    qDebug() << "串口接收到:"<< byte << "int:" <<byte_int;
+    DEBUG("串口接收到: {} int: {}", QChar(byte).toLatin1(), byte_int);
     return byte_int;
     return byte_int;
 }
 }
 
 
@@ -242,11 +242,11 @@ int YMODEM::yTransmit()
             switch (c) {
             switch (c) {
             case '\0':
             case '\0':
             case 'c':
             case 'c':
-                qDebug() << "c";
+                DEBUG("Received 'c'");
             case 'C':
             case 'C':
-                qDebug() << "C-1";
+                DEBUG("Received 'C'");
             case NAK:
             case NAK:
-                qDebug() << "NAK";
+                DEBUG("NAK");
                 response = yTransmitPacket(fileInfo,file,payloadSize);
                 response = yTransmitPacket(fileInfo,file,payloadSize);
                 if (response == MODEM_RESTART)
                 if (response == MODEM_RESTART)
                 {
                 {
@@ -260,13 +260,13 @@ int YMODEM::yTransmit()
                 if ((c = yTransmitRead(DLY_1S)) == CAN) {
                 if ((c = yTransmitRead(DLY_1S)) == CAN) {
                     yTransmitWrite(ACK);
                     yTransmitWrite(ACK);
                     yTransmitFlush();
                     yTransmitFlush();
-                    qDebug() << "XMODEM::yTransmit - canceled by remote";
+                    WARN("XMODEM::yTransmit - canceled by remote");
                     return MODEM_REMOTE_CANCEL;
                     return MODEM_REMOTE_CANCEL;
                 }
                 }
                 break;
                 break;
             default:
             default:
                 m_serialPort->clear(QSerialPort::Input);
                 m_serialPort->clear(QSerialPort::Input);
-                qDebug() << "XYMODEM::yTransmit - Unknown : " << m_serialPort->readAll();;
+                WARN("XYMODEM::yTransmit - Unknown: {}", m_serialPort->readAll().toStdString());
                 break;
                 break;
             }
             }
         }
         }
@@ -278,13 +278,13 @@ int YMODEM::yTransmit()
     file.close();
     file.close();
     if (m_cancel)
     if (m_cancel)
     {
     {
-        qDebug() << "XMODEM::yTransmit - canceled by user";
+        WARN("XMODEM::yTransmit - canceled by user");
         emit modem_result(MODEM_LOCAL_CANCEL);
         emit modem_result(MODEM_LOCAL_CANCEL);
         return MODEM_LOCAL_CANCEL;
         return MODEM_LOCAL_CANCEL;
     }
     }
     else
     else
     {
     {
-        qDebug() << "XMODEM::yTransmit - no sync";
+        WARN("XMODEM::yTransmit - no sync");
         emit modem_result(MODEM_NO_SYNC);
         emit modem_result(MODEM_NO_SYNC);
         return MODEM_NO_SYNC;
         return MODEM_NO_SYNC;
     }
     }
@@ -302,7 +302,7 @@ int YMODEM::yTransmitPacket(const QFileInfo &fileInfo, QIODevice &dev, const qui
         for (int retry = 0; retry < 10; ++retry) {
         for (int retry = 0; retry < 10; ++retry) {
             yTransmitWrite(EOT);
             yTransmitWrite(EOT);
             if ((res = yTransmitRead((DLY_1S)<<1)) == ACK){
             if ((res = yTransmitRead((DLY_1S)<<1)) == ACK){
-                qDebug() << "EOT";
+                DEBUG("EOT");
             }
             }
             if ((res = yTransmitRead((DLY_1S)<<1)) == 67){
             if ((res = yTransmitRead((DLY_1S)<<1)) == 67){
                 return yTransmitClose();
                 return yTransmitClose();
@@ -317,7 +317,7 @@ int YMODEM::yTransmitPacket(const QFileInfo &fileInfo, QIODevice &dev, const qui
         payload.append(fileInfo.fileName().toStdString());
         payload.append(fileInfo.fileName().toStdString());
         payload.append(QString(CTRLZ).toStdString());
         payload.append(QString(CTRLZ).toStdString());
         payload.append(filesize.toStdString());
         payload.append(filesize.toStdString());
-        qDebug() << "文件大小:" << fileInfo.size();
+        DEBUG("文件大小:{}", fileInfo.size());
         payload += QString(CTRLZ).repeated(128 - payload.size()).toStdString();
         payload += QString(CTRLZ).repeated(128 - payload.size()).toStdString();
         //payload += (quint32) fileInfo.fileTime(QFileDevice::FileBirthTime).toSecsSinceEpoch();//.created().toTime_t();
         //payload += (quint32) fileInfo.fileTime(QFileDevice::FileBirthTime).toSecsSinceEpoch();//.created().toTime_t();
     }
     }
@@ -344,7 +344,7 @@ int YMODEM::yTransmitPacket(const QFileInfo &fileInfo, QIODevice &dev, const qui
 
 
     //qWarning () <<"数据包:" <<packet.toHex();
     //qWarning () <<"数据包:" <<packet.toHex();
     int dtotal = (int)floor((float)fileInfo.size()/payloadSize + 0.5f);
     int dtotal = (int)floor((float)fileInfo.size()/payloadSize + 0.5f);
-    qDebug() << "XMODEM:xBeginTransmit - Packet # : "<< pos <<"/" << pos/payloadSize << "/" << dtotal;
+    DEBUG("XMODEM:xBeginTransmit - Packet # : {}/{}/{}", pos, pos/payloadSize, dtotal);
     //emit message(QString("Sending Packet %1/%2").arg(pos/payloadSize).arg((int)floor((float)fileInfo.size()/payloadSize)));
     //emit message(QString("Sending Packet %1/%2").arg(pos/payloadSize).arg((int)floor((float)fileInfo.size()/payloadSize)));
     emit progress(pos/payloadSize,dtotal);
     emit progress(pos/payloadSize,dtotal);
     QCoreApplication::processEvents();
     QCoreApplication::processEvents();
@@ -373,7 +373,7 @@ int YMODEM::yTransmitPacket(const QFileInfo &fileInfo, QIODevice &dev, const qui
                 if ((res = yTransmitRead(DLY_1S)) == CAN) {
                 if ((res = yTransmitRead(DLY_1S)) == CAN) {
                     yTransmitWrite(ACK);
                     yTransmitWrite(ACK);
                     yTransmitFlush();
                     yTransmitFlush();
-                    qDebug() << "XMODEM::xBeginTransmit - canceled by remote";
+                    DEBUG("XMODEM::xBeginTransmit - canceled by remote");
                     emit modem_result(MODEM_REMOTE_CANCEL);
                     emit modem_result(MODEM_REMOTE_CANCEL);
                     return MODEM_REMOTE_CANCEL;
                     return MODEM_REMOTE_CANCEL;
                 }
                 }
@@ -424,7 +424,7 @@ int YMODEM::yTransmitClose()
     unsigned short ccrc = crc16_ccitt((unsigned char*)payload.constData(),128);
     unsigned short ccrc = crc16_ccitt((unsigned char*)payload.constData(),128);
     packet.append((ccrc>>8) & 0xFF);
     packet.append((ccrc>>8) & 0xFF);
     packet.append(ccrc & 0xFF);
     packet.append(ccrc & 0xFF);
-    qDebug() << "last packet:" << packet.toHex();
+    DEBUG("last packet: {}", packet.toHex().toStdString());
     int res;
     int res;
     for (int retry = 0; retry < 10; ++retry)
     for (int retry = 0; retry < 10; ++retry)
     {
     {