zhunk 4 месяцев назад
Родитель
Сommit
f9b670623c

+ 7 - 0
app_bzy_armhf_7/docs/Readme.md

@@ -1,4 +1,11 @@
+## 20260626
+    #define APP_VERSION "1.14.5"
+    1、针对MCU丢参数的更新,解析到坐标为0时主动恢复参数到MCU;
+    2、修复保存的MCU JSON参数不完整;
+    3、修复上传日志的路径不正确导致无法上传日志;
 ## 20260527
 ## 20260527
+    #define APP_VERSION "1.13.5"
+        1、增加相机曝光值保存到用户参数;
     #define APP_VERSION "1.13.4"
     #define APP_VERSION "1.13.4"
         1、完善信号强度的获取;
         1、完善信号强度的获取;
 ## 20260519
 ## 20260519

+ 29 - 0
app_bzy_armhf_7/header/m_opencv.h

@@ -28,6 +28,35 @@ public:
     QString  calculateSharpness(const QImage& image);
     QString  calculateSharpness(const QImage& image);
     int CustomSharpening(const QString &path);
     int CustomSharpening(const QString &path);
     Mat qim2mat(QImage &qim);
     Mat qim2mat(QImage &qim);
+    
+    // ==================== DWT多聚焦融合算法 ====================
+    // 主融合函数:融合多张不同焦点的图像
+    // images: 输入图像列表,所有图像必须尺寸相同
+    // levels: 小波分解层数,默认为3层
+    // 返回:融合后的图像
+    cv::Mat multiFocusFusion(const std::vector<cv::Mat>& images, int levels = 3);
+    
+    // 单张图像的Haar小波分解
+    // src: 输入图像(单通道,浮点型)
+    // levels: 分解层数
+    // 返回:分解后的小波系数列表(LL, LH, HL, HH)
+    std::vector<std::vector<cv::Mat>> haarDWT(const cv::Mat& src, int levels);
+    
+    // Haar小波逆变换
+    // coeffs: 小波系数列表
+    // 返回:重构后的图像
+    cv::Mat haarIDWT(const std::vector<std::vector<cv::Mat>>& coeffs);
+    
+    // 计算图像的聚焦度图(清晰度图)
+    // image: 输入图像
+    // 返回:聚焦度图,值越大表示越清晰
+    cv::Mat calculateFocusMap(const cv::Mat& image);
+    
+    // 创建平滑的权重图
+    // focusMaps: 各图像的聚焦度图
+    // sigma: 高斯平滑的标准差,默认为5
+    // 返回:各图像的权重图
+    std::vector<cv::Mat> createWeightMaps(const std::vector<cv::Mat>& focusMaps, double sigma = 5.0);
 };
 };
 
 
 #endif // M_OPENCV_H
 #endif // M_OPENCV_H

+ 1 - 1
app_bzy_armhf_7/header/main.h

@@ -37,7 +37,7 @@
 #include <opencv2/features2d/features2d.hpp>
 #include <opencv2/features2d/features2d.hpp>
 #include <opencv2/xfeatures2d/nonfree.hpp>
 #include <opencv2/xfeatures2d/nonfree.hpp>
 
 
-#define APP_VERSION "1.13.4"
+#define APP_VERSION "1.14.5"
 
 
 using namespace std;
 using namespace std;
 
 

+ 1 - 1
app_bzy_armhf_7/header/mserial.h

@@ -146,7 +146,7 @@ public slots:
             m_ymodem->start_ymodem(path);
             m_ymodem->start_ymodem(path);
         }
         }
     }
     }
-    void recoverMcuParam();
+    Q_INVOKABLE void recoverMcuParam();
 private slots:
 private slots:
     //void readBoardData();
     //void readBoardData();
     QString selectSerialPortName();
     QString selectSerialPortName();

+ 6 - 2
app_bzy_armhf_7/qml/pages/HomePage.qml

