zhunk 4 недель назад
Родитель
Сommit
238fbea445

+ 19 - 19
q6_felgo_iot/CMakeLists.txt.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 17.0.1, 2026-09-15T16:48:20. -->
+<!-- Written by QtCreator 17.0.1, 2026-10-19T17:36:33. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -108,27 +108,27 @@
     <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">-DANDROID_STL:STRING=c++_shared
--DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF
--DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
--DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
+    <value type="QString" key="CMake.Initial.Parameters">-DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF
+-DCMAKE_BUILD_TYPE:STRING=Release
+-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
+-DANDROID_ABI:STRING=arm64-v8a
 -DQT_USE_TARGET_ANDROID_BUILD_DIR:BOOL=ON
--DANDROID_NDK:PATH=F:/Android_Env/android_sdk/ndk/27.2.12479018
--DANDROID_SDK_ROOT:PATH=F:/Android_Env/android_sdk
--DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}
--DCMAKE_COLOR_DIAGNOSTICS:BOOL=ON
--DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
 -DCMAKE_GENERATOR:STRING=Ninja
--DCMAKE_BUILD_TYPE:STRING=Release
--DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON
--DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
+-DCMAKE_COLOR_DIAGNOSTICS:BOOL=ON
+-DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
+-DANDROID_STL:STRING=c++_shared
+-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
+-DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}
 -DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
+-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=F:/Android_Env/android_sdk/ndk/27.2.12479018/build/cmake/android.toolchain.cmake
--DANDROID_ABI:STRING=arm64-v8a
 -DANDROID_PLATFORM:STRING=android-23
--DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
--DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
--DQT_MAINTENANCE_TOOL:FILEPATH=D:/Qt/Felgo/MaintenanceTool.exe</value>
+-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
+-DQT_MAINTENANCE_TOOL:FILEPATH=D:/Qt/Felgo/MaintenanceTool.exe
+-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
+-DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON
+-DANDROID_SDK_ROOT:PATH=F:/Android_Env/android_sdk
+-DANDROID_NDK:PATH=F:/Android_Env/android_sdk/ndk/27.2.12479018</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>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
@@ -205,8 +205,8 @@
       <value type="QString">armeabi-v7a</value>
       <value type="QString">armeabi</value>
      </valuelist>
-     <value type="QString" key="AndroidDeviceSerialNumber">ee0cc712744242d9</value>
-     <value type="int" key="AndroidVersion.ApiLevel">30</value>
+     <value type="QString" key="AndroidDeviceSerialNumber">cc5508a2929096ea</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>

+ 24 - 0
q6_felgo_iot/docs/Readme.md

@@ -1,3 +1,27 @@
+## 20261019
+    #define APP_VERSION "1.13.56"
+    1.【修改】图片水印改为两行格式(拍照锐化图与录制分析/融合结果图统一),与 master_fusion 分支一致:
+       第1行"2026年09月20日 15:02:37  z0x1_5.jpg"(文件名前14位时间戳 + 其后步进与序号),
+       第2行"位置[113.44245,34.22586] 温湿度 [20℃,65%RH]";
+       因 cv::putText 只能画 ASCII、无法渲染中文与℃,改用 QPainter 绘制
+       (QImage 以 Format_BGR888 直接包装 cv::Mat,与OpenCV的BGR字节序一致),
+       字号随图宽自适应(cols/50,2592宽约52px),行距1.5倍字号,仍为红色;
+       新增 param::env_temp/env_humi,mserial 解析 MCU 报文时提取 ext.at/ah 供其使用;
+       经纬度优先 GPS(param::gps_lng/lat),回退基站定位,保留5位小数,无数据以 -- 占位
+## 20261008
+    #define APP_VERSION "1.13.55"
+    1、【修复】系统重启无效(Java层NoSuchMethodError):
+        sendBroadcastFromQt("rebootSystem")复用了上方统一创建的Backlight实例,
+        而rebootSystem方法定义在StatusBarCtr类中,方法查找落在Backlight上导致报错、重启未执行;
+        修复:rebootSystem分支单独创建StatusBarCtr实例后再调用;
+        影响范围:MQTT系统重启指令、每日定时重启(均走同一分支)
+## 20261008
+    #define APP_VERSION "1.13.54"
+    1、【新增】MQTT新增JSON-RPC协议的系统重启指令(工控机重启):
+        指令格式:{"jsonrpc":"2.0","method":"dtu_reboot","id":1}
+        收到指令后先通过MQTT上报warn确认消息(系统即将重启),延时3秒(等待消息发出)后
+        触发系统重启(广播rebootSystem);3秒等待期内重复收到指令只受理一次;
+        原cmd格式{"cmd":"dtu_reboot"}重启功能保持不变
 ## 20260915
     #define APP_VERSION "1.13.53"
     1、【修改】视频景深融合效果差:改按"最清晰帧上下邻域"选帧融合,不再全视频等间隔取帧

