zhunk 1 anno fa
parent
commit
ab48de2233

+ 18 - 2
q6_felgo_iot/CMakeLists.txt

@@ -39,7 +39,7 @@ set(LIBUVC_PATH
 )
 
 find_package(Felgo REQUIRED)
-find_package(Qt6 COMPONENTS Core Quick SerialPort Sql Multimedia Mqtt TextToSpeech Positioning ShaderTools Widgets Svg REQUIRED)
+find_package(Qt6 COMPONENTS Core Quick SerialPort Sql Multimedia Mqtt TextToSpeech Positioning ShaderTools Widgets Svg NetWork REQUIRED)
 
 #find_package(FelgoLive REQUIRED)
 
@@ -95,6 +95,7 @@ qt_add_executable(q6_felgo_iot
     header/TreeModel.h
     header/app_fileHandle.h
     header/app_curlFunc.h
+    header/app_sq_save.h
     #header/camerahandler.h
 
     src/main.cpp
@@ -113,6 +114,7 @@ qt_add_executable(q6_felgo_iot
     src/customitem.cpp
     src/app_curlFunc.cpp
     src/TreeModel.cpp
+    src/app_sq_save.cpp
     ${QmlFiles}
     ${AssetsFiles}
 )
@@ -175,7 +177,21 @@ target_compile_definitions(q6_felgo_iot
     PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)
 
 target_link_libraries(q6_felgo_iot PRIVATE Felgo)
-target_link_libraries(q6_felgo_iot PRIVATE Qt6::Core Qt6::CorePrivate Qt6::Quick Qt6::SerialPort Qt6::Sql Qt6::Multimedia Qt6::Mqtt Qt6::TextToSpeech Qt6::Positioning Qt6::ShaderTools Qt6::Widgets Qt6::Svg mediandk)
+target_link_libraries(q6_felgo_iot PRIVATE
+    Qt6::Core
+    Qt6::CorePrivate
+    Qt6::Quick
+    Qt6::SerialPort
+    Qt6::Sql
+    Qt6::Multimedia
+    Qt6::Mqtt
+    Qt6::TextToSpeech
+    Qt6::Positioning
+    Qt6::ShaderTools
+    Qt6::Widgets
+    Qt6::Svg
+    Qt6::Network
+    mediandk)
 
 if (ANDROID)
 target_link_libraries(q6_felgo_iot

+ 18 - 16
q6_felgo_iot/CMakeLists.txt.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 14.0.1, 2025-09-09T09:18:08. -->
+<!-- Written by QtCreator 14.0.1, 2025-11-03T09:05:20. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -102,24 +102,24 @@
     <value type="int" key="CMake.Configure.BaseEnvironment">2</value>
     <value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
     <valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
-    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
--DANDROID_NATIVE_API_LEVEL:STRING=23
--DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON
+    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_BUILD_TYPE:STRING=Release
+-DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF
+-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
 -DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
--DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
--DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}
--DCMAKE_BUILD_TYPE:STRING=Release
+-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
+-DANDROID_NATIVE_API_LEVEL:STRING=23
 -DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
--DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
--DCMAKE_TOOLCHAIN_FILE:FILEPATH=F:/Android_Env/android-ndk-r23c/build/cmake/android.toolchain.cmake
--DCMAKE_GENERATOR:STRING=Ninja
+-DANDROID_ABI:STRING=arm64-v8a
 -DANDROID_SDK_ROOT:PATH=F:/Android_Env/android_sdk
--DANDROID_STL:STRING=c++_shared
+-DCMAKE_TOOLCHAIN_FILE:FILEPATH=F:/Android_Env/android-ndk-r23c/build/cmake/android.toolchain.cmake
+-DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}
+-DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON
 -DANDROID_NDK:PATH=F:/Android_Env/android-ndk-r23c
--DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF
 -DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
--DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
--DANDROID_ABI:STRING=arm64-v8a</value>
+-DCMAKE_GENERATOR:STRING=Ninja
+-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
+-DANDROID_STL:STRING=c++_shared
+-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake</value>
     <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:\QT_WorkSpace\qt6_iot_all\build-q6_felgo_iot-Qt_6_4_1_android_arm64_v8a_Clang_arm64_v8a-Release</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
@@ -192,12 +192,14 @@
    <value type="qlonglong" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings">
     <valuelist type="QVariantList" key="AndroidDeviceAbis">
+     <value type="QString">x86_64</value>
      <value type="QString">arm64-v8a</value>
+     <value type="QString">x86</value>
      <value type="QString">armeabi-v7a</value>
      <value type="QString">armeabi</value>
     </valuelist>
-    <value type="QString" key="AndroidDeviceSerialNumber">3a206370cae8dc9f</value>
-    <value type="int" key="AndroidVersion.ApiLevel">30</value>
+    <value type="QString" key="AndroidDeviceSerialNumber">192.168.2.148:5555</value>
+    <value type="int" key="AndroidVersion.ApiLevel">32</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
     <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>

+ 8 - 0
q6_felgo_iot/Readme.md

@@ -1,3 +1,11 @@
+#### 20251101
+    #define APP_VERSION "1.3.16"
+    更新说明:
+        修复FTP上传图片失败问题,构建curl时还未读取到IMEI
+## 20251101
+    #define APP_VERSION "1.3.15"
+    更新说明:
+        增加设置IMEI功能
 ## 20250829
     #define APP_VERSION "1.2.10"
     更新说明:

+ 63 - 253
q6_felgo_iot/header/TreeModel.h

@@ -9,221 +9,70 @@
 #include <QMimeDatabase>
 #include <QDebug>
 #include <QMimeDatabase> // 新增头文件
+#include <QRegularExpression>
 #include <m_loger.h>
 
+
 class TreeItem {
 public:
-    enum NodeType { Root = 0, Folder, Image };
+    enum Type {
+        Root,
+        YearFolder,
+        MonthFolder,
+        DayFolder,
+        AlbumFolder,
+        Image
+    };
 
-    explicit TreeItem(NodeType type, const QString &name, const QString &path = "", TreeItem *parent = nullptr,const QDateTime &lastModified = QDateTime())
-        : m_type(type), m_name(name), m_path(path), m_parent(parent),m_lastModified(lastModified.isValid() ? lastModified : QDateTime::currentDateTime()) {}  // 修正初始化 // 修正初始化
+    explicit TreeItem(Type type, const QString &name, const QString &path,
+                      const QDateTime &lastModified = QDateTime(), TreeItem *parent = nullptr);
 
-    ~TreeItem() { qDeleteAll(m_children); }
+    ~TreeItem();
 
-    void appendChild(TreeItem *child) { m_children.append(child); }
-    TreeItem *child(int row) { return m_children.value(row); }
-    int childCount() const { return m_children.count(); }
-    int row() const { return m_parent ? m_parent->m_children.indexOf(const_cast<TreeItem*>(this)) : 0; }
+    void appendChild(TreeItem *child);
+    TreeItem *child(int row) const;
+    int childCount() const;
+    int row() const;
 
-    NodeType type() const { return m_type; }
+    Type type() const { return m_type; }
     QString name() const { return m_name; }
     QString path() const { return m_path; }
+    QDateTime lastModified() const { return m_lastModified; }
     TreeItem *parent() const { return m_parent; }
 
-    void removeChildAt(int row) {
-        if (row >= 0 && row < m_children.size()) {
-            delete m_children.takeAt(row);
-        }
-    }
-
-    bool hasChildren() const {
-        if (m_type == Folder) {
-            QDir dir(m_path);
-            dir.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);
-            return dir.count() > 0;
-        }
-        return false;
-    }
-
-    void removeAllChildren() {
-        qDeleteAll(m_children);
-        m_children.clear();
-    }
-
-    QDateTime lastModified() const { return m_lastModified; }
-    // 新增方法
-    int cachedChildCount() const {
-        if (m_cachedChildCount == -1 && m_type == Folder) {
-            QDir dir(m_path);
-            dir.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);
-            m_cachedChildCount = dir.entryList().count();
-        }
-        return m_cachedChildCount;
-    }
+    void removeAllChildren();
 
-    int visibleChildCount() const {
-        return m_cachedChildCount;
-    }
 private:
-    QList<TreeItem*> m_children;
-    NodeType m_type;
+    Type m_type;
     QString m_name;
     QString m_path;
+    QDateTime m_lastModified;
     TreeItem *m_parent;
-    QDateTime m_lastModified; // 已存在
-    mutable int m_cachedChildCount = -1; // 缓存数量,-1 表示未初始化
+    QList<TreeItem*> m_children;
 };
 
-class TreeModel : public QAbstractItemModel {
+class TreeModel : public QAbstractItemModel
+{
     Q_OBJECT
-public:
-    explicit TreeModel(QObject *parent = nullptr)
-        : QAbstractItemModel(parent),
-        m_rootItem(new TreeItem(TreeItem::Root, "Root")),
-        m_picturesPath(QStandardPaths::writableLocation(QStandardPaths::PicturesLocation)) {
-        loadRootFolders();
-    }
-
-    ~TreeModel() { delete m_rootItem; }
-
-    // 基本模型接口
-    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override {
-        if (!hasIndex(row, column, parent)) return QModelIndex();
-
-        TreeItem *parentItem = parent.isValid() ? static_cast<TreeItem*>(parent.internalPointer()) : m_rootItem;
-        TreeItem *childItem = parentItem->child(row);
-        return childItem ? createIndex(row, column, childItem) : QModelIndex();
-    }
-
-    QModelIndex parent(const QModelIndex &index) const override {
-        if (!index.isValid()) return QModelIndex();
-
-        TreeItem *childItem = static_cast<TreeItem*>(index.internalPointer());
-        TreeItem *parentItem = childItem->parent();
-
-        if (parentItem == m_rootItem || !parentItem)
-            return QModelIndex();
-
-        return createIndex(parentItem->row(), 0, parentItem);
-    }
-
-    int rowCount(const QModelIndex &parent = QModelIndex()) const override {
-        TreeItem *parentItem = parent.isValid() ? static_cast<TreeItem*>(parent.internalPointer()) : m_rootItem;
-        return parentItem->childCount();
-    }
-
-    int columnCount(const QModelIndex & = QModelIndex()) const override { return 1; }
-
-    QVariant data(const QModelIndex &index, int role) const override {
-        if (!index.isValid()) return QVariant();
-
-        TreeItem* item = static_cast<TreeItem*>(index.internalPointer());
-
-        switch(role) {
-        case Qt::DisplayRole:
-            return item->name();
-        case PathRole:
-            return item->path();
-        case IsFolderRole:
-            return item->type() == TreeItem::Folder;
-        case CountRole:
-            return item->cachedChildCount();  // 直接返回子项数量
-        case TimeRole:
-            return item->lastModified();
-        default:
-            return QVariant();
-        }
-    }
-
-    QHash<int, QByteArray> roleNames() const override {
-        QHash<int, QByteArray> roles;
-        roles[Qt::DisplayRole] = "name";
-        roles[PathRole] = "path";
-        roles[IsFolderRole] = "isFolder";
-        roles[CountRole] = "count";
-        roles[TimeRole] = "time";
-        return roles;
-    }
-    Q_INVOKABLE void resetModel(); // 暴露给QML调用
-    Q_INVOKABLE void loadChildren(const QModelIndex &index) {
-        if (!index.isValid()) {
-            qWarning() << "Invalid index in loadChildren";
-            return;
-        }
-
-        TreeItem *parentItem = static_cast<TreeItem*>(index.internalPointer());
-        if (parentItem->type() != TreeItem::Folder) {
-            qDebug() << "Not a folder node:" << parentItem->path();
-            return;
-        }
-
-        //判断是否为根目录的直接子节点
-        bool isRootChild = (parentItem == m_rootItem);
-
-
-        // 清空现有子项(修复范围错误)
-        if (parentItem->childCount() > 0) {
-            beginRemoveRows(index, 0, parentItem->childCount() - 1);
-            parentItem->removeAllChildren(); // 需要实现该函数
-            endRemoveRows();
-        }
-        // 获取文件系统条目(禁用QDir默认排序)
-        QDir dir(parentItem->path());
-        dir.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);
-        dir.setSorting(QDir::NoSort); // 🚨 禁用所有默认排序
-
-        // 获取条目并按新规则排序
-        auto entries = dir.entryInfoList();
-
-        // 仅根目录的子项按时间排序
-        if (isRootChild) {
-            std::sort(entries.begin(), entries.end(), [](const QFileInfo &a, const QFileInfo &b) {
-                if (a.isDir() && b.isDir()) {
-                    return a.lastModified() > b.lastModified(); // 目录按时间排序
-                }
-                return a.fileName() < b.fileName(); // 文件按名称排序
-            });
-        } else {
-            // 非根目录保持默认名称排序
-            std::sort(entries.begin(), entries.end(), [](const QFileInfo &a, const QFileInfo &b) {
-                if (a.isDir() == b.isDir()) {
-                    return a.fileName() < b.fileName();
-                }
-                return a.isDir(); // 目录在前
-            });
-        }
 
-        qDebug() << "Loading" << entries.count() << "items from" << dir.absolutePath();
+    Q_PROPERTY(bool loading READ loading NOTIFY loadingChanged)
 
+public:
+    explicit TreeModel(QObject *parent = nullptr);
+    ~TreeModel() override;
 
-        // 插入新数据(修复行数范围)
-        beginInsertRows(index, 0, entries.count() - 1);
-        for (const QFileInfo &entry : entries) {
+    // 必须重写 QAbstractItemModel 的接口
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+    QModelIndex parent(const QModelIndex &index) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    QHash<int, QByteArray> roleNames() const override;
 
-            if (!entry.isDir()) {
-                QMimeType mime = mimeDb.mimeTypeForFile(entry);
-                if (!mime.name().startsWith("image/")) continue;
-            }
+    bool loading() const { return m_loading; }
 
-            parentItem->appendChild(new TreeItem(
-                entry.isDir() ? TreeItem::Folder : TreeItem::Image,
-                entry.fileName(),
-                entry.absoluteFilePath(),
-                parentItem,
-                entry.lastModified()  // 传递最后修改时间
-                ));
-        }
-        endInsertRows();
-        QVector<int> roles = {CountRole, TimeRole, IsFolderRole};
-        // 强制刷新父节点数据
-        emit dataChanged(index, index, roles);
-    }
-    // TreeModel.h
-    // 新增方法获取目录时间
-    Q_INVOKABLE qint64 getDirectoryTime(const QString &path) const {
-        QFileInfo info(path);
-        return info.lastModified().toMSecsSinceEpoch();
-    }
+public slots:
+    Q_INVOKABLE void loadChildren(const QModelIndex &index);
     Q_INVOKABLE QVariantList getFolderContents(const QString &folderPath) {
         QVariantList contents;
         QDir dir(folderPath);
@@ -255,76 +104,37 @@ public:
         }
         return contents;
     }
+    void resetModel(); // 可暴露给 QML
+
+signals:
+    void loadingChanged();
+
 private:
-    enum Roles {
+    enum RoleNames {
+        DisplayRole = Qt::DisplayRole,
         PathRole = Qt::UserRole + 1,
-        IsFolderRole = Qt::UserRole + 2,
-        CountRole = Qt::UserRole + 3,  //子项数量
-        TimeRole= Qt::UserRole + 4    //最后修改时间
+        TypeRole,
+        LastModifiedRole,
+        ChildCountRole
     };
 
-    void loadRootFolders() {
-        // 清空原有数据
-        beginResetModel();
-        m_rootItem->removeAllChildren();
-        endResetModel();
-
-        QDir picturesDir(m_picturesPath);
-        picturesDir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
-        picturesDir.setSorting(QDir::NoSort); // 禁用默认排序
-        // 获取并排序目录条目
-        QFileInfoList dirEntries = picturesDir.entryInfoList();
-        std::sort(dirEntries.begin(), dirEntries.end(), [](const QFileInfo& a, const QFileInfo& b) {
-            return a.lastModified() > b.lastModified(); // 降序排列(最新的在前)
-        });
-
-        beginInsertRows(QModelIndex(), 0, dirEntries.size()-1);
-        for (const QFileInfo &dirInfo : dirEntries) {
-            m_rootItem->appendChild(new TreeItem(
-                TreeItem::Folder,
-                dirInfo.fileName(),
-                dirInfo.absoluteFilePath(),
-                m_rootItem,
-                dirInfo.lastModified()
-                ));
-        }
-        endInsertRows();
-        // 调试输出
-        // qDebug() << "Sorted root folders:";
-        // for (const auto& entry : dirEntries) {
-        //     qDebug() << entry.fileName() << entry.lastModified();
-        // }
-    }
-
-    void populateFolderItems(TreeItem *parentFolder) {
-        QDir dir(parentFolder->path());
-        dir.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);
-
-        QMimeDatabase mimeDb;
-
-        for (const QFileInfo &entry : dir.entryInfoList()) {
-            TreeItem::NodeType type = TreeItem::Image;
-
-            if (entry.isDir()) {
-                type = TreeItem::Folder;
-            } else {
-                QMimeType mime = mimeDb.mimeTypeForFile(entry);
-                if (!mime.name().startsWith("image/")) continue;
-            }
-
-            parentFolder->appendChild(new TreeItem(
-                type,
-                entry.fileName(),
-                entry.absoluteFilePath(),
-                parentFolder,
-                entry.lastModified()
-                ));
-        }
-    }
+    Q_INVOKABLE void loadRootFolders();
+    void loadMonths(TreeItem *yearItem, const QModelIndex &parentIndex);
+    void loadDays(TreeItem *monthItem, const QModelIndex &parentIndex);
+    void loadAlbums(TreeItem *dayItem, const QModelIndex &parentIndex);
+    void loadImages(TreeItem *albumItem, const QModelIndex &parentIndex);
 
     TreeItem *m_rootItem;
     QString m_picturesPath;
-    QMimeDatabase mimeDb; // 添加私有成员变量
+    QMimeDatabase m_mimeDb;
+    QRegularExpression m_yearRegex{R"(^\d{4}$)"};
+    QRegularExpression m_monthRegex{R"(^(0[1-9]|1[0-2])$)"};
+    QRegularExpression m_dayRegex{R"(^(0[1-9]|[12][0-9]|3[01])$)"};
+    QRegularExpression m_albumRegex{R"(^\d{14}$)"};
+
+    bool m_loading = false;
+    void setLoading(bool loading);
 };
 
+
 #endif // TREEMODEL_H

+ 78 - 0
q6_felgo_iot/header/app_sq_save.h

@@ -0,0 +1,78 @@
+#ifndef APP_SQ_SAVE_H
+#define APP_SQ_SAVE_H
+
+#include <QObject>
+#include <QSqlDatabase>
+#include <QJsonDocument>
+
+class OfflineStorage : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool jsonCacheEnabled READ jsonCacheEnabled WRITE setJsonCacheEnabled NOTIFY jsonCacheEnabledChanged)
+    Q_PROPERTY(bool imageCacheEnabled READ imageCacheEnabled WRITE setImageCacheEnabled NOTIFY imageCacheEnabledChanged)
+    Q_PROPERTY(int maxJsonEntries READ maxJsonEntries WRITE setMaxJsonEntries NOTIFY maxJsonEntriesChanged)
+    Q_PROPERTY(int maxImageEntries READ maxImageEntries WRITE setMaxImageEntries NOTIFY maxImageEntriesChanged)
+    Q_PROPERTY(int JsonEntries_saved READ JsonEntries_saved NOTIFY JsonEntries_savedChanged);
+    Q_PROPERTY(int ImageEntries_saved READ ImageEntries_saved NOTIFY ImageEntries_savedChanged);
+
+public:
+    explicit OfflineStorage(QObject *parent = nullptr);
+    ~OfflineStorage();
+
+    // 缓存数据
+    bool cacheJsonMessage(const QString &topic, const QByteArray &json);
+    bool cacheImagePath(const QString &imagePath);
+
+    // 获取待上传数据(最多 count 条)
+    QList<QPair<int, QPair<QString, QByteArray>>> getPendingJsonMessages(int maxCount = 10);
+    QList<QPair<int,QString>> getPendingImagePaths(int maxCount = 10);
+
+    // 标记为已上传(成功后调用)
+    bool markJsonUploaded(int id);
+    bool markImageUploaded(const QString &imagePath);
+
+    // 批量删除(可选优化)
+    bool cleanupUploaded();
+
+
+
+
+    int maxJsonEntries() const { return m_maxJsonEntries; }
+    void setMaxJsonEntries(int max);
+    int maxImageEntries() const { return m_maxImageEntries; }
+    void setMaxImageEntries(int max);
+
+    bool jsonCacheEnabled() const { return m_jsonCacheEnabled; }
+    void setJsonCacheEnabled(bool enabled);
+    bool imageCacheEnabled() const { return m_imageCacheEnabled; }
+    void setImageCacheEnabled(bool enabled);
+
+
+    int JsonEntries_saved();
+    int ImageEntries_saved();
+
+
+signals:
+    void maxJsonEntriesChanged();
+    void maxImageEntriesChanged();
+
+    void jsonCacheEnabledChanged(bool enabled);
+    void imageCacheEnabledChanged(bool enabled);
+
+    void JsonEntries_savedChanged();
+    void ImageEntries_savedChanged();
+private:
+    QSqlDatabase m_db;
+
+    bool createTables();
+    int m_JsonEntries_saved = 0;    //json存储数量
+    int m_ImageEntries_saved = 0;   //图片存储数量
+    int m_maxJsonEntries = 1000;     // 默认上限
+    int m_maxImageEntries = 1000;
+    bool m_jsonCacheEnabled = true;  // 默认启用 JSON 缓存
+    bool m_imageCacheEnabled = true; // 默认启用图片缓存
+    bool enforceLimit(const QString &table, int maxCount); // 核心函数
+};
+
+
+#endif // APP_SQ_SAVE_H

+ 5 - 5
q6_felgo_iot/header/cameramanager.h

@@ -38,11 +38,11 @@
 //USBCamera:   https://blog.csdn.net/hanshiying007/article/details/124118486
 #define CameraType  2   //0-QCamera  , 1-OPENCV,    2-libuvc
 
-#define movZ_f "f55"    //多图移动,正向80
-#define movZ_b "b55"    //多图移动,反向80
+#define movZ_f "f80"    //多图移动,正向80
+#define movZ_b "b80"    //多图移动,反向80
 
-#define movX_f "f55"    //多图移动,正向
-#define movX_b "b55"    //多图移动,反向
+#define movX_f "f80"    //多图移动,正向
+#define movX_b "b80"    //多图移动,反向
 
 
 #define focux_f "f4"    //单步对焦,正向
@@ -223,7 +223,7 @@ public:
 signals:
     //! Video sink changed.
     void videoSinkChanged();
-
+    void cameraOpenFailed(const QString &err);
     void angleChanged();
     void xScaleChanged();
     void yScaleChanged();

+ 13 - 4
q6_felgo_iot/header/main.h

@@ -37,7 +37,7 @@
 #include <opencv2/features2d/features2d.hpp>
 #include <opencv2/xfeatures2d/nonfree.hpp>
 
-#define APP_VERSION "1.2.12"
+#define APP_VERSION "1.3.16"
 
 using namespace std;
 
@@ -58,7 +58,7 @@ public:
     static QString table_ftp_other;
     static QString table_location;
     static QString table_camera;
-    static QString table_mqtt_historydata;
+    static QString table_config;
     //type
     static QString dtype;
     static QString imei;
@@ -126,12 +126,21 @@ public:
     static int photo_width;         //图片宽度
     static int photo_height;        //图片高度
     static QString auto_focus;         //对焦,全流程
-
-
+    static QString movZ_f_l;
+    static QString movZ_b_l;
+    static QString movX_f_l;
+    static QString movX_b_l;
     static int camera_tc;           //已采集图片数量
     static QStringList ptlist;      //存放图片路径
     static QStringList ptlist_res;      //存放图片拼接结果路径
 
+    static int  jsonCacheEnable;
+    static int  imageCacheEnable;;
+    static int  maxJsonEntries;
+    static int  maxImageEntries;
+    static int  x_init;
+    static int  y_init;
+
     //网络
     static bool net_alive;
     static QString net_name;

+ 61 - 1
q6_felgo_iot/header/mqtthandler.h

@@ -18,6 +18,36 @@
 #include <QtConcurrent/QtConcurrent>
 #include <QFutureWatcher>
 #include <mserial.h>
+#include <app_sq_save.h>
+#include <QNetworkInformation>
+
+class NetworkInfoHelper : public QObject {
+    Q_OBJECT
+    Q_PROPERTY(QNetworkInformation::Reachability reachability READ reachability  NOTIFY reachabilityChanged)
+    Q_PROPERTY(QNetworkInformation::TransportMedium transportMedium READ transportMedium  NOTIFY transportMediumChanged)
+    Q_PROPERTY(bool isBehindCaptivePortal READ isBehindCaptivePortal NOTIFY isBehindCaptivePortalChanged)
+    Q_PROPERTY(bool isMetered READ isMetered NOTIFY isMeteredChanged)
+
+public:
+    explicit NetworkInfoHelper(QObject *parent = nullptr);
+
+    QNetworkInformation::Reachability reachability() const;
+    QNetworkInformation::TransportMedium transportMedium() const;
+    bool isBehindCaptivePortal() const;
+    bool isMetered() const;
+signals:
+    void reachabilityChanged(QNetworkInformation::Reachability newReachability);
+    void transportMediumChanged(QNetworkInformation::TransportMedium current);
+    void isBehindCaptivePortalChanged(bool state);
+    void isMeteredChanged(bool isMetered);
+
+private:
+    QNetworkInformation *m_networkInfo = nullptr;
+    QNetworkInformation::Reachability m_initialReachability = QNetworkInformation::Reachability::Unknown;
+    QNetworkInformation::TransportMedium m_initialTransportMedium = QNetworkInformation::TransportMedium::Unknown;
+    bool m_initialIsBehindCaptivePortal = false;
+    bool m_initialIsMetered = false;
+};
 
 class MqttHandler : public QThread
 {
@@ -64,7 +94,30 @@ public:
         emit updateStm32();                         //下载rbl文件
         emit dataReceived(mqtt_json.CmdUpdate());   //发送升级指令
     }
+    Q_INVOKABLE QString cache_json_num(){
+        return QString::number(m_storage->JsonEntries_saved());
+    }
+    Q_INVOKABLE QString cache_image_num(){
+        return QString::number(m_storage->ImageEntries_saved());
+    }
+
+    Q_INVOKABLE QString cache_Json_Maxnum(){
+        return QString::number(m_storage->maxJsonEntries());
+    }
+
+    Q_INVOKABLE QString cache_image_Maxnum(){
+        return QString::number(m_storage->maxImageEntries());
+    }
 
+    Q_INVOKABLE int cache_image_enable(){
+        return m_storage->imageCacheEnabled();
+    }
+    Q_INVOKABLE int cache_Json_enable(){
+        return m_storage->jsonCacheEnabled();
+    }
+
+    // 提供接口(如果需要从 QML 调整配置)
+    OfflineStorage* storage() { return m_storage; }
 signals:
     void connected();
     void disconnected();
@@ -77,9 +130,12 @@ signals:
     void mediaplay();
     void sysReboot();
     void appInstall();
+    void signal_reupload_image(const QString &path);
+    void signal_imei_change(const QString &new_imei);
 public slots:
-
     void install_app();
+    void startReupload();
+    void storage_Picture(bool success,const QString &path);
 private slots:
     // Your existing slots...
     void onConnected();
@@ -92,8 +148,12 @@ private:
     QAudioOutput* maudioOutput;
     QTextCodec *tc; // 编码
     QMqttClient *m_client;
+    OfflineStorage *m_storage;
     QUrl url;
     JsonFunc mqtt_json;
+    int m_uploadBatchSize = 1; // 可配置
+    QHash<quint16, std::function<void(bool)>> m_pendingAcks; // 消息ID -> 回调
+    QTimer *image_reupload;
     Serial_AT serial_4g;
 };
 

+ 16 - 2
q6_felgo_iot/header/mserial.h

@@ -38,6 +38,9 @@ public:
         return m_serialPort;
     }
     Q_INVOKABLE void readBoardData();
+    Q_INVOKABLE void uploadData_Mqtt(){
+        m_dat_f.setInterval(0);
+    };
     Q_INVOKABLE void update_dat_f_main(QString freq);      //更新数据上传间隔
     Q_INVOKABLE void sendCmd(QString cmd_type,bool sw,QString setup,QString speed);
     Q_INVOKABLE QStringList pathinfo(){
@@ -80,6 +83,17 @@ public:
         return param::iccid;
     }
 
+    Q_INVOKABLE QString getlat(){
+        return param::gps_lat;
+    }
+
+    Q_INVOKABLE QString getlng(){
+        return param::gps_lng;
+    }
+
+    Q_INVOKABLE QString get_app_version(){
+        return APP_VERSION;
+    }
 signals:
     void dataReceived(const QByteArray &data);
     void dataUpload(const QByteArray &data);
@@ -95,12 +109,13 @@ signals:
 
     void signal_movy();
     void timeout_mov_stop();
+    void gpsSuccess();
 
 public slots:
     void sendData(const QByteArray &data);
     void mqtttoserial(const QByteArray &data);
     void getmodemresult(int res);
-    void doWork(QVideoFrame  dframe);
+
 private slots:
     //void readBoardData();
 
@@ -224,7 +239,6 @@ signals:
     void sendSuccess(int sendByte);
     void imeiDone();
     void iccidDone();
-
 };
 
 

+ 16 - 0
q6_felgo_iot/header/mysql.h

@@ -61,8 +61,23 @@ typedef struct{
     int photo_width;
     int photo_height;
     QString auto_focus;
+    QString movz_f;
+    QString movz_b;
+    QString movx_f;
+    QString movx_b;
 }config_camera;
 
+
+typedef struct{
+    int  jsonCacheEnable;
+    int  imageCacheEnable;;
+    int  maxJsonEntries;
+    int  maxImageEntries;
+    int  x_init;
+    int  y_init;
+
+}config_param;
+
 class config_db_type
 {
     public:
@@ -71,6 +86,7 @@ class config_db_type
     config_location_db location_db;
     data_json_db json_db;
     config_camera camera_db;
+    config_param config_db;
 };
 
 

+ 144 - 19
q6_felgo_iot/qml/pages/HomePage.qml

@@ -19,6 +19,8 @@ AppPage {
   property string boxtemptureString: ""
   property string collectString: ""
   property string gps_state: "定位中..."
+  property string jsonenable_String: "关闭"
+  property string imagenable_String: "关闭"
   property bool connect_board: false
   property var tt
   property bool isonline: false
@@ -48,13 +50,61 @@ AppPage {
       }
   }
 