@@ -158,8 +158,12 @@ AppPage {
           text_current.text = "电流:" + jsonData.ext.current + "mA"
           text_current.text = "电流:" + jsonData.ext.current + "mA"
           text_lat.text = "lat:" + jsonData.ext.lat
           text_lat.text = "lat:" + jsonData.ext.lat
           text_lng.text = "lng:" + jsonData.ext.lng
           text_lng.text = "lng:" + jsonData.ext.lng
-          var x_init_dis = jsonData.ext.x_init_dis
-          var y_init_dis = jsonData.ext.y_init_dis
+          const x_init_dis = jsonData?.ext?.x_init_dis;
+          const y_init_dis = jsonData?.ext?.y_init_dis;
+          if(y_init_dis ===0)
+          {
+             serial.recoverMcuParam();
+          }
           if(!textInput_x.focus){
           if(!textInput_x.focus){
               textInput_x.text = x_init_dis.toString();
               textInput_x.text = x_init_dis.toString();
           }
           }

+ 8 - 0
app_bzy_armhf_7/src/cameramanager.cpp

@@ -565,6 +565,14 @@ Frames::setExposureTime(const QString &exptime)
         }else{
         }else{
             ERROR("MV_CC_SetExposureTime Failed");
             ERROR("MV_CC_SetExposureTime Failed");
         }
         }
+        //大部分参数修改完成后,调用此命令进行保存,不建议频繁调用
+        nRet = MV_CC_SetCommandValue(handle,"UserSetSave");
+        if (MV_OK != nRet)
+        {
+            ERROR("MV_CC_SetCommandValue UserSetSave fail! nRet [{:x}]", nRet);
+        }else{
+            LOG("save successful!");
+        }
     }
     }
     emit exposureTimeChanged();
     emit exposureTimeChanged();
 }
 }

+ 297 - 0
app_bzy_armhf_7/src/m_opencv.cpp

@@ -177,3 +177,300 @@ Mat OpencvFunc::qim2mat(QImage &qim)
     }
     }
     return mat;
     return mat;
 }
 }