+ 4 - 1
q6_felgo_iot/header/main.h

@@ -37,7 +37,7 @@
 #include <opencv2/features2d/features2d.hpp>
 #include <opencv2/xfeatures2d/nonfree.hpp>
 
-#define APP_VERSION "1.13.53"
+#define APP_VERSION "1.13.56"
 
 using namespace std;
 
@@ -117,6 +117,9 @@ public:
     static QString lbs_lng;
     static QString gps_lat;
     static QString gps_lng;
+    //环境温湿度(MCU 上报 ext.at/ah 的最新值),用于图片水印"温湿度 [20℃,65%RH]"
+    static QString env_temp;
+    static QString env_humi;
     static QString gps_elevation;
     //camera&photo
     static QString camera_type;     //相机类型

+ 1 - 0
q6_felgo_iot/header/mqtthandler.h

@@ -159,6 +159,7 @@ private:
     OfflineStorage *m_storage;
     QUrl url;
     JsonFunc mqtt_json;
+    bool m_rebootPending = false;  //系统重启指令受理标志,防止3秒等待期内重复触发
     int m_uploadBatchSize = 1; // 可配置
     QHash<quint16, std::function<void(bool)>> m_pendingAcks; // 消息ID -> 回调
     QTimer *image_reupload;

+ 84 - 16
q6_felgo_iot/src/cameramanager.cpp

@@ -34,6 +34,9 @@
 #include <QDateTime>
 #include <QDebug>
 #include <QFileInfo>
+#include <QImage>
+#include <QPainter>
+#include <QFont>
 #include <QtConcurrent/QtConcurrent>
 #include <m_workthread.h>
 #include <mserial.h>
@@ -207,18 +210,89 @@ cv::Mat enhanceResultImage(OpencvFunc &func, const cv::Mat &image)
     return func.enhanceContrast(sharp, 0);
 }
 