-//  Connections {
-//      target: app
-//      onTmChange:{
-//          console.log("配置主题模式:",md)
-//          theme_select = md
-//      }
-//  }
+
+
+ Connections {
+     target: networkMonitor
+     // 监听可达性变化(如从断开到连接)
+     onReachabilityChanged: {
+         let status = ""
+         if(networkMonitor.reachability===0)
+         {
+             status = "未知"
+             net_sta.color = "red"
+         }else if(networkMonitor.reachability===1){
+             status = "离线"
+             net_sta.color = "red"
+         }else if(networkMonitor.reachability===2){
+             status = "本地"
+         }else if(networkMonitor.reachability===3){
+             status = "局域网"
+         }else if(networkMonitor.reachability===4){
+             status = "在线"
+             net_sta.color = "green"
+         }
+       console.log("onReachabilityChanged:",networkMonitor.reachability)
+       net_sta.text = "网络状态:" + status
+     }
+
+     // 监听传输介质变化(如从 Wi-Fi 切换到 4G)
+     onTransportMediumChanged: {
+         let nettype = "未知"
+         console.log("onTransportMediumChanged:",networkMonitor.transportMedium)
+         if(networkMonitor.transportMedium===0)
+         {
+             nettype = "未知"
+         }else if(networkMonitor.transportMedium===1){
+             nettype = "有线"
+         }else if(networkMonitor.transportMedium===2){
+             nettype = "移动网络"
+         }else if(networkMonitor.transportMedium===3){
+             nettype = "WIFI"
+         }else if(networkMonitor.transportMedium===4){
+             nettype = "蓝牙"
+         }
+       net_type.text = "网络类型:" + nettype
+     }
+
+     // 监听受限网络状态(如公共 Wi-Fi 登录页)
+     onIsBehindCaptivePortalChanged: {
+
+     }
+
+     // 监听计量网络状态(如移动数据流量限制)
+     onIsMeteredChanged: {
+
+     }
+ }
 
   // 接收并显示日志消息
   Connections {
@@ -72,6 +122,7 @@ AppPage {
   // Connections{
   //     target: myClass
   // }
+
   //串口
   Connections{
       target: serial
@@ -130,6 +181,14 @@ AppPage {
           if(!textInput_y.focus){
               textInput_y.text = y_init_dis.toString();
           }
+          if(jsonData.ext.tps){
+              if("1"===jsonData.ext.tps){
+                  text_tempture_sta.text = "保护:" + "["+ jsonData.ext.tpl +"]"
+              }else{
+                  text_tempture_sta.text = "正常:" + "["+ jsonData.ext.tpl +"]"
+              }
+          }
+
           var dvs = jsonData.ext.dver
           dvs = dvs.split("-")
           app.bvReceived(dvs[0])
@@ -139,8 +198,14 @@ AppPage {
            text_devicesta.text =qsTr("485未连接,读取数据失败");
            originalString =serial.getId()
            iccidString=serial.getIccid()
+           app.appReceived(serial.get_app_version())
       }
 
+      onGpsSuccess:{
+          gps_state = "成功"
+          text_lat.text = serial.getlat()
+          text_lng.text = serial.getlng()
+      }
   }
 
   Timer {
@@ -172,7 +237,9 @@ AppPage {
             app.theme_select = "night"
           }
       }
-      return years + "-" + mon + "-" + dates + " " + hours + ":" + mins + ":" + secs
+      // 关键:将月、日、时、分、秒补到两位(不足补0)
+      var formatNum = (num) => String(num).padStart(2, '0')
+      return `${years}-${formatNum(mon)}-${formatNum(dates)} ${formatNum(hours)}:${formatNum(mins)}:${formatNum(secs)}`
   }
 
   Grid {
@@ -221,18 +288,23 @@ AppPage {
                       fontSize: 20
                       //font.bold: true
                   }
-
+                  AppText{
+                      id: net_type
+                      anchors.verticalCenter: parent.verticalCenter
+                      color: app.fontColor
+                      text: "联网类型:"
+                      fontSize: 20
+                      //font.bold: true
+                  }
                   AppText{
                       id: text_gps
                       anchors.verticalCenter: parent.verticalCenter
                       text: "GPS状态:" + gps_state
                       color: app.fontColor
-                      font.bold: true
-                      //fontSize: 20
+                      //font.bold: true
+                      fontSize: 20
                   }
               }
-
-
           }
       }
 