+
+
+// ==================== DWT多聚焦融合算法实现 ====================
+
+// Haar小波分解(单级)
+void haarDWTLevel(cv::Mat& src, cv::Mat& LL, cv::Mat& LH, cv::Mat& HL, cv::Mat& HH) {
+    int rows = src.rows;
+    int cols = src.cols;
+    
+    // 确保尺寸是偶数
+    int newRows = (rows % 2 == 0) ? rows : rows - 1;
+    int newCols = (cols % 2 == 0) ? cols : cols - 1;
+    
+    cv::Mat temp = src(cv::Rect(0, 0, newCols, newRows)).clone();
+    temp.convertTo(temp, CV_64F);
+    
+    // 分配输出空间
+    LL.create(newRows / 2, newCols / 2, CV_64F);
+    LH.create(newRows / 2, newCols / 2, CV_64F);
+    HL.create(newRows / 2, newCols / 2, CV_64F);
+    HH.create(newRows / 2, newCols / 2, CV_64F);
+    
+    // 临时矩阵用于存储中间结果
+    cv::Mat tempH(newRows, newCols / 2, CV_64F);
+    cv::Mat tempV(newRows / 2, newCols / 2, CV_64F);
+    
+    // 水平方向分解
+    for (int i = 0; i < newRows; ++i) {
+        for (int j = 0; j < newCols / 2; ++j) {
+            double val1 = temp.at<double>(i, 2 * j);
+            double val2 = temp.at<double>(i, 2 * j + 1);
+            // 低通和高通
+            tempH.at<double>(i, j) = (val1 + val2) / sqrt(2.0);
+            tempV.at<double>(i, j) = (val1 - val2) / sqrt(2.0);
+        }
+    }
+    
+    // 垂直方向分解
+    for (int i = 0; i < newRows / 2; ++i) {
+        for (int j = 0; j < newCols / 2; ++j) {
+            double val1 = tempH.at<double>(2 * i, j);
+            double val2 = tempH.at<double>(2 * i + 1, j);
+            LL.at<double>(i, j) = (val1 + val2) / sqrt(2.0);
+            LH.at<double>(i, j) = (val1 - val2) / sqrt(2.0);
+            
+            val1 = tempV.at<double>(2 * i, j);
+            val2 = tempV.at<double>(2 * i + 1, j);
+            HL.at<double>(i, j) = (val1 + val2) / sqrt(2.0);
+            HH.at<double>(i, j) = (val1 - val2) / sqrt(2.0);
+        }
+    }
+}
+
+// Haar小波逆变换(单级)
+void haarIDWTLevel(cv::Mat& LL, cv::Mat& LH, cv::Mat& HL, cv::Mat& HH, cv::Mat& dst) {
+    int rows = LL.rows * 2;
+    int cols = LL.cols * 2;
+    
+    dst.create(rows, cols, CV_64F);
+    
+    // 临时矩阵
+    cv::Mat tempH(rows, cols / 2, CV_64F);
+    cv::Mat tempV(rows, cols / 2, CV_64F);
+    
+    // 垂直方向重构
+    for (int i = 0; i < rows / 2; ++i) {
+        for (int j = 0; j < cols / 2; ++j) {
+            double ll = LL.at<double>(i, j);
+            double lh = LH.at<double>(i, j);
+            double hl = HL.at<double>(i, j);
+            double hh = HH.at<double>(i, j);
+            
+            tempH.at<double>(2 * i, j) = (ll + lh) / sqrt(2.0);
+            tempH.at<double>(2 * i + 1, j) = (ll - lh) / sqrt(2.0);
+            tempV.at<double>(2 * i, j) = (hl + hh) / sqrt(2.0);
+            tempV.at<double>(2 * i + 1, j) = (hl - hh) / sqrt(2.0);
+        }
+    }
+    
+    // 水平方向重构
+    for (int i = 0; i < rows; ++i) {
+        for (int j = 0; j < cols / 2; ++j) {
+            double h = tempH.at<double>(i, j);
+            double v = tempV.at<double>(i, j);
+            
+            dst.at<double>(i, 2 * j) = (h + v) / sqrt(2.0);
+            dst.at<double>(i, 2 * j + 1) = (h - v) / sqrt(2.0);
+        }
+    }
+}
+
+// Haar小波分解(多级)
+std::vector<std::vector<cv::Mat>> OpencvFunc::haarDWT(const cv::Mat& src, int levels) {
+    std::vector<std::vector<cv::Mat>> coeffs(levels);
+    
+    cv::Mat current = src.clone();
+    if (current.depth() != CV_64F) {
+        current.convertTo(current, CV_64F);
+    }
+    
+    for (int i = 0; i < levels; ++i) {
+        cv::Mat LL, LH, HL, HH;
+        haarDWTLevel(current, LL, LH, HL, HH);
+        
+        coeffs[i].resize(4);
+        coeffs[i][0] = LL.clone();  // LL
+        coeffs[i][1] = LH.clone();  // LH
+        coeffs[i][2] = HL.clone();  // HL
+        coeffs[i][3] = HH.clone();  // HH
+        
+        current = LL.clone();
+    }
+    
+    return coeffs;
+}
+
+// Haar小波逆变换(多级)
+cv::Mat OpencvFunc::haarIDWT(const std::vector<std::vector<cv::Mat>>& coeffs) {
+    if (coeffs.empty()) {
+        return cv::Mat();
+    }
+    
+    int levels = coeffs.size();
+    cv::Mat current = coeffs[levels - 1][0].clone();  // 最底层的LL
+    
+    // 从最底层向上重构
+    for (int i = levels - 1; i >= 0; --i) {
+        cv::Mat LL = current;
+        cv::Mat LH = coeffs[i][1];
+        cv::Mat HL = coeffs[i][2];
+        cv::Mat HH = coeffs[i][3];
+        
+        haarIDWTLevel(LL, LH, HL, HH, current);
+    }
+    
+    return current;
+}
+
+// 计算图像的聚焦度图(清晰度图)
+cv::Mat OpencvFunc::calculateFocusMap(const cv::Mat& image) {
+    cv::Mat gray;
+    if (image.channels() > 1) {
+        cv::cvtColor(image, gray, cv::COLOR_BGR2GRAY);
+    } else {
+        gray = image.clone();
+    }
+    
+    // 使用拉普拉斯算子计算梯度
+    cv::Mat laplacian;
+    cv::Laplacian(gray, laplacian, CV_64F, 3);
+    
+    // 计算绝对值的平方作为聚焦度
+    cv::Mat focusMap;
+    cv::multiply(laplacian, laplacian, focusMap);
+    
+    return focusMap;
+}
+
+// 创建平滑的权重图
+std::vector<cv::Mat> OpencvFunc::createWeightMaps(const std::vector<cv::Mat>& focusMaps, double sigma) {
+    int numImages = focusMaps.size();
+    if (numImages == 0) {
+        return std::vector<cv::Mat>();
+    }
+    
+    int rows = focusMaps[0].rows;
+    int cols = focusMaps[0].cols;
+    
+    std::vector<cv::Mat> weightMaps(numImages);
+    
+    // 对每个聚焦度图进行高斯平滑
+    std::vector<cv::Mat> smoothedMaps(numImages);
+    for (int i = 0; i < numImages; ++i) {
+        cv::GaussianBlur(focusMaps[i], smoothedMaps[i], cv::Size(0, 0), sigma);
+    }
+    
+    // 计算归一化权重
+    cv::Mat sumMap = cv::Mat::zeros(rows, cols, CV_64F);
+    for (int i = 0; i < numImages; ++i) {
+        sumMap += smoothedMaps[i];
+    }
+    
+    // 避免除以零
+    sumMap.setTo(1e-10, sumMap < 1e-10);
+    
+    for (int i = 0; i < numImages; ++i) {
+        cv::divide(smoothedMaps[i], sumMap, weightMaps[i]);
+    }
+    
+    return weightMaps;
+}
+
+// 主融合函数:融合多张不同焦点的图像
+cv::Mat OpencvFunc::multiFocusFusion(const std::vector<cv::Mat>& images, int levels) {
+    if (images.empty()) {
+        return cv::Mat();
+    }
+    
+    int numImages = images.size();
+    int rows = images[0].rows;
+    int cols = images[0].cols;
+    int channels = images[0].channels();
+    
+    // 检查所有图像尺寸是否一致
+    for (int i = 1; i < numImages; ++i) {
+        if (images[i].rows != rows || images[i].cols != cols) {
+            qWarning() << "All images must have the same size!";
+            return cv::Mat();
+        }
+    }
+    
+    // 如果是彩色图像,对每个通道分别处理
+    if (channels == 3) {
+        std::vector<cv::Mat> channels(3);
+        std::vector<cv::Mat> fusedChannels(3);
+        
+        // 分离通道
+        cv::split(images[0], channels);
+        
+        for (int c = 0; c < 3; ++c) {
+            // 收集当前通道的所有图像
+            std::vector<cv::Mat> channelImages(numImages);
+            for (int i = 0; i < numImages; ++i) {
+                std::vector<cv::Mat> tempChannels(3);
+                cv::split(images[i], tempChannels);
+                channelImages[i] = tempChannels[c].clone();
+            }
+            
+            // 对单通道图像进行融合
+            fusedChannels[c] = multiFocusFusion(channelImages, levels);
+        }
+        
+        // 合并通道
+        cv::Mat fused;
+        cv::merge(fusedChannels, fused);
+        return fused;
+    }
+    
+    // 单通道处理
+    
+    // 1. 计算每张图像的聚焦度图
+    std::vector<cv::Mat> focusMaps(numImages);
+    for (int i = 0; i < numImages; ++i) {
+        focusMaps[i] = calculateFocusMap(images[i]);
+    }
+    
+    // 2. 创建平滑的权重图
+    std::vector<cv::Mat> weightMaps = createWeightMaps(focusMaps, 5.0);
+    
+    // 3. 对每张图像进行小波分解
+    std::vector<std::vector<std::vector<cv::Mat>>> allCoeffs(numImages);
+    for (int i = 0; i < numImages; ++i) {
+        cv::Mat floatImg;
+        images[i].convertTo(floatImg, CV_64F);
+        allCoeffs[i] = haarDWT(floatImg, levels);
+    }
+    
+    // 4. 在小波域进行融合
+    std::vector<std::vector<cv::Mat>> fusedCoeffs(levels);
+    
+    for (int level = 0; level < levels; ++level) {
+        fusedCoeffs[level].resize(4);
+        
+        // 对每个子带进行融合
+        for (int subband = 0; subband < 4; ++subband) {
+            cv::Mat fusedSubband = cv::Mat::zeros(
+                allCoeffs[0][level][subband].rows,
+                allCoeffs[0][level][subband].cols,
+                CV_64F
+            );
+            
+            // 根据权重图进行加权融合
+            // 需要将权重图调整到当前子带的尺寸
+            for (int i = 0; i < numImages; ++i) {
+                cv::Mat resizedWeight;
+                cv::resize(weightMaps[i], resizedWeight, 
+                    cv::Size(fusedSubband.cols, fusedSubband.rows),
+                    0, 0, cv::INTER_LINEAR);
+                
+                fusedSubband += resizedWeight.mul(allCoeffs[i][level][subband]);
+            }
+            
+            fusedCoeffs[level][subband] = fusedSubband;
+        }
+    }
+    
+    // 5. 小波逆变换重构图像
+    cv::Mat fusedFloat = haarIDWT(fusedCoeffs);
+    
+    // 6. 裁剪到原始尺寸(可能因小波分解取偶而改变)
+    cv::Mat result = fusedFloat(cv::Rect(0, 0, cols, rows));
+    
+    // 7. 转换回8位图像
+    result.convertTo(result, CV_8U);
+    
+    return result;
+}