-//保存结果图片(jpg,质量95,与拍照图片一致):左上角红色文件名水印
+//结果图片水印(左上角,红色两行):
+//  第1行: 2026年09月20日 15:02:37  z0x1_5.jpg      (文件名前14位时间戳 + 其后步进与序号)
+//  第2行: 位置[113.44245,34.22586] 温湿度 [20℃,65%RH]
+//cv::putText 只能画 ASCII,无法渲染中文/℃,故改用 QPainter 绘制
+void drawWatermark(cv::Mat &image, const QString &filePath)
+{
+    if(image.empty()) return;
+    if(image.channels() == 4) cv::cvtColor(image, image, cv::COLOR_BGRA2BGR);
+    if(image.channels() != 3) return;
+
+    //直接用 cv::Mat 像素作为 QImage 画布(Format_BGR888 与 OpenCV 的 BGR 字节序一致)
+    QImage canvas(image.data, image.cols, image.rows,
+                  static_cast<int>(image.step), QImage::Format_BGR888);
+    if(canvas.isNull()) return;
+
+    const QString fileName = QFileInfo(filePath).fileName();
+    const QString base = QFileInfo(filePath).completeBaseName();
+    const QString suffix = QFileInfo(filePath).suffix();
+    //文件名形如 20260920150237z0x1_5.jpg:前14位为时间戳,其后为 z/x 步进与序号
+    QString timeText;
+    QString tailText = fileName;
+    if(base.size() > 14){
+        const QDateTime dt = QDateTime::fromString(base.left(14), "yyyyMMddhhmmss");
+        if(dt.isValid()){
+            timeText = dt.toString(QStringLiteral("yyyy年MM月dd日 hh:mm:ss"));
+            tailText = base.mid(14) + (suffix.isEmpty() ? QString() : "." + suffix);
+        }
+    }
+    if(timeText.isEmpty()){
+        timeText = QDateTime::currentDateTime().toString(QStringLiteral("yyyy年MM月dd日 hh:mm:ss"));
+    }
+    const QString line1 = timeText + "  " + tailText;
+
+    //位置:优先GPS,回退基站定位;经纬度保留5位小数(约1米精度)
+    auto fmtCoord = [](const QString &v) -> QString {
+        const QString t = v.trimmed();
+        if(t.isEmpty() || t == QStringLiteral("0")) return QString();
+        bool ok = false;
+        const double d = t.toDouble(&ok);
+        return ok ? QString::number(d, 'f', 5) : QString();
+    };
+    QString lng = fmtCoord(param::gps_lng);
+    QString lat = fmtCoord(param::gps_lat);
+    if(lng.isEmpty() || lat.isEmpty()){
+        const QString lbsLng = fmtCoord(param::lbs_lng);
+        const QString lbsLat = fmtCoord(param::lbs_lat);
+        if(lng.isEmpty()) lng = lbsLng;
+        if(lat.isEmpty()) lat = lbsLat;
+    }
+    if(lng.isEmpty()) lng = QStringLiteral("--");
+    if(lat.isEmpty()) lat = QStringLiteral("--");
+    //温湿度:MCU 上报的环境温度/湿度(ext.at/ah),无数据时以 -- 占位
+    const QString tempText = param::env_temp.trimmed().isEmpty()
+                           ? QStringLiteral("--") : param::env_temp.trimmed();
+    const QString humiText = param::env_humi.trimmed().isEmpty()
+                           ? QStringLiteral("--") : param::env_humi.trimmed();
+    const QString line2 = QStringLiteral("位置[%1,%2] 温湿度 [%3℃,%4%RH]")
+                              .arg(lng, lat, tempText, humiText);
+
+    QPainter painter(&canvas);
+    painter.setRenderHint(QPainter::Antialiasing, true);
+    painter.setRenderHint(QPainter::TextAntialiasing, true);
+    QFont font = painter.font();
+    //字号随图像宽度自适应:2592宽 -> 约52px,与旧 putText fontScale=3.0 视觉接近
+    const int fontSize = qBound(16, image.cols / 50, 96);
+    font.setPixelSize(fontSize);
+    font.setBold(true);
+    painter.setFont(font);
+    painter.setPen(QColor(255, 0, 0));      //红色,与旧水印一致
+    const int margin = qMax(10, image.cols / 160);
+    const int lineHeight = static_cast<int>(fontSize * 1.5);
+    painter.drawText(margin, margin + fontSize, line1);
+    painter.drawText(margin, margin + fontSize + lineHeight, line2);
+    painter.end();
+}
+
+//保存结果图片(jpg,质量95,与拍照图片一致):左上角红色水印(时间/文件名/位置/温湿度)
 bool saveResultImage(const QString &path, const cv::Mat &image)
 {
     QDir().mkpath(QFileInfo(path).absolutePath());
     cv::Mat out = image.clone();
-    cv::putText(out,
-                QFileInfo(path).fileName().toStdString(),
-                cv::Point(15, 50),
-                cv::FONT_HERSHEY_SIMPLEX,
-                3.0,        //增大水印字体大小
-                cv::Scalar(0,0,255),  //红色 red
-                3);
+    if(out.channels() == 4) cv::cvtColor(out, out, cv::COLOR_BGRA2BGR);
+    drawWatermark(out, path);
     std::vector<int> params = {cv::IMWRITE_JPEG_QUALITY, 95};
     if(!cv::imwrite(path.toStdString(), out, params)){
         ERROR("saveResultImage: 保存失败:{}",path.toStdString());
@@ -943,14 +1017,8 @@ Frames::saveMatAsJpeg(const QVideoFrame &frame){
                 cv::Mat fused_sharp = m_opencvfunc.unsharpMask(image, 2.0, 3.0);
                 //对比度
                 cv::Mat Contrast_Image = m_opencvfunc.enhanceContrast(fused_sharp,0);
-                //左上角水印:红色字体,文字为图片名称(不含目录)
-                cv::putText(Contrast_Image,
-                            QFileInfo(name_sharp).fileName().toStdString(),
-                            cv::Point(15, 50),
-                            cv::FONT_HERSHEY_SIMPLEX,
-                            3.0,        //增大水印字体大小
-                            cv::Scalar(0,0,255),  //红色 red
-                            3);
+                //左上角水印:红色两行(时间+文件名 / 位置+温湿度)
+                drawWatermark(Contrast_Image, name_sharp);
                 std::vector<int> jpegParams = {cv::IMWRITE_JPEG_QUALITY, 95};
                 if (!cv::imwrite(name_sharp.toStdString(), Contrast_Image, jpegParams)) {
                     ERROR("Failed to save fused image:{}",name_sharp.toStdString());

+ 1 - 0
q6_felgo_iot/src/main.cpp

@@ -220,6 +220,7 @@ void sendBroadcastFromQt(QString btn_type) {
             qDebug() << "install process start!";
             jClass.callMethod<void>("installApp","(Landroid/content/Context;)V",qtContext.object());
         }else if(btn_type=="rebootSystem"){
+            QJniObject jClass("com/yfkj/cb/Q6iot/StatusBarCtr");  //rebootSystem在StatusBarCtr类中,不能复用上方Backlight实例
             jClass.callMethod<void>("rebootSystem","(Landroid/content/Context;)V",qtContext.object());
         }else if(btn_type=="service"){
             qDebug() <<"启动android服务";

+ 17 - 0
q6_felgo_iot/src/mqtthandler.cpp

@@ -298,6 +298,23 @@ MqttHandler::onMessageReceived(const QByteArray &message, const QMqttTopicName &
                     LOG("收到远程相机曝光设置指令,曝光时间:{}", exposureTime);
                     emit signal_set_camera_exposure(exposureTime);
                 }
+                // 远程系统重启(工控机):{"jsonrpc":"2.0","method":"dtu_reboot","params":{},"id":1}
+                else if(METHOD.toString()=="dtu_reboot"){
+                    if(m_rebootPending){
+                        WARN("系统重启指令已受理,忽略重复指令!");
+                    }else{
+                        m_rebootPending = true;
+                        WARN("收到JSON-RPC系统重启指令,3秒后执行重启!");
+                        QByteArray reboot_ack =
+                            mqtt_json.MakeJsonWarn("系统即将重启","远程重启指令");
+                        publish_m(reboot_ack);
+                        // 延时等待确认消息发出后再触发系统重启
+                        QTimer::singleShot(3000, this, [this](){
+                            WARN("执行系统重启!");
+                            emit sysReboot();
+                        });
+                    }
+                }
             }
         }
         if(!cmdValue.isNull()){

+ 13 - 0
q6_felgo_iot/src/mserial.cpp

@@ -200,6 +200,19 @@ SerialThread::processJsonData(const QByteArray &jsonData)
         QJsonValue cmdValue = jsonObject["cmd"];
         QJsonValue extValue = jsonObject.value("ext");
         QJsonValue uartValue = jsonObject["uart"];
+        //记录 MCU 上报的环境温湿度(ext.at/ah),供图片水印使用:
+        //不是每条报文都带这两个字段,有值就刷新,缺失时保持上一次的值
+        if(extValue.isObject()){
+            const QJsonObject extObj = extValue.toObject();
+            auto refresh = [](const QJsonObject &obj, const QString &key, QString &dst){
+                const QJsonValue v = obj.value(key);
+                if(v.isUndefined() || v.isNull()) return;
+                const QString s = v.toVariant().toString().trimmed();
+                if(!s.isEmpty() && s != QStringLiteral("null")) dst = s;
+            };
+            refresh(extObj, QStringLiteral("at"), param::env_temp);   //环境温度
+            refresh(extObj, QStringLiteral("ah"), param::env_humi);   //湿度
+        }
         if(!uartValue.isNull()){
             sendData(m_json.BoardMessage());
         }

+ 2 - 0
q6_felgo_iot/src/mysql.cpp

@@ -48,6 +48,8 @@ QString param::lbs_lat;
 QString param::lbs_lng;
 QString param::gps_lat;
 QString param::gps_lng;
+QString param::env_temp;
+QString param::env_humi;
 QString param::gps_elevation;
 
 QString param::camera_type;