@@ -253,6 +325,8 @@ AppPage {
                     id: focus_setting
                     anchors.fill: parent
                     visible: false
+                    radius: 5
+                    color: app.cardColor
                         // X坐标输入行(结构同优化前)
                     Column {
                         anchors.fill: parent
@@ -395,7 +469,6 @@ AppPage {
                 }
             }
 
-
             Rectangle {
                 radius: 5
 
@@ -408,17 +481,32 @@ AppPage {
                   running: true
                   repeat: true
                   onTriggered: {
-                      text_gps.text = "GPS状态:" + gps_state
-
                       if(mqtt.checkLink()){
                           mqtt_text.text="MQTT已连接:" + net_list[5]
                       }else{
                           mqtt_text.text="MQTT已断开:" + net_list[5]
                       }
                       net_list = mqtt.netMessage()
+                      if(mqtt.cache_Json_enable()===1){
+                        jsonenable_String = "开启"
+                      }else{
+                        jsonenable_String = "关闭"
+                      }
+                      if(mqtt.cache_image_enable()===1){
+                          imagenable_String = "开启"
+                      }else{
+                          imagenable_String = "关闭"
+                      }
+
+                      cache_json_text.text= "数据缓存:" + mqtt.cache_json_num() +
+                              "("+ mqtt.cache_Json_Maxnum()+")" + jsonenable_String
+
+                      cache_image_text.text = "图片缓存:" + mqtt.cache_image_num()+
+                              "("+mqtt.cache_image_Maxnum()+")" + imagenable_String
+
                       if(net_list){
                           if(net_list[0]==="1"){isonline = true}else{isonline = false}
-                          net_sta.text = qsTr("<b>联网状态:</b> %1").arg(isonline? "已联网" : "未联网")
+                          //net_sta.text = qsTr("<b>联网状态:</b> %1").arg(isonline? "已联网" : "未联网")
                           net_sta.color = qsTr("%1").arg(isonline? "green" : "red")
                           ipv4.text = qsTr("<b>[IPV4] </b> %1").arg(net_list[4])
                           mac.text = qsTr("<b>[MAC] </b> %1").arg(net_list[3])
@@ -428,7 +516,23 @@ AppPage {
                       }
                   }
                 }
-
+                Timer {
+                     id: longPressTimer
+                     interval: 1000 // 1秒
+                     onTriggered: {
+                         console.log("长按触发")
+                         serial.uploadData_Mqtt()
+                     }
+                 }
+                MouseArea {
+                    anchors.fill: parent
+                    onPressed:{
+                        longPressTimer.start()
+                    }
+                    onReleased:{
+                        longPressTimer.stop()
+                    }
+                }
                 Column{
                     anchors.centerIn: parent
                     spacing: 5
@@ -488,6 +592,20 @@ AppPage {
                         fontSize: 10
                         color: "gray"
                     }
+                    AppText{
+                        id: cache_json_text
+                        anchors.horizontalCenter: parent.horizontalCenter   //垂直居中显示
+                        text:"数据缓存:"
+                        fontSize: 10
+                        color: "gray"
+                    }
+                    AppText{
+                        id: cache_image_text
+                        anchors.horizontalCenter: parent.horizontalCenter   //垂直居中显示
+                        text:"图片缓存:"
+                        fontSize: 10
+                        color: "gray"
+                    }
                 }
 
             }
@@ -797,7 +915,7 @@ AppPage {
                     AppText{
                         id: text_tempture
                         anchors.horizontalCenter: parent.horizontalCenter   //垂直居中显示
-                        text: "温度:"
+                        text: "环境温度:"
                         color: app.fontColor
                         font.bold: true
                     }
@@ -805,6 +923,13 @@ AppPage {
                         id: text_tempture0
                         anchors.horizontalCenter: parent.horizontalCenter   //垂直居中显示
                         text: "箱内温度:"
+                        color: app.fontColor
+                        font.bold: true
+                    }
+                    AppText{
+                        id: text_tempture_sta
+                        anchors.horizontalCenter: parent.horizontalCenter   //垂直居中显示
+                        text:"正常"
                         fontSize: 10
                         color: "gray"
                     }

+ 83 - 61
q6_felgo_iot/qml/pages/PhotostitcherPage.qml

@@ -4,8 +4,6 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import "../controls"
 import "../common"
-import PhotoViewer 1.0
-
 AppPage {
     id: photoArchivePage
     navigationBarHidden: true
@@ -13,10 +11,6 @@ AppPage {
 
     property bool isLoading: false
 
-    TreeModel {
-        id: treeModel
-    }
-
     // 全屏查看组件
     Popup {
         id: fullscreenPopup
@@ -213,6 +207,10 @@ AppPage {
             SplitView.minimumWidth: 200
             clip: true
 
+            AppText {
+                text: "图片按年月日归档"
+            }
+
             TreeView {
                 id: archiveTreeView
                 model: treeModel
@@ -221,90 +219,105 @@ AppPage {
                 selectionModel: ItemSelectionModel {} // 处理选择状态
                 selectionBehavior: TreeView.SelectRows // 整行选择
 
-                delegate: Item {
+                delegate: Item  {
+                    id: root
                     implicitWidth: archiveTreeView.width
                     implicitHeight: 40
-
+                    // 必须声明的 required 属性(由 TreeView 自动填充)
                     required property TreeView treeView
                     required property var model
-
-                    required property bool expanded //是否展开
-                    required property bool isFolder //是否有子节点
-                    required property string name   //名字
-                    required property string path   //路径
-
-                    required property int depth     //深度层级
-                    required property int row       //当前列
-                    required property int column    //行
-                    // 自动生成正确的模型索引
-
+                    //其他列中的delegate Item将将此属性设置为,并将显示模型中其余列的数据(通常不缩进)。
+                    required property bool isTreeNode
+                    //绘制的model Item是否在视图中展开
+                    required property bool expanded
+                    //绘制的model Item是否在模型中有子项
+                    required property int hasChildren
+                    //包含delegate绘制的model Item的深度。model Item的深度与其在模型中的祖先数量相同
+                    required property int depth
+                    required property int type
                     Rectangle {
                         width: parent.width
                         height: parent.height
-                        //color: mouseArea.containsMouse ? "#f0f0f0" : "transparent"
-
                         Row {
                             spacing: 8
-                            // anchors.verticalCenter: parent.verticalCenter
-                            // anchors.left: parent.left
                             anchors.leftMargin: 10 + depth * 20
-
-
-
                             // 展开/折叠指示器
                             Text {
-                                visible: model.isFolder
-                                text: expanded ? "▼" : "▶"
+                                id: indicator
+                                visible: root.type===0 || root.type === 1 || root.type===2 || root.type===3 || root.type===4
+                                text: root.expanded ? "▼" : "▶"
                                 color: "#666"
                                 anchors.verticalCenter: parent.verticalCenter
                                 //anchors.verticalCenter: parent.verticalCenter
+                                // --- 添加旋转动画 ---
+                                RotationAnimation on rotation {
+                                    id: rotationAnim
+                                    duration: 200
+                                    easing.type: Easing.InOutQuad
+                                }
+
+                                // 监听 expanded 属性变化以触发动画
+                                onVisibleChanged: {
+                                    if(visible) {
+                                        rotation = root.expanded ? 90 : 0; // 初始角度
+                                    }
+                                }
+                                Connections {
+                                    target: root
+                                    function onExpandedChanged() {
+                                        if(indicator.visible) {
+                                            rotationAnim.to = root.expanded ? 90 : 0;
+                                            rotationAnim.restart();
+                                        }
+                                    }
+                                }
                             }
 
                             TapHandler{
                                 onSingleTapped: {
-                                    if(model.isFolder){
-                                        let index = treeView.model.index(row, column)
-                                        treeModel.loadChildren(index)
-                                        treeView.toggleExpanded(row)
+                                    if(root.type===5){
+                                        imageListModel.clear()
+                                        imageListModel.append({filePath: model.path})
                                     }else{
-                                        // 选中图片
-                                       imageListModel.clear()
-                                       imageListModel.append({filePath: model.path})
+                                        let index = treeView.model.index(row, column)
+                                        // treeModel.loadChildren(index)
+                                        // treeView.toggleExpanded(row)
+                                        // 若未展开且有子节点,则加载并展开
+                                        treeModel.loadChildren(index); // 同步加载子节点(阻塞直到完成)
+                                        treeView.toggleExpanded(row); // 显式展开(确保视图刷新)
                                     }
+                                    console.log("root.type:", root.type)
+
                                 }
                                 onLongPressed: {
-                                    if (model.isFolder) {
+                                    console.log("长按:", root.type)
+                                    if (model.type===4) {
                                         // 加载文件夹内容到图片区
                                         loadFolderContents(model.path)
                                     }
                                 }
                             }
-
                             // 名称
                             Text {
-                                text:{
-                                    if(model.isFolder){
-                                       //const count = treeModel.rowCount(treeView.index(row, column))
-                                       return model.name + " (" + model.count + ")"
+                                text: {
+                                    if(root.type===4||root.type===3||root.type===2||root.type===1||root.type===0){
+                                        return model.name + " (" + model.childCount + ")"
                                     }
                                     return model.name
                                 }
-
-                                color: model.isFolder ? "#333" : "#666"
-                                font.bold: model.isFolder
+                                color: (root.type===0 || root.type === 1 || root.type===2 || root.type===3 || root.type===4) ? "#333" : "#666"
+                                font.bold: root.type===0 || root.type === 1 || root.type===2 || root.type===3 || root.type===4
                                 anchors.verticalCenter: parent.verticalCenter
                                 elide: Text.ElideRight
-                                width: archiveTreeView.width - 50 - depth * 20
+                                width: archiveTreeView.width// - 50 - depth * 20
                             }
                         }
-
                     }
                 }
             }
         }
     }
     // PhotoArchivePage.qml
-
     function loadFolderContents(folderPath) {
         imageListModel.clear()
 
@@ -324,7 +337,6 @@ AppPage {
         }
     }
 
-
     function loadRootDirectory() {
         if(isLoading) return
 
@@ -334,17 +346,18 @@ AppPage {
         // 重置模型
         treeModel.resetModel()
 
-        // 获取根节点
-        var rootIndex = treeModel.index(0, 0)
+        var rootIndex = treeModel.index(1, 0)
         if (rootIndex.valid) {
-            // 加载子项
-            treeModel.loadChildren(rootIndex)
-
-            // 加载图片
-            loadFolderContents(treeModel.data(rootIndex, 256))
-
-            // 展开根节点
-            archiveTreeView.expand(0)
+            treeModel.loadChildren(rootIndex) // 同步加载子节点
+            archiveTreeView.expand(rootIndex)
+            // 延迟 100ms 确保视图渲染完成
+            Qt.callLater(function() {
+                if (archiveTreeView.isExpanded(rootIndex)) {
+                    console.log("展开成功")
+                } else {
+                    console.error("展开失败,检查索引有效性")
+                }
+            }, 100)
         }
 
         // 结束加载状态(根据实际加载完成时机调用)
@@ -352,11 +365,20 @@ AppPage {
     }
 
     Component.onCompleted: {
-        // 初始化加载根目录
-        var rootIndex = treeModel.index(0, 0)
+        var rootIndex = treeModel.index(1, 0)
         if (rootIndex.valid) {
+            // 重置模型并加载根节点子项
+            treeModel.resetModel()
             treeModel.loadChildren(rootIndex)
-            loadFolderContents(treeModel.data(rootIndex, 256)) // 256对应PathRole
+            archiveTreeView.expand(rootIndex)
+            // 延迟确保数据加载完成
+            Qt.callLater(function() {
+                if (archiveTreeView.isExpanded(rootIndex)) {
+                    console.log("展开成功")
+                } else {
+                    console.error("展开失败,检查索引有效性")
+                }
+            }, 100)
         }
     }
 }

+ 2 - 2
q6_felgo_iot/qml/pages/SqlScreen.qml

@@ -40,7 +40,7 @@ AppPage {
     property variant table_mqtt_Value: ["id","dtype","ip","port","imei","uid","pwd","clientid","qos","keepalive","sub","pub","offline"]
     property variant table_ftp_Value: ["id","ip","port","dir","uid","pwd","mode"]
     property variant table_location_Value: ["id","lbs_lat","lbs_lng","gps_lat","gps_lng","gps_elevation"]
-    property variant table_camera_Value: ["camera_type","mode","stitch_photonum","photo_width","photo_height","auto_focus"]
+    property variant table_camera_Value: ["camera_type","mode","stitch_photonum","photo_width","photo_height","auto_focus","movz_f","movz_b","movx_f","movz_b"]
     property variant table_json_Value: ["id","datetime","json_data","json_data"]
     property int datacount: 1
 
@@ -380,7 +380,7 @@ AppPage {
                                 {
                                     table_model.horHeader = table_location_Value
                                 }else if(displayText===model[5]){
-                                    columnWidthArr = [100,100,150,100,100,100]
+                                    columnWidthArr = [100,100,150,100,100,100,100,100,100,100]
                                     table_model.horHeader = table_camera_Value
 
                                 }

+ 6 - 0
q6_felgo_iot/qml/pages/TestPage.qml

@@ -48,6 +48,12 @@ AppPage {
         objectName: "Frames"
         id: frames
         videoSink: output.videoSink
+
+        onCameraOpenFailed:function(err){
+            console.log("onCameraOpenFailed",err)
+            nativeUtils.displayMessageBox("相机打开失败!",err,1)
+        }
+
         onVideoSinkChanged: {
             console.log("onVideoSinkChanged")
             photoTimer.start()  //两秒后关闭相机,因为相机加载的慢,否则关不住

+ 4 - 0
q6_felgo_iot/src/EasyTableModel.cpp

@@ -196,6 +196,10 @@ void EasyTableModel::loadData(const QJsonArray &data,QString &table_name)
             newRow.append(itemRow.value("photo_width"));
             newRow.append(itemRow.value("photo_height"));
             newRow.append(itemRow.value("auto_focus"));
+            newRow.append(itemRow.value("movz_f"));
+            newRow.append(itemRow.value("movz_b"));
+            newRow.append(itemRow.value("movx_f"));
+            newRow.append(itemRow.value("movx_b"));
         }
         else if(table_name == QString::fromLocal8Bit("data"))
         {

+ 337 - 42
q6_felgo_iot/src/TreeModel.cpp

@@ -4,62 +4,357 @@
 #include "TreeModel.h"
 #include <QStandardPaths>
 #include <QDir>
+#include <QTimer>
 
-void TreeModel::resetModel() {
+
+TreeItem::TreeItem(Type type, const QString &name, const QString &path,
+                   const QDateTime &lastModified, TreeItem *parent)
+    : m_type(type), m_name(name), m_path(path),
+    m_lastModified(lastModified.isValid() ? lastModified : QDateTime::currentDateTime()),
+    m_parent(parent)
+{
+}
+
+TreeItem::~TreeItem()
+{
+    qDeleteAll(m_children);
+}
+
+void TreeItem::appendChild(TreeItem *child)
+{
+    m_children.append(child);
+}
+
+TreeItem *TreeItem::child(int row) const
+{
+    return m_children.value(row);
+}
+
+int TreeItem::childCount() const
+{
+    return m_children.count();
+}
+
+int TreeItem::row() const
+{
+    if (m_parent)
+        return m_parent->m_children.indexOf(const_cast<TreeItem*>(this));
+    return 0;
+}
+
+
+void TreeItem::removeAllChildren()
+{
+    qDeleteAll(m_children);
+    m_children.clear();
+}
+
+
+TreeModel::TreeModel(QObject *parent)
+    : QAbstractItemModel(parent)
+    , m_rootItem(new TreeItem(TreeItem::Root, "Pictures", ""))
+    , m_picturesPath(QStandardPaths::writableLocation(QStandardPaths::PicturesLocation))
+{
+    qDebug() << "Pictures Location:" << m_picturesPath;
+    QTimer::singleShot(0, this, [this]() {
+        resetModel();
+    });
+}
+
+TreeModel::~TreeModel()
+{
+    delete m_rootItem;
+}
+
+QModelIndex TreeModel::index(int row, int column, const QModelIndex &parent) const
+{
+    if (!hasIndex(row, column, parent))
+        return QModelIndex();
+
+    TreeItem *parentItem = parent.isValid() ? static_cast<TreeItem*>(parent.internalPointer()) : m_rootItem;
+    TreeItem *childItem = parentItem->child(row);
+    return childItem ? createIndex(row, column, childItem) : QModelIndex();
+}
+
+QModelIndex TreeModel::parent(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return QModelIndex();
+
+    TreeItem *childItem = static_cast<TreeItem*>(index.internalPointer());
+    TreeItem *parentItem = childItem->parent();
+
+    if (parentItem == m_rootItem || !parentItem)
+        return QModelIndex();
+
+    return createIndex(parentItem->row(), 0, parentItem);
+}
+
+int TreeModel::rowCount(const QModelIndex &parent) const
+{
+    TreeItem *parentItem = parent.isValid() ? static_cast<TreeItem*>(parent.internalPointer()) : m_rootItem;
+    return parentItem->childCount();
+}
+
+int TreeModel::columnCount(const QModelIndex &) const
+{
+    return 1;
+}
+
+QVariant TreeModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+
+    TreeItem *item = static_cast<TreeItem*>(index.internalPointer());
+
+    switch (role) {
+    case Qt::DisplayRole:
+        return item->name();
+    case PathRole:
+        return item->path();
+    case TypeRole:
+        return item->type();
+    case LastModifiedRole:
+        return item->lastModified();
+    case ChildCountRole:
+        return item->childCount();
+    default:
+        return QVariant();
+    }
+}
+
+QHash<int, QByteArray> TreeModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+    roles[Qt::DisplayRole] = "name";
+    roles[PathRole] = "path";
+    roles[TypeRole] = "type";
+    roles[LastModifiedRole] = "lastModified";
+    roles[ChildCountRole] = "childCount";
+    return roles;
+}
+
+void TreeModel::setLoading(bool loading)
+{
+    if (m_loading != loading) {
+        m_loading = loading;
+        emit loadingChanged();
+    }
+}
+
+void TreeModel::resetModel()
+{
     beginResetModel();
+    m_rootItem->removeAllChildren();
+    endResetModel();
+
+    setLoading(true);
+    QTimer::singleShot(10, this, [this]() {
+        loadRootFolders();
+        setLoading(false);
+    });
+}
 
-    try {
-        // 安全删除旧数据
-        if (m_rootItem) {
-            delete m_rootItem;
-            m_rootItem = nullptr;
+void TreeModel::loadRootFolders()
+{
+    QDir picturesDir(m_picturesPath);
+    if (!picturesDir.exists()) return;
+
+    picturesDir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
+    QFileInfoList entries = picturesDir.entryInfoList();
+
+    QList<QFileInfo> yearFolders;
+    for (const QFileInfo &info : entries) {
+        if (m_yearRegex.match(info.fileName()).hasMatch()) {
+            yearFolders.append(info);
         }
+    }
 
-        m_rootItem = new TreeItem(TreeItem::Root, "Root", "", nullptr);
+    std::sort(yearFolders.begin(), yearFolders.end(), [](const QFileInfo &a, const QFileInfo &b) {
+        return a.fileName() > b.fileName(); // 最新年份在前
+    });
 
-        QDir picturesDir(QStandardPaths::writableLocation(QStandardPaths::PicturesLocation));
-        if (!picturesDir.exists()) {
-            qWarning() << "Pictures directory does not exist:" << picturesDir.absolutePath();
-            throw std::runtime_error("Pictures directory not found");
+    if (!yearFolders.isEmpty()) {
+        beginInsertRows(QModelIndex(), 0, yearFolders.size() - 1);
+        for (const QFileInfo &info : yearFolders) {
+            m_rootItem->appendChild(new TreeItem(
+                TreeItem::YearFolder,
+                info.fileName(),
+                info.absoluteFilePath(),
+                info.lastModified()));
         }
+        endInsertRows();
+    }
+}
+
+void TreeModel::loadChildren(const QModelIndex &index)
+{
+    if (!index.isValid()) return;
+
+    TreeItem *item = static_cast<TreeItem*>(index.internalPointer());
+    if (item->childCount() > 0) return; // 已加载
+
+    switch (item->type()) {
+    case TreeItem::Root:
+        break; // 根节点不自动加载子项
+    case TreeItem::YearFolder:
+        loadMonths(item, index);
+        break;
+    case TreeItem::MonthFolder:
+        loadDays(item, index);
+        break;
+    case TreeItem::DayFolder:
+        loadAlbums(item, index);
+        break;
+    case TreeItem::AlbumFolder:
+        loadImages(item, index);
+        break;
+    default:
+        break;
+    }
+}
+
+void TreeModel::loadMonths(TreeItem *yearItem, const QModelIndex &parentIndex)
+{
+    QDir dir(yearItem->path());
+    dir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
+    QFileInfoList entries = dir.entryInfoList();
 
-        // 关键修改1:获取目录时添加排序规则
-        picturesDir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
-        picturesDir.setSorting(QDir::NoSort);  // 禁用默认排序
-        QFileInfoList dirList = picturesDir.entryInfoList();
-
-        // 使用稳定排序算法
-        std::stable_sort(dirList.begin(), dirList.end(),
-                         [](const QFileInfo& a, const QFileInfo& b) {
-                             // 按最后修改时间降序排列
-                             return a.lastModified() > b.lastModified();
-                         });
-
-        beginInsertRows(QModelIndex(), 0, dirList.count() - 1);
-
-        for (const QFileInfo &dirInfo : dirList) {
-            TreeItem *newItem = new TreeItem(
-                TreeItem::Folder,
-                dirInfo.fileName(),
-                dirInfo.absoluteFilePath(),
-                m_rootItem,
-                dirInfo.lastModified()  // 携带时间戳
-                );
-            m_rootItem->appendChild(newItem);
+    QList<QFileInfo> months;
+    for (const QFileInfo &info : entries) {
+        if (m_monthRegex.match(info.fileName()).hasMatch()) {
+            months.append(info);
         }
+    }
+
+    qDebug() << "Loading months for:" << yearItem->path();
+    qDebug() << "Found entries:" << entries.size();
+    qDebug() << "Matching months:" << months.size();
+
+    std::sort(months.begin(), months.end(), [](const QFileInfo &a, const QFileInfo &b) {
+        return a.fileName() < b.fileName();
+    });
 
+    if (!months.isEmpty()) {
+        int row = rowCount(parentIndex);
+        beginInsertRows(parentIndex, row, row + months.size() - 1);
+        for (const QFileInfo &info : months) {
+            TreeItem *monthItem = new TreeItem(
+                TreeItem::MonthFolder,
+                info.fileName(),
+                info.absoluteFilePath(),
+                info.lastModified(),
+                yearItem);
+            yearItem->appendChild(monthItem);
+            //在这里加载该月下的“日”文件夹
+            loadDays(monthItem,index(row + months.indexOf(info), 0, parentIndex));
+        }
         endInsertRows();
+    }
+}
 
-    } catch (const std::exception &e) {
-        qCritical() << "Model reset failed:" << e.what();
-        if (m_rootItem) {
-            delete m_rootItem;
-            m_rootItem = new TreeItem(TreeItem::Root, "Root", "", nullptr);
+void TreeModel::loadDays(TreeItem *monthItem, const QModelIndex &parentIndex)
+{
+    QDir dir(monthItem->path());
+    dir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
+    QFileInfoList entries = dir.entryInfoList();
+
+    QList<QFileInfo> days;
+    for (const QFileInfo &info : entries) {
+        if (m_dayRegex.match(info.fileName()).hasMatch()) {
+            days.append(info);
         }
     }
 
-    endResetModel();
+    std::sort(days.begin(), days.end(), [](const QFileInfo &a, const QFileInfo &b) {
+        return a.fileName() < b.fileName();
+    });
+
+    if (!days.isEmpty()) {
+        int row = rowCount(parentIndex);
+        beginInsertRows(parentIndex, row, row + days.size() - 1);
+        for (const QFileInfo &info : days) {
+            TreeItem *dayItem = new TreeItem(
+                TreeItem::DayFolder,
+                info.fileName(),
+                info.absoluteFilePath(),
+                info.lastModified(),
+                monthItem);
+            monthItem->appendChild(dayItem);
 
-    // 关键修改3:主动触发排序信号
-    emit layoutChanged({}, QAbstractItemModel::VerticalSortHint);
+            // ✅ 加载该日下的“相册”(时间戳文件夹)
+            loadAlbums(dayItem, index(row + days.indexOf(info), 0, parentIndex));
+        }
+        endInsertRows();
+    }
+}
+
+void TreeModel::loadAlbums(TreeItem *dayItem, const QModelIndex &parentIndex)
+{
+    QDir dir(dayItem->path());
+    dir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
+    QFileInfoList entries = dir.entryInfoList();
+
+    QList<QFileInfo> albums;
+    for (const QFileInfo &info : entries) {
+        if (m_albumRegex.match(info.fileName()).hasMatch()) {
+            albums.append(info);
+        }
+    }
+
+    std::sort(albums.begin(), albums.end(), [](const QFileInfo &a, const QFileInfo &b) {
+        return a.fileName() < b.fileName();
+    });
+
+    if (!albums.isEmpty()) {
+        int row = rowCount(parentIndex);
+        beginInsertRows(parentIndex, row, row + albums.size() - 1);
+        for (const QFileInfo &info : albums) {
+            TreeItem *albumItem = new TreeItem(
+                TreeItem::AlbumFolder,
+                info.fileName(),
+                info.absoluteFilePath(),
+                info.lastModified(),
+                dayItem);
+            dayItem->appendChild(albumItem);
+            // ✅ 加载该相册下的图片
+            loadImages(albumItem, index(row + albums.indexOf(info), 0, parentIndex));
+        }
+        endInsertRows();
+    }
+}
+
+void TreeModel::loadImages(TreeItem *albumItem, const QModelIndex &parentIndex)
+{
+    QDir dir(albumItem->path());
+    dir.setFilter(QDir::Files | QDir::NoDotAndDotDot);
+    QFileInfoList entries = dir.entryInfoList();
+
+    QList<QFileInfo> images;
+    for (const QFileInfo &info : entries) {
+        QMimeType mime = m_mimeDb.mimeTypeForFile(info);
+        if (mime.name().startsWith("image/")) {
+            images.append(info);
+        }
+    }
+
+    std::sort(images.begin(), images.end(), [](const QFileInfo &a, const QFileInfo &b) {
+        return a.fileName() < b.fileName();
+    });
+
+
+    if (!images.isEmpty()) {
+        int row = rowCount(parentIndex);
+        beginInsertRows(parentIndex, row, row + images.size() - 1);
+        for (const QFileInfo &info : images) {
+            albumItem->appendChild(new TreeItem(
+                TreeItem::Image,
+                info.fileName(),
+                info.absoluteFilePath(),
+                info.lastModified(),
+                albumItem));
+        }
+        endInsertRows();
+    }
 }

+ 6 - 4
q6_felgo_iot/src/app_curlFunc.cpp

@@ -3,7 +3,7 @@
 #include <QFileInfo>  // 添加此行
 #include <QThread>
 #include <QDebug>
-
+#include <m_loger.h>
 CurlFtpUploader::CurlFtpUploader(QObject *parent) : QObject(parent), m_port(21) {}
 
 CurlFtpUploader::~CurlFtpUploader() {}
@@ -21,6 +21,7 @@ void CurlFtpUploader::setFtpParams(const QString &username,
 }
 
 void CurlFtpUploader::uploadFileAsync(const QString &localFilePath) {
+    LOG("uploadFileAsync...");
     // 在子线程中执行上传(避免阻塞主线程)
     QThread *thread = QThread::create([this, localFilePath]() {
         performUpload(localFilePath);
@@ -63,7 +64,7 @@ void CurlFtpUploader::performUpload(const QString &localFilePath) {
     curl_easy_setopt(curl, CURLOPT_READFUNCTION, &CurlFtpUploader::readCallback);
     curl_easy_setopt(curl, CURLOPT_INFILESIZE_LARGE, (curl_off_t)file.size());
     curl_easy_setopt(curl, CURLOPT_FTP_CREATE_MISSING_DIRS, 1L); // 自动创建目录
-    curl_easy_setopt(curl, CURLOPT_TIMEOUT, 180L);       // 传输超时 120 秒
+    curl_easy_setopt(curl, CURLOPT_TIMEOUT, 180L);       // 传输超时 180 秒
     curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 20L); // 连接超时 10 秒
     // 进度回调
     curl_easy_setopt(curl, CURLOPT_XFERINFOFUNCTION, &CurlFtpUploader::progressCallback);
@@ -76,9 +77,10 @@ void CurlFtpUploader::performUpload(const QString &localFilePath) {
 
     // 处理结果
     if (res != CURLE_OK) {
-        emit finished(false, curl_easy_strerror(res));
+        ERROR("上传失败:{}",curl_easy_strerror(res));
+        emit finished(false, localFilePath);
     } else {
-        emit finished(true, "");
+        emit finished(true, localFilePath);
     }
 
     curl_easy_cleanup(curl);

+ 356 - 0
q6_felgo_iot/src/app_sq_save.cpp

@@ -0,0 +1,356 @@
+// offline_storage.cpp
+#include "app_sq_save.h"
+#include <QStandardPaths>
+#include <QDir>
+#include <QSqlQuery>
+#include <QSqlError>
+#include <QDebug>
+#include <m_loger.h>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QDateTime>
+#include <QFileInfo>
+#include <QFile>
+#include <QDir>
+OfflineStorage::OfflineStorage(QObject *parent)
+    : QObject(parent)
+{
+    QString dbPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/offline.db";
+    QDir().mkpath(QFileInfo(dbPath).absolutePath());
+
+    m_db = QSqlDatabase::addDatabase("QSQLITE", "OFFLINE_DB");
+    m_db.setDatabaseName(dbPath);
+
+    if (!m_db.open()) {
+        qWarning() << "无法打开数据库:" << m_db.lastError();
+        return;
+    }
+
+    createTables();
+}
+
+OfflineStorage::~OfflineStorage()
+{
+    if (m_db.isOpen()) {
+        m_db.close();
+    }
+}
+
+bool OfflineStorage::createTables()
+{
+    QSqlQuery query(m_db);
+
+    // JSON 表
+    if (!query.exec(R"(
+        CREATE TABLE IF NOT EXISTS json_messages (
+            id INTEGER PRIMARY KEY AUTOINCREMENT,
+            topic TEXT NOT NULL,
+            payload TEXT NOT NULL,
+            stamp INT
+        )
+    )")) {
+        qWarning() << "创建 json_messages 表失败:" << query.lastError();
+        return false;
+    }
+
+    // 图片路径表
+    if (!query.exec(R"(
+        CREATE TABLE IF NOT EXISTS image_paths (
+            id INTEGER PRIMARY KEY AUTOINCREMENT,
+            image_path TEXT NOT NULL,
+            stamp INT
+        )
+    )")) {
+        qWarning() << "创建 image_paths 表失败:" << query.lastError();
+        return false;
+    }
+
+    return true;
+}
+
+bool OfflineStorage::cacheJsonMessage(const QString &topic, const QByteArray &json)
+{
+    // 获取当前本地时间(基于系统时区)
+    QDateTime localNow = QDateTime::currentDateTime();
+    qint64 secTimestamp = localNow.toSecsSinceEpoch();
+    qDebug() << "本地秒级时间戳:" << secTimestamp;
+    if (!m_jsonCacheEnabled) {
+        qWarning() << "JSON缓存已禁用,拒绝缓存数据";
+        return false;
+    }
+    QSqlQuery query(m_db);
+    // ==================== 步骤1:解析原始 JSON ====================
+    QJsonParseError parseError;
+    QJsonDocument doc = QJsonDocument::fromJson(json, &parseError);
+    // 检查解析是否成功
+    if (parseError.error != QJsonParseError::NoError) {
+        ERROR("JSON 解析失败,错误信息:{}",parseError.errorString().toStdString());
+        return false;
+    }
+    // 🔴 先检查是否超限,是则删除最老一条
+    if (!enforceLimit("json_messages", m_maxJsonEntries)) {
+        qWarning() << "清理 json_messages 失败";
+        // 即使失败也尝试插入(避免阻塞)
+    }
+    // ==================== 步骤2:修改 cmd 键值 ====================
+    QJsonObject rootObj = doc.object();
+    // 查找 "cmd" 键并修改其值
+    if(rootObj.contains("cmd")){
+        rootObj["cmd"] = "data-history";
+    }else{
+        WARN("未匹配到cmd键值...");
+    }
+    // ==================== 步骤3:序列化为新 JSON 字符串 ====================
+    QJsonDocument modifiedDoc(rootObj);
+    QByteArray modifiedJson = modifiedDoc.toJson(QJsonDocument::Indented);  // 保留缩进格式
+    query.prepare("INSERT INTO json_messages (topic, payload,stamp) VALUES (?, ?, ?)");
+    query.addBindValue(topic);
+    query.addBindValue(modifiedJson);
+    query.addBindValue(secTimestamp);
+    return query.exec();
+}
+
+
+bool OfflineStorage::cacheImagePath(const QString &imagePath)
+{
+    // 获取当前本地时间(基于系统时区)
+    QDateTime localNow = QDateTime::currentDateTime();
+    qint64 secTimestamp = localNow.toSecsSinceEpoch();
+    qDebug() << "本地秒级时间戳:" << secTimestamp;
+    if (!m_imageCacheEnabled) {
+        qWarning() << "图片缓存已禁用,拒绝缓存路径";
+        return false;
+    }
+
+    QSqlQuery query(m_db);
+    // 🔴 先检查是否超限
+    if (!enforceLimit("image_paths", m_maxImageEntries)) {
+        qWarning() << "清理 image_paths 失败";
+    }
+    // 1. 检查原文件是否存在
+    QFileInfo originalFile(imagePath);
+    if (!originalFile.exists()) {
+        qWarning() << "原文件不存在:" << imagePath;
+        return false;
+    }
+    // 2. 检查是否为文件(非目录)
+    if (!originalFile.isFile()) {
+        qWarning() << "路径不是文件:" << imagePath;
+        return false;
+    }
+    // 3. 提取目录、文件名(含扩展名)和基名(不含扩展名)
+    QString dirPath = originalFile.absolutePath();       // 原目录(如 "/pic")
+    QString fileName = originalFile.fileName();          // 原文件名(如 "123123.jpg")
+    QString baseName = originalFile.baseName();          // 基名(如 "123123")
+    QString suffix = originalFile.suffix();              // 扩展名(如 "jpg")
+    // 4. 构造新文件名(添加 "history-" 前缀)
+    QString newFileName = QString("history-%1.%2").arg(baseName, suffix); // "history-123123.jpg"
+    // 5. 构造新文件完整路径
+    QString newPath = QDir(dirPath).filePath(newFileName); // 拼接目录和新文件名(自动处理斜杠)
+    // 6. 执行重命名(覆盖模式:若目标文件已存在,会直接覆盖)
+    // 注意:若需避免覆盖,可先检查 newPath 是否存在
+    if (QFile::exists(newPath)) {
+        qWarning() << "目标文件已存在,重命名失败:" << newPath;
+        return false;
+    }
+    // 执行重命名操作
+    if (!QFile::rename(imagePath, newPath)) {
+        qWarning() << "重命名失败!";
+        return false;
+    }
+    query.prepare("INSERT INTO image_paths (image_path,stamp) VALUES (?,?)");
+    query.addBindValue(newPath);
+    query.addBindValue(secTimestamp);
+    if(!query.exec()){
+        ERROR("插入失败:{}",query.lastError().text().toStdString());
+        return false;
+    }
+    return true;
+}
+
+
+//获取最新时间戳的JSON
+QList<QPair<int, QPair<QString, QByteArray>>>
+OfflineStorage::getPendingJsonMessages(int maxCount)
+{
+    QList<QPair<int, QPair<QString, QByteArray>>> list;
+    QSqlQuery query(m_db);
+    // 修改点 1:按时间戳降序排序(stamp DESC),取最新的 maxCount 条
+    query.prepare(R"(
+        SELECT id, topic, payload
+        FROM json_messages
+        ORDER BY stamp DESC  -- 按时间戳降序(最新的在前)
+        LIMIT ?  -- 限制返回数量
+    )");
+    query.addBindValue(maxCount);
+    if (query.exec()) {
+        while (query.next()) {
+            int id = query.value(0).toInt();
+            QString topic = query.value(1).toString();
+            QByteArray json = query.value(2).toByteArray();
+            list.append({id,{topic, json}});
+            // 注意:这里不立即标记 uploaded,等待上传成功后再标记
+        }
+    }
+    return list;
+}
+
+//获取最新时间戳的图片路径
+QList<QPair<int,QString>>
+OfflineStorage::getPendingImagePaths(int maxCount)
+{
+    LOG("getPendingImagePaths...");
+    QList<QPair<int,QString>> list;
+    QSqlQuery query(m_db);
+    // 修改点 1:按时间戳降序排序(stamp DESC),取最新的 maxCount 条
+    query.prepare(R"(
+        SELECT id,image_path
+        FROM image_paths
+        ORDER BY stamp DESC  -- 按时间戳降序(最新的在前)
+        LIMIT ?  -- 限制返回数量
+    )");
+    query.addBindValue(maxCount);
+    if (query.exec()) {
+        while (query.next()) {
+            int id = query.value(0).toInt();
+            QString path = query.value(1).toString();
+            list.append({id,path});
+        }
+    }
+    return list;
+}
+
+//删除指定ID的数据记录
+bool OfflineStorage::markJsonUploaded(int id)
+{
+    QSqlQuery query(m_db);
+    query.prepare("DELETE FROM json_messages WHERE id = ?");
+    query.addBindValue(id);
+    return query.exec();
+}
+//删除指定路径的数据记录
+bool OfflineStorage::markImageUploaded(const QString &imagePath)
+{
+    QSqlQuery query(m_db);
+    // 修改点 1:SQL 条件改为根据 image_path 匹配
+    query.prepare(R"(
+        DELETE FROM image_paths
+        WHERE image_path = ?  -- 匹配 image_path 字段
+    )");
+    // 修改点 2:绑定图片路径参数
+    query.addBindValue(imagePath);
+    // 执行删除操作
+    if (!query.exec()) {
+        qWarning() << "删除图片路径记录失败,SQL 错误:" << query.lastError().text();
+        qWarning() << "失败 SQL:" << query.lastQuery();  // 打印实际执行的 SQL(调试用)
+        return false;
+    } else {
+        qDebug() << "成功删除图片路径记录,路径:" << imagePath
+                 << ",受影响行数:" << query.numRowsAffected();
+        return true;
+    }
+}
+bool OfflineStorage::cleanupUploaded()
+{
+    QSqlQuery query(m_db);
+    bool success = true;
+    success &= query.exec("DELETE FROM json_messages WHERE uploaded = 1");
+    success &= query.exec("DELETE FROM image_paths WHERE uploaded = 1");
+    return success;
+}
+// offline_storage.cpp
+
+bool OfflineStorage::enforceLimit(const QString &table, int maxCount)
+{
+
+    int count = 0;
+    if(table=="json_messages"){
+        count= JsonEntries_saved();
+    }else if(table=="image_paths"){
+        count= ImageEntries_saved();
+    }
+
+    if (count < maxCount || count==0) {
+        return true; // 未超限,无需处理
+    }
+
+    QSqlQuery query(m_db);
+    // 超限了 → 删除最早的一条
+    query.prepare(QString(R"(
+        DELETE FROM %1
+        WHERE id = (
+            SELECT id FROM %1
+            ORDER BY stamp ASC LIMIT 1
+        )
+    )").arg(table));
+
+    if (!query.exec()) {
+        qWarning() << "删除最老记录失败:" << table << query.lastError();
+        return false;
+    }
+
+    qDebug() << "已删除最老记录 from" << table << ", 当前数量:" << count;
+    return true;
+}
+
+void OfflineStorage::setMaxJsonEntries(int max)
+{
+    if (m_maxJsonEntries != max) {
+        m_maxJsonEntries = max;
+        emit maxJsonEntriesChanged();
+        // 可选:立即清理,确保不超过新上限
+        enforceLimit("json_messages", m_maxJsonEntries);
+    }
+}
+
+
+void OfflineStorage::setJsonCacheEnabled(bool enabled)
+{
+    if (m_jsonCacheEnabled != enabled) {
+        m_jsonCacheEnabled = enabled;
+        emit jsonCacheEnabledChanged(enabled); // 发射信号通知状态变更
+    }
+}
+
+void OfflineStorage::setImageCacheEnabled(bool enabled)
+{
+    if (m_imageCacheEnabled != enabled) {
+        m_imageCacheEnabled = enabled;
+        emit imageCacheEnabledChanged(enabled); // 发射信号通知状态变更
+    }
+}
+
+void OfflineStorage::setMaxImageEntries(int max)
+{
+    if (m_maxImageEntries != max) {
+        m_maxImageEntries = max;
+        emit maxImageEntriesChanged();
+        enforceLimit("image_paths", m_maxImageEntries);
+    }
+}
+
+int OfflineStorage::JsonEntries_saved()
+{
+    QSqlQuery query(m_db);
+    query.prepare("SELECT COUNT(*) FROM json_messages");
+    if (!query.exec() || !query.next()) {
+        qWarning() << "查询JSON数量失败:" << query.lastError();
+        return 0;
+    }
+    m_JsonEntries_saved = query.value(0).toInt();
+    return m_JsonEntries_saved;
+}
+
+
+int OfflineStorage::ImageEntries_saved()
+{
+    QSqlQuery query(m_db);
+    query.prepare("SELECT COUNT(*) FROM image_paths");
+    if (!query.exec() || !query.next()) {
+        qWarning() << "查询图片数量失败:" << query.lastError();
+        return 0;
+    }
+    m_ImageEntries_saved = query.value(0).toInt();
+
+    return m_ImageEntries_saved;
+}

+ 44 - 10
q6_felgo_iot/src/cameramanager.cpp

@@ -339,7 +339,7 @@ Frames::setVideoSink( QVideoSink * newVideoSink )
 void
 Frames::setChange(bool stat_t)
 {
-    LOG("开始自动对焦,发送指令到控制板!");
+    LOG("开始自动对焦,发送指令到控制板,{}!",stat_t);
     if(stat_t){
         emit serial_data(m_json.Autofocus());
     }
@@ -362,8 +362,6 @@ Frames::processUvchandle(const QString &qst){
 void
 Frames::setCameraSw(bool stat_cam)
 {
-    MAX_STEP = 30;
-    max_image_qulity = 0.0;
     z_step = 0;
     x_step = 0;
     auto qtContext = QJniObject(QNativeInterface::QAndroidApplication::context());
@@ -396,6 +394,7 @@ Frames::setCameraSw(bool stat_cam)
                  nRet = MV_CC_EnumDevices(MV_GIGE_DEVICE | MV_USB_DEVICE, &stDeviceList);
                  if (MV_OK != nRet)
                  {
+                     emit cameraOpenFailed("MV_CC_EnumDevices fail!");
                      unsigned int unsignedValue = static_cast<unsigned int>(nRet);
                      qDebug() << "MV_CC_EnumDevices fail! nRet" << QString::number(unsignedValue, 16).toUpper();
                      return ;
@@ -412,12 +411,14 @@ Frames::setCameraSw(bool stat_cam)
                          MV_CC_DEVICE_INFO *pDeviceInfo = stDeviceList.pDeviceInfo[i];
                          if (NULL == pDeviceInfo)
                          {
+                             emit cameraOpenFailed("pDeviceInfo is NULL!");
                              qDebug() << "pDeviceInfo is NULL!";
                              return;
                          }
                          //PrintDeviceInfo(pDeviceInfo);
                      }
                  }else{
+                     emit cameraOpenFailed("Find No Devices!");
                      qDebug() << "Find No Devices!";
                      // break;
                      return;
@@ -427,6 +428,7 @@ Frames::setCameraSw(bool stat_cam)
                  nRet = MV_CC_CreateHandle(&handle, stDeviceList.pDeviceInfo[nIndex]);
                  if (MV_OK != nRet)
                  {
+                     emit cameraOpenFailed("MV_CC_CreateHandle fail!");
                      unsigned int unsignedValue = static_cast<unsigned int>(nRet);
                      qDebug() << "MV_CC_CreateHandle fail! nRet" << QString::number(unsignedValue, 16).toUpper();
                      // break;
@@ -438,6 +440,7 @@ Frames::setCameraSw(bool stat_cam)
                  nRet = MV_CC_OpenDevice(handle);
                  if (MV_OK != nRet)
                  {
+                    emit cameraOpenFailed("MV_CC_OpenDevice fail!");
                     MV_CC_DestroyHandle(handle);
                     handle = NULL;
                     unsigned int unsignedValue = static_cast<unsigned int>(nRet);
@@ -505,6 +508,7 @@ Frames::setCameraSw(bool stat_cam)
                  nRet = MV_CC_StartGrabbing(handle);
                  if (MV_OK != nRet)
                  {
+                     emit cameraOpenFailed("MV_CC_StartGrabbing fail!");
                      camera_sta = false;
                      unsigned int unsignedValue = static_cast<unsigned int>(nRet);
                      qDebug() << "MV_CC_StartGrabbing fail! nRet [{}]" << QString::number(unsignedValue, 16).toUpper();
@@ -514,10 +518,24 @@ Frames::setCameraSw(bool stat_cam)
                      //创建归档路径
                      QDateTime currentDateTime = QDateTime::currentDateTime();
                      QString currentDateTimeString = currentDateTime.toString("yyyyMMddhhmmss");
-                     picture_path_floader = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
-                     picture_path_floader = picture_path_floader + "/" + currentDateTimeString;
+                     QString standPath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
+
+                     //创建年目录
+                     QString YeayPath = standPath + "/" + currentDateTime.toString("yyyy");
+                     //createFolder(YeayPath);
+                     //创建月目录
+                     QString MonthPath = standPath + "/" + currentDateTime.toString("MM");
+                     //createFolder(YeayPath);
+                     //创建日目录
+                     QString DayPath = standPath + "/" + currentDateTime.toString("dd");
+                     //createFolder(DayPath);
+                     //创建图片归档目录
+                     picture_path_floader = standPath + "/" +
+                                                    currentDateTime.toString("yyyy") + "/" +
+                                                    currentDateTime.toString("MM") + "/" +
+                                                    currentDateTime.toString("dd") + "/" +
+                                                    currentDateTimeString;
                      createFolder(picture_path_floader);
-
                      m_fps_timer->setRunning(true);
                      m_1s->start();
                      emit startGrabbing(true);
@@ -633,7 +651,15 @@ Frames::upload_handle()
 void
 Frames::handle_reult_upload(bool success, const QString &error)
 {
-    LOG("上传结果:{}  - {}",success,error.toStdString());
+    if(success)
+    {
+        LOG("上传成功:{}",error.toStdString());
+        //匹配数据库进行删除
+
+    }else
+    {
+        WARN("上传失败:{}",error.toStdString());
+    }
     upload_handle();
 }
 void
@@ -714,11 +740,19 @@ Frames::handleGrab(bool sta_cam){
                                 QDateTime currentDateTime = QDateTime::currentDateTime();
                                 QString currentDateTimeString = currentDateTime.toString("yyyyMMddhhmmss");                                
                                 if(f.isValid()) m_image = f.toImage().convertToFormat(QImage::Format_RGB32);
-                                param::camera_tc = 0;
                                 QString pic_name = picture_path_floader + "/" + currentDateTimeString + "z" + QString::number(z_step) + "x" + QString::number(x_step) +".jpg";
-                                LOG("图片名称:{}",pic_name.toStdString());
+                                if(param::camera_tc==100){
+                                    m_image.save(pic_name,"jpg",80);
+                                    LOG("立即拍照图片已保存:{}",pic_name.toStdString());
+                                    param::ptlist.append(pic_name);
+                                    param::camera_tc = 0;
+                                    emit stopGrabbing(false);
+                                    return;
+                                }
+                                param::camera_tc = 0;
                                 if(m_image.save(pic_name,"jpg",80))
                                 {
+                                    LOG("图片已保存:{}",pic_name.toStdString());
                                     //图片锐化
                                     //m_opencvfunc.CustomSharpening(pic_name);
                                     param::ptlist.append(pic_name);
@@ -1126,7 +1160,7 @@ Frames::captureImage(){
         }
     }else if(param::camera_type.contains("uvc")||param::camera_type.contains("hikrobot")){
         setCameraSw(true);
-        // 延时一段时间后触发拍照
+        // 延时10S后触发拍照
         QTimer::singleShot(10000, [](){
             LOG("立即拍照!");
             param::camera_tc = 100;

+ 94 - 94
q6_felgo_iot/src/main.cpp

@@ -22,7 +22,7 @@ QString param::table_ftp = "ftp";               //FTP配置表
 QString param::table_ftp_other = "ftp_other";   //FTP对接配置表
 QString param::table_camera = "camera";         //相机参数配置表
 QString param::table_location = "location";     //定位信息参数配置表
-QString param::table_mqtt_historydata = "data"; //mqtt历史数据表
+QString param::table_config = "config";         //参数配置表
 
 
 
@@ -48,7 +48,7 @@ public:
 
 public slots:
     void qmlSlot() {
-        qDebug() << "Received from QML:";
+        LOG("Received from QML");
         emit recvqmlslot();
     }
     void systemPage(){
@@ -117,20 +117,9 @@ public:
                     this, SLOT(positionUpdated(QGeoPositionInfo)));
             positionSource->setUpdateInterval(1000);//设置刷新时间 单位毫秒
             positionSource->startUpdates();//启动设备
-
-//            connect(this,&GPSInfo::position_success,[&](){
-//                gpsConfig->OpenDb();
-//                if(gpsConfig->isTableExist(param::table_location)){
-//                    gpsConfig->UpdateData(param::table_location,"gps_lat",param::gps_lat);
-//                    gpsConfig->UpdateData(param::table_location,"gps_lng",param::gps_lng);
-//                    gpsConfig->CloseDb();
-//                }
-                //positionSource->stopUpdates();
-//                disconnect(positionSource, SIGNAL(positionUpdated(QGeoPositionInfo)),
-//                           this, SLOT(positionUpdated(QGeoPositionInfo)));
-//            });
         }
     }
+
 signals:
     void position_success();
 private:
@@ -193,7 +182,7 @@ void sendBroadcastFromQt(QString btn_type) {
             QJniObject java_imei= jClass.callObjectMethod("getAndroidIMEI","(Landroid/content/Context;)Ljava/lang/String;",qtContext.object());
             if(java_imei.isValid()){
                 QString imei = java_imei.toString();
-                if(!imei.isEmpty()){
+                if(!imei.isEmpty()&&param::imei.isEmpty()){
                     param::imei = imei;
                 }
                 LOG("IMEI:{}",param::imei.toStdString());
@@ -228,6 +217,33 @@ void sendBroadcastFromQt(QString btn_type) {
     }
 }
 
+// 定义函数:设置每日8:00重启的定时器
+auto setDailyRebootTimer = []() {
+    // 获取当前时间(本地时间)
+    QDateTime currentTime = QDateTime::currentDateTime();
+
+    // 构造当天8:00的目标时间(基于本地时间的0点+8小时)
+    QDateTime targetTime = currentTime.date().startOfDay().addSecs(8 * 3600); // 8:00 = 8 * 3600秒
+
+    // 如果当前时间已过今日8:00,目标时间调整为次日8:00
+    if (currentTime >= targetTime) {
+        targetTime = targetTime.addDays(1); // 加1天
+    }
+
+    // 计算当前时间到目标时间的毫秒间隔
+    qint64 intervalMs = currentTime.msecsTo(targetTime);
+
+    // 设置单次定时器,触发后执行重启逻辑,并重新设置下一日的定时器
+    QTimer::singleShot(intervalMs, []() {
+        LOG("触发每日8:00重启");
+        sendBroadcastFromQt("rebootSystem"); // 发送重启广播
+
+        // 注意:若需要严格每日执行,建议在重启前重新设置定时器(根据实际需求)
+        // 若系统重启后会自动启动本程序,可省略此处(程序重启后会重新设置定时器)
+        // setDailyRebootTimer();
+    });
+};
+
 
 //adb shell input keyevent 26 // 224 关
 
@@ -276,16 +292,10 @@ int main(int argc, char *argv[])
     LOG("appPicPath:{}",appPicPath.toStdString());
 #endif
 
-    sendBroadcastFromQt("imei");
     sendBroadcastFromQt("iccid");
     sendBroadcastFromQt("csq");
 
 
-    CurlFtpUploader uploader_ftp; // 成员变量
-    QString remotepath ="/photo_hard/" + param::imei;
-    uploader_ftp.setFtpParams("bzy_user", "YFkj@6O2O", "8.136.98.49", 21, remotepath);
-
-
     // // 连接信号
     // QObject::connect(&uploader_ftp, &CurlFtpUploader::progressChanged,
     //                  [](double percent) {
@@ -311,6 +321,9 @@ int main(int argc, char *argv[])
         sqlConfig->QueryAllData(param::table_mqtt);
     }else{
         sqlConfig->QueryAllData(param::table_mqtt);
+        if(param::imei.isEmpty()){
+            sendBroadcastFromQt("imei");
+        }
     }
     if(!sqlConfig->isTableExist(param::table_mqtt_other))
     {
@@ -353,12 +366,22 @@ int main(int argc, char *argv[])
     //相机图像参数
     if(!sqlConfig->isTableExist(param::table_camera)){
         sqlConfig->CreateTable(param::table_camera);
-        config_class.camera_db = {"uvc","static",2,1000,1000,"0"};
+        config_class.camera_db = {"hikrobot","static",2,1000,1000,"0","f80","b80","f80","b80"};
         sqlConfig->InsertData(config_class,param::table_camera);
         sqlConfig->QueryAllData(param::table_camera);
     }else{
         sqlConfig->QueryAllData(param::table_camera);
     }
+    //配置
+    if(!sqlConfig->isTableExist(param::table_config)){
+        sqlConfig->CreateTable(param::table_config);
+        config_class.config_db = {1,1,1000,500,0,0};
+        sqlConfig->InsertData(config_class,param::table_config);
+        sqlConfig->QueryAllData(param::table_config);
+    }else{
+        sqlConfig->QueryAllData(param::table_config);
+    }
+
     //sqlConfig->CloseDb();
     //InsertJson_mqtt();
 
@@ -371,11 +394,14 @@ int main(int argc, char *argv[])
 
     LOG("信息(Info)");
 
+    TreeModel model;
     engine.setOfflineStoragePath(appDataPath);  //设置数据库存储路径
     engine.rootContext()->setContextProperty("appdir", qApp->applicationDirPath()); //使用QApplication::applicationDirPath()获取,并注册到qml中
+    engine.rootContext()->setContextProperty("treeModel",&model);
     qmlRegisterType<EasyTableModel>("EasyModel",1,0,"EasyTableModel");  //注册C++模块到QML中
     qmlRegisterType<DatabaseInterface>("com.example.database", 1, 0, "DatabaseInterface");
     qmlRegisterType<CustomItem>("ExampleCustomMaterial",1,0,"CustomItem");
+
     // Set an optional license key from project file
     // This does not work if using Felgo Live, only for Felgo Cloud Builds and local builds
     //felgo.setLicenseKey(PRODUCT_LICENSE_KEY);
@@ -393,44 +419,6 @@ int main(int argc, char *argv[])
     //felgo.setMainQmlFileName(QStringLiteral("qrc:/qml/Main.qml"));
     const QUrl url(felgo.mainQmlFileName());
 
-    // 注册到QML
-    ImageStitcher imagestitcher;
-    //qmlRegisterType<ImageStitcher>("com.opencv.stitch", 1, 0, "ImageStitcher");
-    engine.rootContext()->setContextProperty("stitcher", &imagestitcher);
-    QObject::connect(&imagestitcher,&ImageStitcher::change_stitch_photonum,[&](int val){
-        //将param::stitchphoto保存
-        param::stitch_photonum = val;
-        sqlConfig->OpenDb();
-        if(sqlConfig->isTableExist(param::table_camera)){
-            sqlConfig->UpdateData(param::table_camera,"stitch_photonum",QString::number(param::stitch_photonum));
-        }
-        sqlConfig->CloseDb();
-        LOG("保存拼接数量:{}",param::stitch_photonum);
-    });
-
-    QObject::connect(&imagestitcher,&ImageStitcher::stitchFailed,[&](){
-        //将param::stitchphoto保存
-        param::stitch_mode = "done";
-        sqlConfig->OpenDb();
-        if(sqlConfig->isTableExist(param::table_camera)){
-            sqlConfig->UpdateData(param::table_camera,"mode",param::stitch_mode);
-        }
-        sqlConfig->CloseDb();
-    });
-
-    QObject::connect(&imagestitcher,&ImageStitcher::stitchSuccess,[&](){
-        //将param::stitchphoto保存
-        param::stitch_mode = "done";
-        sqlConfig->OpenDb();
-        if(sqlConfig->isTableExist(param::table_camera)){
-            sqlConfig->UpdateData(param::table_camera,"mode",param::stitch_mode);
-        }
-        sqlConfig->CloseDb();
-    });
-
-
-    qmlRegisterType<TreeModel>("PhotoViewer", 1, 0, "TreeModel");
-
     Qt6QCamera::Frames::registerQmlType();    
 
     SerialThread serialThread;
@@ -439,6 +427,10 @@ int main(int argc, char *argv[])
     engine.rootContext()->setContextProperty("serial", &serialThread);
 
 
+    CurlFtpUploader uploader_ftp; // 成员变量
+    QString remotepath ="/photo_hard/" + param::imei;
+    uploader_ftp.setFtpParams("bzy_user", "YFkj@6O2O", "8.136.98.49", 21, remotepath);
+
     YMODEM m_ymodem(&serialThread);
     #if 1   //厦门四信
 
@@ -450,14 +442,21 @@ int main(int argc, char *argv[])
                                            QSerialPort::NoParity, QSerialPort::OneStop,
                                            QSerialPort::NoFlowControl);
     #endif
+
+
     MqttHandler mqttHandler;
+    mqttHandler.storage()->setJsonCacheEnabled(param::jsonCacheEnable);
+    mqttHandler.storage()->setImageCacheEnabled(param::imageCacheEnable);
+    mqttHandler.storage()->setMaxJsonEntries(param::maxJsonEntries);
+    mqttHandler.storage()->setMaxImageEntries(param::maxImageEntries);
     CurlHandler curlHandler("ftp://8.136.98.49/_UPDATE_FILE/Android/BZYV2/app.apk",appDataPath+"/app.apk");    //app升级
 
+    NetworkInfoHelper networkMonitor;
     engine.rootContext()->setContextProperty("mqtt", &mqttHandler);
     engine.rootContext()->setContextProperty("curl", &curlHandler);
     engine.rootContext()->setContextProperty("ymodem",&m_ymodem);
     engine.rootContext()->setContextProperty("curl_picture",&uploader_ftp);
-
+    engine.rootContext()->setContextProperty("networkMonitor", &networkMonitor);
     serialThread.start();
 
     QObject::connect(&serialThread,&SerialThread::dataUpload,&mqttHandler,&MqttHandler::publish_m);     //串口到MQTT
@@ -465,6 +464,21 @@ int main(int argc, char *argv[])
     QObject::connect(&serialThread,&SerialThread::updatestart,&m_ymodem,&YMODEM::start_ymodem);         //串口到Ymodem
     QObject::connect(&m_ymodem,&YMODEM::modem_result,&serialThread,&SerialThread::getmodemresult);      //Ymodem到串口
 
+    QObject::connect(&networkMonitor,&NetworkInfoHelper::reachabilityChanged,[&](QNetworkInformation::Reachability newReachability){
+        if(newReachability==QNetworkInformation::Reachability::Online){
+            WARN("网络连接!");
+            param::net_alive = 1;
+        }else{
+            param::net_alive = 0;
+            WARN("网络断开!");
+            mqttHandler.disconnectFromBroker();
+        }
+    });
+    QObject::connect(&uploader_ftp, &CurlFtpUploader::finished,
+                     &mqttHandler,&MqttHandler::storage_Picture);
+    QObject::connect(&mqttHandler, &MqttHandler::signal_reupload_image,
+                     &uploader_ftp,&CurlFtpUploader::uploadFileAsync);
+
     QObject::connect(&mqttHandler,&MqttHandler::updateStm32,[&](){
         curlHandler.seturl("ftp://8.136.98.49/_UPDATE_FILE/A7/STM32/Application_BZYV2.rbl");
         curlHandler.setfilepath(appDataPath+"/rtthread.rbl");
@@ -498,7 +512,14 @@ int main(int argc, char *argv[])
         sqlConfig->CloseDb();
 
     });
-
+    QObject::connect(&mqttHandler,&MqttHandler::signal_imei_change,[&](QString NEW_IMEI){
+        sqlConfig->OpenDb();
+        if(sqlConfig->isTableExist(param::table_mqtt)){
+            qDebug() << "UpdateData imei !!!!!";
+            sqlConfig->UpdateData(param::table_mqtt,"imei",NEW_IMEI);
+        }
+        sqlConfig->CloseDb();
+    });
     QObject::connect(&curlHandler,&CurlHandler::downloadFinished,[&](bool result,QString mtype){
         LOG("downloadFinished:{}-{}",result,mtype.toStdString());
         if(result&&mtype.contains("App")){
@@ -537,15 +558,6 @@ int main(int argc, char *argv[])
                 if(autoFocus_Page){
                     QMetaObject::invokeMethod(autoFocus_Page, "autotake",Q_ARG(QVariant,stat));
                     //将param::stitchphoto保存
-                    if(stat){
-                        param::stitch_mode = "start";
-                        sqlConfig->OpenDb();
-                        if(sqlConfig->isTableExist(param::table_camera)){
-                            sqlConfig->UpdateData(param::table_camera,"mode",param::stitch_mode);
-                        }
-                        sqlConfig->CloseDb();
-                    }
-
                 }
              }
         });      //mqtt到QML,控制qml跳转到自动对焦界面,开始对焦拍照
@@ -602,36 +614,31 @@ int main(int argc, char *argv[])
         // 获取根 QML 对象
         QObject *autofocus_item = rootItem->findChild<QObject*>("autofocus_Item");
         if(autofocus_item){
-            bool isConnect_frame = false;
+            bool isConnect_frame = true;
             //const QMetaObject *metaObj = autofocus_item->metaObject();
-            qDebug() << "autofocus_item is !!!!!";
+            LOG("Found autofocus_item!");
             QObject::connect(autofocus_item, SIGNAL(selected()),&myCppClass,SLOT(qmlSlot()));
             QObject::connect(&myCppClass, &MyCppClass::recvqmlslot,[&](){
+                LOG("connect myCppClass");
                 Qt6QCamera::Frames *m_frames = qobject_cast<Qt6QCamera::Frames*>(rootItem->findChild<QObject*>("Frames"));
-                if(m_frames&&!isConnect_frame){
-                    qDebug() << "m_frames is !!!!!";
+                if(!m_frames) {ERROR("m_frames is null!!!");}
+                if(m_frames&&isConnect_frame){
+                    LOG("m_frames connected!");
                     //engine.addImageProvider("ucamera",m_frames->getImageProvider());
                     QObject::connect(m_frames,&Qt6QCamera::Frames::serial_data,&serialThread,&SerialThread::sendData);      //Frame到串口
                     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(m_frames,&Qt6QCamera::Frames::dataUpload,&mqttHandler,&MqttHandler::publish_m);     //frames到MQTT
-                    QObject::connect(m_frames,&Qt6QCamera::Frames::signal_photoerr,[&](){
-                        param::stitch_mode = "done";
-                        sqlConfig->OpenDb();
-                        if(sqlConfig->isTableExist(param::table_camera)){
-                            sqlConfig->UpdateData(param::table_camera,"mode",param::stitch_mode);
-                        }
-                        sqlConfig->CloseDb();
-                    });
                     // 修改信号槽连接方式
                     QObject::connect(m_frames, &Qt6QCamera::Frames::signal_wait_upload,
                                      &uploader_ftp, &CurlFtpUploader::uploadFileAsync);
                     QObject::connect(&uploader_ftp, &CurlFtpUploader::finished,
                                      m_frames,&Qt6QCamera::Frames::handle_reult_upload);
-                    isConnect_frame = true;
+
+                    isConnect_frame = false;
                 }else{
-                    qDebug() << "m_frames no !!!!!";
+                    ERROR("m_frames no !!!!!");
                 }
             });
 
@@ -651,6 +658,7 @@ int main(int argc, char *argv[])
 
     GPSInfo *gps_start = new GPSInfo;
     QObject::connect(gps_start,&GPSInfo::position_success,[&](){
+        emit serialThread.gpsSuccess();
         sqlConfig->OpenDb();
         if(sqlConfig->isTableExist(param::table_location)){
             sqlConfig->UpdateData(param::table_location,"gps_lat",param::gps_lat);
@@ -660,15 +668,7 @@ int main(int argc, char *argv[])
         gps_start->positionSource->stopUpdates();
         gps_start->deleteLater();
     });
-
-    // 每过24小时重启系统
-    QTimer::singleShot(1000*60*60*24, [](){
-        LOG("重启");
-        sendBroadcastFromQt("rebootSystem");
-    });
     
-
     return app.exec();
 }
-
 #include "main.moc"

+ 206 - 28
q6_felgo_iot/src/mqtthandler.cpp

@@ -2,24 +2,62 @@
 #include <QDebug>
 
 class param;
-//QString param::imei;
-//QString param::mqtt_main_ip;
-//int param::mqtt_main_port;
-//int param::mqtt_main_keepalive;
-//int param::mqtt_main_qos;
-//QString param::mqtt_main_clientid;
-//QString param::mqtt_main_uid;
-//QString param::mqtt_main_pwd;
 
-//QString param::mqtt_main_sub;
-//QString param::mqtt_main_pub;
-//QString param::mqtt_main_offline;
 
+NetworkInfoHelper::NetworkInfoHelper(QObject *parent) : QObject(parent) {
+    // 加载 Android 默认后端(自动适配系统网络服务)
+    if (!QNetworkInformation::loadDefaultBackend()) {
+        qWarning() << "Failed to load default network backend!";
+        return;
+    }
+
+    m_networkInfo = QNetworkInformation::instance();
+    if (!m_networkInfo) {
+        qWarning() << "Failed to get QNetworkInformation instance!";
+        return;
+    }
+    m_initialReachability = m_networkInfo->reachability();
+    m_initialTransportMedium = m_networkInfo->transportMedium();
+    m_initialIsBehindCaptivePortal = m_networkInfo->isBehindCaptivePortal();
+    m_initialIsMetered = m_networkInfo->isMetered();
+    // 连接信号到槽
+    connect(m_networkInfo, &QNetworkInformation::reachabilityChanged,
+            this, &NetworkInfoHelper::reachabilityChanged);
+    connect(m_networkInfo, &QNetworkInformation::transportMediumChanged,
+            this, &NetworkInfoHelper::transportMediumChanged);
+    connect(m_networkInfo, &QNetworkInformation::isBehindCaptivePortalChanged,
+            this, &NetworkInfoHelper::isBehindCaptivePortalChanged);
+    connect(m_networkInfo, &QNetworkInformation::isMeteredChanged,
+            this, &NetworkInfoHelper::isMeteredChanged);
+
+    //延迟等待QML界面加载完成
+    QTimer::singleShot(10000, [this](){
+        emit reachabilityChanged(m_initialReachability);
+        emit transportMediumChanged(m_initialTransportMedium);
+        emit isBehindCaptivePortalChanged(m_initialIsBehindCaptivePortal);
+        emit isMeteredChanged(m_initialIsMetered);
+    });
+}
 
+QNetworkInformation::Reachability NetworkInfoHelper::reachability() const {
+    return m_networkInfo ? m_networkInfo->reachability() : QNetworkInformation::Reachability::Unknown;
+}
+
+QNetworkInformation::TransportMedium NetworkInfoHelper::transportMedium() const {
+    return m_networkInfo ? m_networkInfo->transportMedium() : QNetworkInformation::TransportMedium::Unknown;
+}
+
+
+bool NetworkInfoHelper::isBehindCaptivePortal() const {
+    return m_networkInfo ? m_networkInfo->isBehindCaptivePortal() : false;
+}
 
+bool NetworkInfoHelper::isMetered() const {
+    return m_networkInfo ? m_networkInfo->isMetered() : false;
+}
 
 MqttHandler::MqttHandler(QObject *parent)
-//    : QObject(parent)//, m_thread(nullptr)
+    : m_storage(new OfflineStorage(this))//, m_thread(nullptr)
 {
     mediaPlayer = new QMediaPlayer;
     maudioOutput = new QAudioOutput;
@@ -32,11 +70,27 @@ MqttHandler::MqttHandler(QObject *parent)
 //    if(serial_4g.serialOpen("ttyUSB2",115200)){
 //        serial_4g.sendData("AT+ICCID\r\n");
 //    }
-
+    image_reupload = new QTimer(this);
+    image_reupload->setInterval(1000*60);
     connectToBroker();
     connect(this, &MqttHandler::mediaplay, this,&MqttHandler::playSound);
     connect(this,&MqttHandler::appInstall,this,&MqttHandler::install_app);
-
+    connect(image_reupload,&QTimer::timeout,this,[=](){
+        LOG("图片重传:{}!",m_client->state());
+        if(param::ptlist.size()==0&&m_storage->ImageEntries_saved()>0){
+            auto pendingImage = m_storage->getPendingImagePaths(1);
+            if(pendingImage.isEmpty()){ERROR("无数据!");}
+            for (const auto &item : pendingImage) {
+                int dbId = item.first;           // 数据库 id
+                QString path_image = item.second;
+                LOG("触发重传,图片缓存路径:{}",path_image.toStdString());
+                //发射信号开始上传
+                emit signal_reupload_image(path_image);
+            }
+        }else{
+            WARN("无缓存图片!");
+        }
+    });
     //connect(this, &MqttHandler::disconnected, &mqtt_json,&JsonFunc::setmqttState_d);
     start();
 }
@@ -94,6 +148,7 @@ void
 MqttHandler::disconnectFromBroker()
 {
     m_client->disconnectFromHost();
+    image_reupload->stop();
 }
 
 void
@@ -101,19 +156,30 @@ MqttHandler::publish_m(const QByteArray &message)
 {
     int res = -1;
     QMqttTopicName m_topic(param::mqtt_main_pub+param::imei);
-    res = m_client->publish(m_topic, message,0,false);
-    qDebug() << "topic:"<< m_topic << "res:" << res;
-    qDebug() << "mqtt_publish:"<< message;
-    qDebug() << "mqtt_state:"<< m_client->state();
-    if(res==0)
-        emit mediaplay();
-//    if (speech.state() == QTextToSpeech::Ready) {
-//        QString text = "数据上传中";
-//        speech.say(text);
-//        qDebug() << "Text to speech conversion initiated!";
-//    } else {
-//        qDebug() << "Text to speech not available on this device.";
-//    }
+    if(m_client->state() == QMqttClient::Connected)
+    {
+        auto msgId = m_client->publish(m_topic, message,0,false);
+        if(msgId==0){
+            LOG("publish_m:{}",message.constData());
+            if(m_storage->JsonEntries_saved()>0){
+                LOG("上传离线数据!");
+                startReupload();
+            }
+
+        }else{
+            m_storage->cacheJsonMessage(m_topic.name(),message);
+            WARN("发布失败,缓存:",message.constData());
+        }
+
+    }else{
+        if(message.contains("warn")){
+            WARN("预警消息,不缓存!");
+        }else{
+            m_storage->cacheJsonMessage(m_topic.name(),message);
+            qInfo() << "MQTT 未连接,缓存 JSON:" << m_topic;
+        }
+
+    }
 
 }
 
@@ -139,6 +205,7 @@ void
 MqttHandler::onConnected()
 {
     if(m_client->state()==QMqttClient::Connected){
+        image_reupload->start();
         emit connected();
         LOG("mqtt连接成功!");
         param::net_alive = true;
@@ -230,7 +297,21 @@ MqttHandler::onMessageReceived(const QByteArray &message, const QMqttTopicName &
                     }
 
                 }
-             }else if(value_cmd=="paramconf"
+             }else if(value_cmd=="setimei"){
+                 if(extValue.isObject()){
+                     QJsonObject extObj = extValue.toObject();
+                     QJsonValue imei_value = extObj["imei"];
+                     if(!imei_value.isNull()&&imei_value.isString()){
+                        QString value_imei = imei_value.toString();
+                         param::imei = value_imei;
+                        emit signal_imei_change(value_imei);
+                        QByteArray imei_change_warn =
+                            mqtt_json.MakeJsonWarn("更改IMEI:"+ value_imei,"原IMEI:" + param::imei);
+                        publish_m(imei_change_warn);
+                     }
+                 }
+             }
+             else if(value_cmd=="paramconf"
                       ||value_cmd=="read"
                       ||value_cmd=="ledon"
                       ||value_cmd=="ledoff"
@@ -241,6 +322,61 @@ MqttHandler::onMessageReceived(const QByteArray &message, const QMqttTopicName &
                       ||value_cmd=="slide"
                       ||value_cmd=="sensor"){
                 emit dataReceived(m_client_dataBuf);
+             }else if(value_cmd=="cache_read")  //{"cmd":"cache_read","ext":{"type": "data"}} photo
+             {
+                 if(extValue.isObject()){
+                     QJsonObject extObj = extValue.toObject();
+                     QJsonValue qValue_type = extObj["type"];
+                     if(!qValue_type.isNull()){
+                         QString value_type = qValue_type.toString();
+                         if(value_type=="data"){
+                             int cahce_data = m_storage->JsonEntries_saved();
+                             int cahce_data_max =  m_storage->maxJsonEntries();
+                             int enable_data = m_storage->jsonCacheEnabled();
+                             QByteArray cache_json_warn =
+                                 mqtt_json.MakeJsonWarn("缓存json数量:" + QString::number(cahce_data) + "["+ QString::number(enable_data) +"]","最大缓存数量:" + QString::number(cahce_data_max));
+                             publish_m(cache_json_warn);
+                         }else if(value_type=="photo"){
+                             int cache_image = m_storage->ImageEntries_saved();
+                             int cache_image_max =  m_storage->maxImageEntries();
+                             int enable_image = m_storage->imageCacheEnabled();
+                             QByteArray cache_image_warn =
+                                 mqtt_json.MakeJsonWarn("缓存图片数量:" + QString::number(cache_image) + "["+ QString::number(enable_image) +"]","最大缓存数量:" + QString::number(cache_image_max));
+                             publish_m(cache_image_warn);
+                         }
+                     }
+                 }
+             }else if(value_cmd=="cache_enable")   //{"cmd":"cache_enable","ext":{"type": "data","enable":0}}
+             {
+                 if(extValue.isObject()){
+                     QJsonObject extObj = extValue.toObject();
+                     QJsonValue qValue_type = extObj["type"];
+                     QJsonValue enable = extObj["enable"];
+                     if(!qValue_type.isNull()&&!enable.isNull()){
+                         QString value_type = qValue_type.toString();
+                         int enable_ws = enable.toInt();
+                         if(value_type=="data"){
+                             m_storage->setJsonCacheEnabled(enable_ws);
+                             int cahce_data = m_storage->JsonEntries_saved();
+                             int cahce_data_max =  m_storage->maxJsonEntries();
+                             int enable_data = m_storage->jsonCacheEnabled();
+                             QByteArray cache_json_warn =
+                                 mqtt_json.MakeJsonWarn("缓存json数量:" + QString::number(cahce_data) + "["+ QString::number(enable_data) +"]","最大缓存数量:" + QString::number(cahce_data_max));
+                             publish_m(cache_json_warn);
+                         }else if(value_type=="photo"){
+                             m_storage->setImageCacheEnabled(enable_ws);
+                             int cache_image = m_storage->ImageEntries_saved();
+                             int cache_image_max =  m_storage->maxImageEntries();
+                             int enable_image = m_storage->imageCacheEnabled();
+                             QByteArray cache_image_warn =
+                                 mqtt_json.MakeJsonWarn("缓存图片数量:" + QString::number(cache_image) + "["+ QString::number(enable_image) +"]","最大缓存数量:" + QString::number(cache_image_max));
+                             publish_m(cache_image_warn);
+                         }
+                     }
+                 }
+             }else if(value_cmd=="cache_restore")   //{"cmd":"cache_restore","ext":{"type": "data","num":10}}
+             {
+
              }
         }
     }
@@ -280,3 +416,45 @@ void MqttHandler::install_app(){
     });
 }
 
+void MqttHandler::startReupload()
+{
+    // 上传 JSON
+    auto pendingJson = m_storage->getPendingJsonMessages(m_uploadBatchSize);
+    for (const auto &item : pendingJson) {
+        int dbId = item.first;           // 数据库 id
+        QString topic = item.second.first;
+        QByteArray json = item.second.second;
+        quint16  msgId = m_client->publish(topic, json);
+        if (msgId == 0) {
+            qDebug() << "JSON 消息上传成功,删除数据库记录 id:" << dbId;
+            m_storage->markJsonUploaded(dbId); // ✅ 真正删除/标记
+            // // 注册回调:上传成功后删除数据库记录
+            // m_pendingAcks[msgId] = [this, dbId](bool success) {
+            //     if (success) {
+
+            //     }
+            // };
+        }
+    }
+}
+
+//保存上传失败的图片,并进行重命名处理
+void MqttHandler::storage_Picture(bool success,const QString &path)
+{
+    if(success){
+        m_storage->markImageUploaded(path);
+    }else{
+        if(!path.contains("history")){
+            m_storage->cacheImagePath(path);
+            // QTimer::singleShot(5000, [&](){
+            //     m_storage->cacheImagePath(path);
+            // });
+        }else{
+            WARN("图片已入库...");
+        }
+    }
+
+}
+
+
+

+ 7 - 8
q6_felgo_iot/src/mserial.cpp

@@ -146,7 +146,12 @@ SerialThread::SerialThread(QObject *parent)
     //QTimer *m_5s = new QTimer();
     connect( &m_dat_f, &QTimer::timeout,this,[=]() {
         data_upload = true;
+        m_dat_f.setInterval(1000*60*param::dat_f_main);
         readBoardData();
+        if(connect_board>10){
+            QByteArray upload_timeout = m_json.MakeJsonWarn("读取主板数据","超时");
+            emit dataUpload(upload_timeout);
+        }
     });
 
     connect(timeout_mov,&QTimer::timeout,this,[=](){
@@ -220,6 +225,7 @@ void SerialThread::run()
                             qDebug() << "接收到:" << jsonData;
                             processJsonData(jsonData);
                             dataBuf.remove(0, jsonStartIndex);
+                            connect_board = 0;
                         } else {
                             qDebug() << "JSON 解析错误:" << jsonData;
                             if(dataBuf.contains("takephoto_done")){
@@ -341,8 +347,7 @@ SerialThread::processJsonData(QByteArray &jsonData)
                     }
                 }
 
-            }else if(value_cmd=="data"){
-                connect_board = 0;
+            }else if(value_cmd=="data"){                
                 emit dataReceived(jsonData);
                 if(data_upload)
                     emit dataUpload(jsonData);
@@ -413,7 +418,6 @@ SerialThread::update_dat_f_main(QString freq)
 void
 SerialThread::mqtttoserial(const QByteArray &data)
 {
-    data_upload = true;
     sendData(data);
 }
 
@@ -429,8 +433,3 @@ SerialThread::getmodemresult(int res)
     start();
 }
 
-void
-SerialThread::doWork(QVideoFrame  dframe)
-{
-    qDebug() << "doWork";
-}

+ 81 - 5
q6_felgo_iot/src/mysql.cpp

@@ -1,5 +1,5 @@
 #include <mysql.h>
-
+#include <cameramanager.h>
 class param;
 
 QString param::dtype;
@@ -56,12 +56,23 @@ int param::stitch_photonum;
 int param::photo_height;
 int param::photo_width;
 QString param::auto_focus;
+QString param::movZ_f_l;
+QString param::movZ_b_l;
+QString param::movX_f_l;
+QString param::movX_b_l;
 
 int param::camera_tc = 0;
 
 QStringList param::ptlist;
 QStringList param::ptlist_res;
 
+int param::jsonCacheEnable;
+int param::imageCacheEnable;
+int param::maxJsonEntries;
+int param::maxImageEntries;
+int param::x_init;
+int param::y_init;
+
 bool param::net_alive;
 QString param::net_name;
 QString param::net_description;
@@ -289,7 +300,21 @@ bool InsertJson_mqtt()
                                   stitch_photonum INT NOT NULL,\
                                   photo_width INT NOT NULL,\
                                   photo_height INT NOT NULL,\
-                                  auto_focus TEXT NOT NULL)");
+                                  auto_focus TEXT NOT NULL,\
+                                  movZ_f TEXT NOT NULL,\
+                                  movZ_b TEXT NOT NULL,\
+                                  movX_f TEXT NOT NULL,\
+                                  movX_b TEXT NOT NULL)");
+     }
+     if(tableName==QString::fromLocal8Bit("config"))
+     {
+         creat_sql = QString("CREATE TABLE config (\
+                             jsonCacheEnable INT NOT NULL,\
+                             imageCacheEnable INT NOT NULL,\
+                             maxJsonEntries INT NOT NULL,\
+                             maxImageEntries INT NOT NULL,\
+                             x_init INT NOT NULL,\
+                             y_init TEXT NOT NULL)");
      }
      sql_query.prepare(creat_sql);
      if(!sql_query.exec())
@@ -347,14 +372,25 @@ bool InsertJson_mqtt()
         sql_query.bindValue(":gps_lng", singledb.location_db.gps_lng);
         sql_query.bindValue(":gps_elevation", singledb.location_db.gps_elevation);
     }else if(tablename == QString::fromLocal8Bit("camera")){
-
-        sql_query.prepare(QString("INSERT INTO %1 VALUES(:camera_type,:mode,:stitch_photonum,:photo_width,:photo_height,:auto_focus)").arg(tablename));
+        sql_query.prepare(QString("INSERT INTO %1 VALUES(:camera_type,:mode,:stitch_photonum,:photo_width,:photo_height,:auto_focus,:movZ_f,:movZ_b,:movX_f,:movX_b)").arg(tablename));
         sql_query.bindValue(":camera_type", singledb.camera_db.camera_type);
         sql_query.bindValue(":mode", singledb.camera_db.mode);
         sql_query.bindValue(":stitch_photonum", singledb.camera_db.stitch_photonum);
         sql_query.bindValue(":photo_width", singledb.camera_db.photo_width);
         sql_query.bindValue(":photo_height", singledb.camera_db.photo_height);
         sql_query.bindValue(":auto_focus",singledb.camera_db.auto_focus);
+        sql_query.bindValue(":movZ_f",singledb.camera_db.movz_f);
+        sql_query.bindValue(":movZ_b",singledb.camera_db.movz_b);
+        sql_query.bindValue(":movX_f",singledb.camera_db.movx_f);
+        sql_query.bindValue(":movX_b",singledb.camera_db.movx_b);
+    }else if(tablename == QString::fromLocal8Bit("config")){
+        sql_query.prepare(QString("INSERT INTO %1 VALUES(:jsonCacheEnable,:imageCacheEnable,:maxJsonEntries,:maxImageEntries,:x_init,:y_init)").arg(tablename));
+        sql_query.bindValue(":jsonCacheEnable", singledb.config_db.jsonCacheEnable);
+        sql_query.bindValue(":imageCacheEnable", singledb.config_db.imageCacheEnable);
+        sql_query.bindValue(":maxJsonEntries", singledb.config_db.maxJsonEntries);
+        sql_query.bindValue(":maxImageEntries", singledb.config_db.maxImageEntries);
+        sql_query.bindValue(":x_init", singledb.config_db.x_init);
+        sql_query.bindValue(":y_init",singledb.config_db.y_init);
     }
      if(!sql_query.exec())
      {
@@ -478,12 +514,48 @@ int SqliteOperator::UpdateData(QString tablename, QString name, QString value)
                  param::photo_width = sql_query.value(3).toInt();
                  param::photo_height = sql_query.value(4).toInt();
                  param::auto_focus = sql_query.value(5).toString();
+                 param::movZ_f_l = sql_query.value(6).toString();
+                 param::movZ_b_l = sql_query.value(7).toString();
+                 param::movX_f_l = sql_query.value(8).toString();
+                 param::movX_b_l = sql_query.value(9).toString();
                  LOG("camera_type:{}",param::camera_type.toStdString());
                  LOG("stitch_mode:{}",param::stitch_mode.toStdString());
                  LOG("stitch_photonum:{}",param::stitch_photonum);
                  LOG("photo_width:{}",param::photo_width);
                  LOG("photo_height:{}",param::photo_height);
-             }             
+                 if(param::movZ_f_l.isEmpty()||param::movZ_f_l==""){
+                     param::movZ_f_l = movZ_f;
+                 }
+                 if(param::movZ_b_l.isEmpty()||param::movZ_b_l==""){
+                     param::movZ_b_l = movZ_b;
+                 }
+                 if(param::movX_f_l.isEmpty()||param::movX_f_l==""){
+                     param::movX_f_l = movX_f;
+                 }
+                 if(param::movX_b_l.isEmpty()||param::movX_b_l==""){
+                     param::movX_b_l = movX_b;
+                 }
+                 LOG("movZ_f_l:{}",param::movZ_f_l.toStdString());
+                 LOG("movZ_b_l:{}",param::movZ_b_l.toStdString());
+                 LOG("movX_f_l:{}",param::movX_f_l.toStdString());
+                 LOG("movX_b_l:{}",param::movX_b_l.toStdString());
+
+
+             }else if(table_name == QString::fromLocal8Bit("config"))
+             {
+                 param::jsonCacheEnable = sql_query.value(0).toInt();
+                 param::imageCacheEnable = sql_query.value(1).toInt();
+                 param::maxJsonEntries = sql_query.value(2).toInt();
+                 param::maxImageEntries = sql_query.value(3).toInt();
+                 param::x_init = sql_query.value(4).toInt();
+                 param::y_init = sql_query.value(5).toInt();
+                 LOG("jsonCacheEnable:{}",param::jsonCacheEnable);
+                 LOG("imageCacheEnable:{}",param::imageCacheEnable);
+                 LOG("maxJsonEntries:{}",param::maxJsonEntries);
+                 LOG("maxImageEntries:{}",param::maxImageEntries);
+                 LOG("x_init:{}",param::x_init);
+                 LOG("y_init:{}",param::y_init);
+             }
              LOG("data_num:{}",data_num);
          }
      }
@@ -816,6 +888,10 @@ int SqliteOperator::UpdateData(QString tablename, QString name, QString value)
                 param_camera["photo_width"] = sql_query.value(3).toInt();
                 param_camera["photo_height"] = sql_query.value(4).toInt();
                 param_camera["auto_focus"] = sql_query.value(5).toString();
+                param_camera["movz_f"] = sql_query.value(6).toString().isEmpty() ? param::movZ_f_l : "null";
+                param_camera["movz_b"] = sql_query.value(7).toString().isEmpty() ? param::movZ_b_l : "null";
+                param_camera["movx_f"] = sql_query.value(8).toString().isNull() ? param::movX_f_l : "null";
+                param_camera["movx_b"] = sql_query.value(9).toString().isEmpty() ? param::movX_b_l : "null";
                 mqtt_array.append(param_camera);
              }