+ 1 - 1
app_bzy_armhf_7/src/mqtthandler.cpp

@@ -261,7 +261,7 @@ MqttHandler::onMessageReceived(const QByteArray &message, const QMqttTopicName &
                 if(METHOD.toString()=="upload_log"&&!PARAMS.isNull()){
                 if(METHOD.toString()=="upload_log"&&!PARAMS.isNull()){
                     QJsonObject params_Obj = PARAMS.toObject();
                     QJsonObject params_Obj = PARAMS.toObject();
                     QJsonValue filename_value = params_Obj["filename"];
                     QJsonValue filename_value = params_Obj["filename"];
-                    QString appDataPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
+                    QString appDataPath = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/Android/data/com.yfkj.bzyv1/files/";//GenericDataLocation
                     QString logFilePath = appDataPath +"/" + filename_value.toString();
                     QString logFilePath = appDataPath +"/" + filename_value.toString();
                     // 1. 创建临时副本
                     // 1. 创建临时副本
                     QString tempLogFile = QDir::tempPath() + "/temp_log_" +
                     QString tempLogFile = QDir::tempPath() + "/temp_log_" +

+ 1 - 1
app_bzy_armhf_7/src/mserial.cpp

@@ -174,7 +174,7 @@ SerialThread::processJsonData(const QByteArray &jsonData)
                 QJsonValue paramsValue = jsonObject.value(QStringLiteral("params"));
                 QJsonValue paramsValue = jsonObject.value(QStringLiteral("params"));
                 if (paramsValue.isObject()) {
                 if (paramsValue.isObject()) {
                     LOG("收到 sync_param, 保存 MCU 参数到数据库");
                     LOG("收到 sync_param, 保存 MCU 参数到数据库");
-                    saveMcuParam(paramsValue.toObject());
+                    saveMcuParam(jsonDocument.object());
                 }
                 }
                 return;
                 return;
             } else if (methodName == QStringLiteral("recover_param")) {
             } else if (methodName == QStringLiteral("recover_param")) {

+ 16 - 16
q6_felgo_iot/CMakeLists.txt.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 17.0.1, 2026-05-27T11:12:40. -->
+<!-- Written by QtCreator 17.0.1, 2026-06-23T11:47:39. -->
 <qtcreator>
 <qtcreator>
  <data>
  <data>
   <variable>EnvironmentId</variable>
   <variable>EnvironmentId</variable>
@@ -108,27 +108,27 @@
     <value type="int" key="CMake.Configure.BaseEnvironment">2</value>
     <value type="int" key="CMake.Configure.BaseEnvironment">2</value>
     <value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
     <value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
     <valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
     <valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
-    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_BUILD_TYPE:STRING=Release
--DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}
--DCMAKE_COLOR_DIAGNOSTICS:BOOL=ON
--DANDROID_STL:STRING=c++_shared
--DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
+    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_COLOR_DIAGNOSTICS:BOOL=ON
+-DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=F:/Android_Env/android_sdk/ndk/27.2.12479018/build/cmake/android.toolchain.cmake
 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=F:/Android_Env/android_sdk/ndk/27.2.12479018/build/cmake/android.toolchain.cmake
--DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
--DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
--DCMAKE_GENERATOR:STRING=Ninja
+-DCMAKE_BUILD_TYPE:STRING=Release
 -DQT_MAINTENANCE_TOOL:FILEPATH=D:/Qt/Felgo/MaintenanceTool.exe
 -DQT_MAINTENANCE_TOOL:FILEPATH=D:/Qt/Felgo/MaintenanceTool.exe
--DANDROID_ABI:STRING=arm64-v8a
 -DANDROID_NDK:PATH=F:/Android_Env/android_sdk/ndk/27.2.12479018
 -DANDROID_NDK:PATH=F:/Android_Env/android_sdk/ndk/27.2.12479018
--DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF
--DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
--DANDROID_PLATFORM:STRING=android-23
 -DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
 -DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
--DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
 -DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON
 -DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON
+-DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}
+-DANDROID_ABI:STRING=arm64-v8a
 -DANDROID_SDK_ROOT:PATH=F:/Android_Env/android_sdk
 -DANDROID_SDK_ROOT:PATH=F:/Android_Env/android_sdk
--DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
--DQT_USE_TARGET_ANDROID_BUILD_DIR:BOOL=ON</value>
+-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
+-DCMAKE_GENERATOR:STRING=Ninja
+-DANDROID_STL:STRING=c++_shared
+-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
+-DANDROID_PLATFORM:STRING=android-23
+-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
+-DQT_USE_TARGET_ANDROID_BUILD_DIR:BOOL=ON
+-DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF
+-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
+-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake</value>
     <value type="QString" key="CMake.Source.Directory">F:\QT_WorkSpace\qt6_iot_all\q6_felgo_iot</value>
     <value type="QString" key="CMake.Source.Directory">F:\QT_WorkSpace\qt6_iot_all\q6_felgo_iot</value>
     <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:\QT_WorkSpace\qt6_iot_all\q6_felgo_iot\build\Qt_6_8_3_android_arm64_v8a_Clang_arm64_v8a-Release</value>
     <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:\QT_WorkSpace\qt6_iot_all\q6_felgo_iot\build\Qt_6_8_3_android_arm64_v8a_Clang_arm64_v8a-Release</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">

+ 8 - 2
q6_felgo_iot/docs/Readme.md

@@ -1,5 +1,11 @@
-
-
+## 20260623
+     #define APP_VERSION "1.10.30"
+     1、针对MCU丢参数的更新,解析到坐标为0时主动恢复参数到MCU;
+     2、修复保存的MCU JSON参数不完整;
+     3、修复X坐标在屏幕上无法设置;
+## 20260530
+     #define APP_VERSION "1.10.29"
+     1. 改进串口接收lwjson库的解析,serial.h;
 ## 20260527
 ## 20260527
      #define APP_VERSION "1.10.28"
      #define APP_VERSION "1.10.28"
      1. 改进信号强度获取;
      1. 改进信号强度获取;

+ 1 - 1
q6_felgo_iot/header/main.h

@@ -37,7 +37,7 @@
 #include <opencv2/features2d/features2d.hpp>
 #include <opencv2/features2d/features2d.hpp>
 #include <opencv2/xfeatures2d/nonfree.hpp>
 #include <opencv2/xfeatures2d/nonfree.hpp>
 
 
-#define APP_VERSION "1.10.28"
+#define APP_VERSION "1.10.30"
 
 
 using namespace std;
 using namespace std;
 
 

+ 14 - 5
q6_felgo_iot/header/mserial.h

@@ -147,29 +147,37 @@ public slots:
             m_ymodem->start_ymodem(path);
             m_ymodem->start_ymodem(path);
         }
         }
     }
     }
-    void recoverMcuParam();
+    Q_INVOKABLE void recoverMcuParam();
 private slots:
 private slots:
     //void readBoardData();
     //void readBoardData();
     QString selectSerialPortName();
     QString selectSerialPortName();
     void feedJsonParser(const QByteArray& data)
     void feedJsonParser(const QByteArray& data)
     {
     {
-        dataBuf.append(data);
         for (uint8_t b : data) {
         for (uint8_t b : data) {
             lwjsonr_t ret = lwjson_stream_parse(&lwparser, b);
             lwjsonr_t ret = lwjson_stream_parse(&lwparser, b);
+
+            // 只在解析进行中或完成时跟踪字节,避免累积无关数据
+            if (ret == lwjsonSTREAMINPROG || ret == lwjsonSTREAMDONE) {
+                jsonBuf.append(static_cast<char>(b));
+            }
+
             switch (ret){
             switch (ret){
             case lwjsonERRJSON:             // 1, 无效的字符
             case lwjsonERRJSON:             // 1, 无效的字符
+                jsonBuf.clear();
+                break;
             case lwjsonSTREAMWAITFIRSTCHAR: // 2, 等待首字符
             case lwjsonSTREAMWAITFIRSTCHAR: // 2, 等待首字符
                 break;
                 break;
             case lwjsonSTREAMINPROG:        // 3, 正在解析中
             case lwjsonSTREAMINPROG:        // 3, 正在解析中
                 break;
                 break;
             case lwjsonSTREAMDONE:          // 4, 解析已完成
             case lwjsonSTREAMDONE:          // 4, 解析已完成
-                LOG("lwjsonSTREAMDONE:{}",dataBuf.constData());
-                emit lwjsonStreamDONE(dataBuf);
-                dataBuf.clear();
+                LOG("lwjsonSTREAMDONE:{}",jsonBuf.constData());
+                emit lwjsonStreamDONE(jsonBuf);
+                jsonBuf.clear();
                 lwjson_stream_reset(&lwparser);
                 lwjson_stream_reset(&lwparser);
                 break;
                 break;
             case lwjsonERRMEM:             // 5, 嵌套的太深("LWJSON_CFG_STREAM_STACK_SIZE")
             case lwjsonERRMEM:             // 5, 嵌套的太深("LWJSON_CFG_STREAM_STACK_SIZE")
                 ERROR("lwjsonERRMEM!");
                 ERROR("lwjsonERRMEM!");
+                jsonBuf.clear();
                 lwjson_stream_reset(&lwparser);
                 lwjson_stream_reset(&lwparser);
                 break;
                 break;
             default: // 流式解析时, 其它的返回值, 都不应该出现
             default: // 流式解析时, 其它的返回值, 都不应该出现
@@ -202,6 +210,7 @@ private:
     };
     };
 
 
     lwjson_stream_parser_t lwparser;
     lwjson_stream_parser_t lwparser;
+    QByteArray jsonBuf;
 
 
     void deleteAllFilesInDirectory(const QString &directoryPath)
     void deleteAllFilesInDirectory(const QString &directoryPath)
     {
     {

+ 8 - 5
q6_felgo_iot/qml/pages/HomePage.qml

@@ -158,8 +158,12 @@ AppPage {
           text_current.text = "电流:" + jsonData.ext.current + "mA"
           text_current.text = "电流:" + jsonData.ext.current + "mA"
           text_lat.text = "lat:" + jsonData.ext.lat
           text_lat.text = "lat:" + jsonData.ext.lat
           text_lng.text = "lng:" + jsonData.ext.lng
           text_lng.text = "lng:" + jsonData.ext.lng
-          var x_init_dis = jsonData.ext.x_init_dis
-          var y_init_dis = jsonData.ext.y_init_dis
+          const x_init_dis = jsonData?.ext?.x_init_dis;
+          const y_init_dis = jsonData?.ext?.y_init_dis;
+          if(x_init_dis ===0 || y_init_dis ===0)
+          {
+             serial.recoverMcuParam();
+          }
           if(!textInput_x.focus){
           if(!textInput_x.focus){
               textInput_x.text = x_init_dis.toString();
               textInput_x.text = x_init_dis.toString();
           }
           }
@@ -356,15 +360,14 @@ AppPage {
                                     text: "0"
                                     text: "0"
                                     font.family: "Arial"
                                     font.family: "Arial"
                                     font.pixelSize: 20
                                     font.pixelSize: 20
-
+                                    inputMethodHints: Qt.ImhMultiLine
                                     // 使用验证器替代inputMask
                                     // 使用验证器替代inputMask
                                     validator: DoubleValidator {
                                     validator: DoubleValidator {
                                         decimals: 2
                                         decimals: 2
                                     }
                                     }
 
 
                                     property real numericValue_x: Number(text) || 0
                                     property real numericValue_x: Number(text) || 0
-
-                                    onAccepted: {
+                                    Keys.onReturnPressed: {
                                         console.log("X坐标:", numericValue_x)
                                         console.log("X坐标:", numericValue_x)
                                         serial.setHt_xy_dis(numericValue_x, textInput_y.numericValue_y)
                                         serial.setHt_xy_dis(numericValue_x, textInput_y.numericValue_y)
                                         coordinateInputs.visible = false
                                         coordinateInputs.visible = false

+ 1 - 1
q6_felgo_iot/src/mserial.cpp

@@ -299,7 +299,7 @@ SerialThread::processJsonData(const QByteArray &jsonData)
                 QJsonValue paramsValue = jsonObject.value(QStringLiteral("params"));
                 QJsonValue paramsValue = jsonObject.value(QStringLiteral("params"));
                 if (paramsValue.isObject()) {
                 if (paramsValue.isObject()) {
                     LOG("收到 sync_param, 保存 MCU 参数到数据库");
                     LOG("收到 sync_param, 保存 MCU 参数到数据库");
-                    saveMcuParam(paramsValue.toObject());
+                    saveMcuParam(jsonDocument.object());
                 }
                 }
                 return;
                 return;
             } else if (methodName == QStringLiteral("recover_param")) {
             } else if (methodName == QStringLiteral("recover_param")) {