zhunk пре 5 месеци
родитељ
комит
4bd4acfb17

+ 10 - 20
app_bzy_armhf_7/android/src/com/yfkj/bzyv1/StatusBarCtr.java

@@ -179,28 +179,18 @@ public class StatusBarCtr {
 
 
     public static int getRsrp(Context context) {
-        TelephonyManager tm =
-                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-
-        if (tm == null) return -999;
-
-        if (ActivityCompat.checkSelfPermission(
-                context, Manifest.permission.ACCESS_FINE_LOCATION)
-                != PackageManager.PERMISSION_GRANTED) {
-            return -998;
+        if (ActivityCompat.checkSelfPermission(context, "android.permission.READ_PHONE_STATE")== PackageManager.PERMISSION_GRANTED) {
+            TelephonyManager tm =(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+            /* 获取信号强度 */
+           int fragmentMac1_SignalStrength = 0;
+           SignalStrength signalStrength = tm.getSignalStrength();
+           if(signalStrength != null){
+               fragmentMac1_SignalStrength = signalStrength.getLevel();
+               return fragmentMac1_SignalStrength;
+           }
         }
 
-        List<CellInfo> infos = tm.getAllCellInfo();
-        if (infos == null) return -997;
-
-        for (CellInfo info : infos) {
-            if (info instanceof CellInfoLte) {
-                CellSignalStrengthLte lte =
-                        ((CellInfoLte) info).getCellSignalStrength();
-                return lte.getRsrp();   // ⭐ LTE 核心指标
-            }
-        }
-        return -996;
+        return 0;
     }
 
     public String getICCID(Context context) {

+ 15 - 1
app_bzy_armhf_7/docs/Readme.md

@@ -1,3 +1,17 @@
+## 20260527
+    #define APP_VERSION "1.13.4"
+        1、完善信号强度的获取;
+## 20260519
+    #define APP_VERSION "1.12.4"
+        1、修复图片补录路径不存在导致重复失败,并且弹窗文字累计问题;
+        2、温控状态测试胶带无反应:增加弹窗提示;
+## 20260430
+    #define APP_VERSION "1.11.4"
+    1. 增加串口及MQTT消息展示,通过测试界面的按钮开关;
+## 20260425
+    #define APP_VERSION "1.10.4"
+    1. 修复立即拍照按钮执行完成后不恢复
+        处理措施:在关闭相机信号处理时,关闭按钮;
 ## 20260425
     #define APP_VERSION "1.10.3"
     1、qml界面优化
@@ -55,7 +69,7 @@
         "jsonrpc": "2.0",
         "method": "upload_log",
         "params": {
-          "filename": "run_log.2.txt"
+          "filename": "run_log.txt"
         },
         "id": 1
       }

+ 24 - 1
app_bzy_armhf_7/header/m_json.h

@@ -7,6 +7,8 @@
 #include <QJsonArray>
 #include <QObject>
 #include <QTime>
+#include <main.h>
+#include <m_loger.h>
 
 class JsonFunc : public QObject
 {
@@ -38,7 +40,28 @@ signals:
 public slots:
     void setmqttState_d();
     void setmqttState_c();
-
+private:
+    QString getLteRsrp()
+    {
+        auto qtContext = QJniObject(QNativeInterface::QAndroidApplication::context());    //activity
+        jint rsrp = QJniObject::callStaticMethod<jint>("com/yfkj/bzyv1/StatusBarCtr",
+                                                       "getRsrp",
+                                                       "(Landroid/content/Context;)I",
+                                                       qtContext.object());
+        LOG("信号强度:{}",rsrp);
+        if(rsrp==4){
+            return "优秀";
+        }else if(rsrp==3){
+            return "良好";
+        }else if (rsrp==2) {
+            return "一般";
+        } else if (rsrp==1){
+            return "差";
+        }else if (rsrp==0){
+            return "NoSignal";  // 无效值
+        }
+        return "NoSignal";  // 无效值
+    }
 };
 
 

+ 1 - 1
app_bzy_armhf_7/header/main.h

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

+ 2 - 0
app_bzy_armhf_7/header/mqtthandler.h

@@ -123,6 +123,8 @@ signals:
     void disconnected();
     void mqttclient_readSuccess(int recByte);
     void dataReceived(const QByteArray &message);
+    void messageSub(const QByteArray &message);
+    void messagePub(const QByteArray &message);
     void autotakephoto(bool stat);
     void appdownload();         //apk文件下载信号
     void updateStm32();         //rbl文件下载信号

+ 91 - 1
app_bzy_armhf_7/qml/Main.qml

@@ -1,5 +1,6 @@
 import QtQuick
-import Felgo 4.0
+import Felgo
+import QtQuick.Controls
 import "pages"
 import "common"
 import "logic"
@@ -19,6 +20,16 @@ App {
     property color cardColor: theme_select == "day" ? "#f5f5f5" :(theme_select == "night" ? "#2b2b2b":"#f5f5f5")           //背景色        //前景色
     property color fontColor: theme_select == "day" ? "black" :(theme_select == "night" ? "white":"black")
 
+    property bool floatPanel: false
+    property bool showTxData: false
+    property bool showRxData: false
+    property bool showPubData: false
+    property bool showSubData: false
+    property string floatPanel_title: "串口数据"
+
+
+    property string txDataLog: ""
+    property string rxDataLog: ""
 
 
     // 初始为纯黑色,强制设置为不透明,防止花屏
@@ -26,6 +37,7 @@ App {
     
     property string boardversionText: ""
     property string appversionText: ""
+    property bool tempProtectionState: false  // 温度保护状态,true表示处于保护状态
 
     property int logoutcnt
 
@@ -266,4 +278,82 @@ App {
         opacity: dataModel.userLoggedIn ? 0 : 1
         Behavior on opacity { NumberAnimation { duration: 250 } } // page fade in/out
     }
+    Rectangle {
+        id: rxFloatingWindow
+        visible: floatPanel
+        width: 400
+        height: 300
+        x: parent.width - 420
+        y: 20
+        color: "white"
+        opacity: 0.8  // 50% 透明度
+        radius: 10
+        z: 9999
+
+        Column {
+            anchors.fill: parent
+            anchors.margins: 10
+            spacing: 5
+
+            Row {
+                width: parent.width
+                spacing: 10
+                AppText {
+                    text: floatPanel_title
+                    color: "#00ffff"
+                    fontSize: 16
+                    font.bold: true
+                    anchors.verticalCenter: appbutton_clear.verticalCenter
+                }
+
+                AppButton {
+                    id: appbutton_clear
+                    text: "清空"
+                    textColor: "white"
+                    backgroundColor: "#ff4444"
+                    flat: false
+                    onClicked: {
+                        rxDataLog = ""
+                        txDataLog = ""
+                    }
+
+                }
+
+                // AppButton {
+                //     text: "X"
+                //     textColor: "white"
+                //     backgroundColor: "#ff4444"
+                //     flat: false
+                //     onClicked: {
+                //         rxSwitch.checked = false
+                //     }
+
+                // }
+            }
+
+            Flickable {
+                width: parent.width
+                height: parent.height - 40
+                contentWidth: width
+                contentHeight: txt_logdata.implicitHeight
+                clip: true
+
+                AppText {
+                    id: txt_logdata
+                    width: parent.width
+                    text: (showRxData ? rxDataLog : (showTxData ? txDataLog : "")) || (showSubData ? rxDataLog : (showPubData ? txDataLog : ""))
+                    color: "green"
+                    fontSize: 12
+                    wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                }
+            }
+        }
+
+        // 拖拽功能
+        MouseArea {
+            anchors.fill: parent
+            drag.target: rxFloatingWindow
+            drag.axis: Drag.XAndYAxis
+        }
+    }
 }

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

@@ -169,8 +169,10 @@ AppPage {
           if(jsonData.ext.tps){
               if("1"===jsonData.ext.tps){
                   text_tempture_sta.text = "保护:" + "["+ jsonData.ext.tpl +"]"
+                  app.tempProtectionState = true  // 更新温度保护状态为保护中
               }else{
                   text_tempture_sta.text = "正常:" + "["+ jsonData.ext.tpl +"]"
+                  app.tempProtectionState = false  // 更新温度保护状态为正常
               }
           }
           if(jsonData.ext.tph&&temp_setting.visible===false){

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

@@ -86,7 +86,7 @@ AppPage {
             if(success){
                 notificationtext.color = "green"
             }else{
-                notificationtext.text += error
+                notificationtext.text = error
                 notificationtext.color = "red"
             }
 

+ 137 - 2
app_bzy_armhf_7/qml/pages/TestPage.qml

@@ -82,6 +82,11 @@ AppPage {
                 output.visible= sta_cam
                 photoTimer.stop()       //停止计时器
                 //uvc_camera.visible  = true
+                //关闭相机重置按钮状态
+                focus_switch.enabled = true
+                focus_switch.checked = false
+                takephoto_switch.checked = false
+                takephoto_switch.enabled = true
             }
             console.log("相机状态改变",sta_cam)
         }
@@ -121,6 +126,25 @@ AppPage {
         }
     }
 
+    Connections{
+        target: mqtt
+
+        function onMessagePub(message) {
+            if(app.showPubData){
+                var time = new Date().toLocaleTimeString()
+                app.txDataLog = "[" + time + "] " + message + "\n" + app.txDataLog
+                if(app.txDataLog.length > 5000) app.txDataLog = app.txDataLog.substring(0, 5000)
+            }
+        }
+        function onMessageSub(message) {
+            if(app.showSubData){
+                var time = new Date().toLocaleTimeString()
+                app.rxDataLog = "[" + time + "] " + message + "\n" + app.rxDataLog
+                if(app.rxDataLog.length > 5000) app.rxDataLog = app.rxDataLog.substring(0, 5000)
+            }
+        }
+    }
+
     Connections {
         target: serial
         function onTakephotodone() {
@@ -128,6 +152,8 @@ AppPage {
             apptext_res.text = "立即拍照完成!"
             focus_switch.enabled = true
             focus_switch.checked = false
+            takephoto_switch.checked = false
+            takephoto_switch.enabled = true
         }
 
         function onAutotestdone() {
@@ -137,12 +163,28 @@ AppPage {
             autotest_switch.checked = false
         }
 
-        function onTranslatedone() {
+        onTranslatedone:function() {
             console.log("胶带传送完成!")
             apptext_res.text = "胶带传送完成!"
             jiaodai_switch.enabled = true
             jiaodai_switch.checked = false
         }
+
+        onDataReceived:function(data) {
+           if(app.showRxData){
+               var time = new Date().toLocaleTimeString()
+               app.rxDataLog = "[" + time + "] " + data + "\n" + app.rxDataLog
+               if(app.rxDataLog.length > 5000) app.rxDataLog = app.rxDataLog.substring(0, 5000)
+           }
+       }
+
+        onNetMessage:function(data) {
+           if(app.showTxData){
+               var time = new Date().toLocaleTimeString()
+               app.txDataLog = "[" + time + "] " + data + "\n" + app.txDataLog
+               if(app.txDataLog.length > 5000) app.txDataLog = app.txDataLog.substring(0, 5000)
+           }
+       }
     }
 
     SplitView{
@@ -318,6 +360,19 @@ AppPage {
                         id: jiaodai_switch
                         onToggled: {
                             if(jiaodai_switch.checked==true){
+                                // 检查是否处于温度保护状态
+                                if(app.tempProtectionState === true){
+                                    // 弹出提示对话框
+                                    nativeUtils.displayMessageBox(
+                                        "提示",
+                                        "当前处于温控状态,请解除温控后再进行测试胶带传送",
+                                        1
+                                    );
+                                    // 恢复开关状态为未选中
+                                    jiaodai_switch.checked = false;
+                                    return;
+                                }
+                                // 正常执行胶带测试
                                 //jiaodai_switch.enabled = false
                                 apptext_res.text = "胶带测试开始"
                                 serial.sendCmd("jiaodai",true,"","");
@@ -414,7 +469,7 @@ AppPage {
                         anchors.verticalCenter: parent.verticalCenter
                     }
                     ComboBox {
-                        width: parent.width - dp(60)  // 剩余宽度
+                        width: dp(100)  // 剩余宽度
                         height: dp(40)
                         model: ["Y轴"]
                         onCurrentIndexChanged: currentAxis = currentIndex
@@ -608,7 +663,87 @@ AppPage {
                             frames.cam_ExposureTime = text
                             console.log("设置曝光时间",text)
                         }
+                    }
+                }
+                Row {
+                    spacing: 100
 
+                    AppText{
+                        text: "显示Serial发送数据"
+                        color: app.fontColor
+                        fontSize: 15
+                        anchors.verticalCenter: txSwitch.verticalCenter
+                    }
+
+                    AppSwitch {
+                        id: txSwitch
+                        onToggled: {
+                            app.floatPanel = checked
+                            app.showTxData = checked
+                            app.floatPanel_title = "Serial发送数据"
+                        }
+                    }
+                }
+
+                Row {
+                    spacing: 100
+
+                    AppText{
+                        text: "显示Serial接收数据"
+                        color: app.fontColor
+                        fontSize: 15
+                        anchors.verticalCenter: rxSwitch.verticalCenter
+                    }
+
+                    AppSwitch {
+                        id: rxSwitch
+                        onToggled: {
+                            app.floatPanel = checked
+                            app.showRxData = checked
+                            app.floatPanel_title = "Serial接收数据"
+                        }
+                    }
+                }
+
+                Row {
+                    spacing: 100
+
+                    AppText{
+                        text: "显示MQTT发送数据"
+                        color: app.fontColor
+                        fontSize: 15
+                        anchors.verticalCenter: txSwitch.verticalCenter
+                    }
+
+                    AppSwitch {
+                        id: pubSwitch
+                        onToggled: {
+                            app.floatPanel = checked
+                            app.showPubData = checked
+                            app.showSubData = false
+                            app.floatPanel_title = "MQTT发送数据"
+                        }
+                    }
+                }
+
+                Row {
+                    spacing: 100
+
+                    AppText{
+                        text: "显示MQTT接收数据"
+                        color: app.fontColor
+                        fontSize: 15
+                        anchors.verticalCenter: txSwitch.verticalCenter
+                    }
+
+                    AppSwitch {
+                        id: subSwitch
+                        onToggled: {
+                            app.floatPanel = checked
+                            app.showSubData = checked
+                            app.showPubData = false
+                            app.floatPanel_title = "MQTT接收数据"
+                        }
                     }
                 }
             }

+ 1 - 1
app_bzy_armhf_7/src/m_json.cpp

@@ -122,7 +122,7 @@ JsonFunc::BoardMessage()
 
     // 安全处理网络状态
     net_value = param::net_alive ? "0" : "1";
-
+    param::csq = getLteRsrp();
     QByteArray transmitDataTemp;
     // 定义 { } 对象
     QJsonObject mesageObj;

+ 12 - 3
app_bzy_armhf_7/src/mqtthandler.cpp

@@ -81,10 +81,18 @@ MqttHandler::MqttHandler(QObject *parent)
             auto pendingImage = m_storage->getPendingImagePaths(1);
             if(pendingImage.isEmpty()){ERROR("无数据!");}
             for (const auto &item : pendingImage) {
-                int dbId = item.first;           // 数据库 id
+                int dbId = item.first;
                 QString path_image = item.second;
+
+                // 检查文件是否存在,不存在则删除数据库记录,避免死循环重传
+                QFileInfo fileInfo(path_image);
+                if (!fileInfo.exists() || !fileInfo.isFile()) {
+                    WARN("文件不存在,删除数据库记录 id:{} path:{}", dbId, path_image.toStdString());
+                    m_storage->markImageUploaded(path_image);
+                    continue;
+                }
+
                 LOG("触发重传,图片缓存路径:{} id:{}",path_image.toStdString(),dbId);
-                //发射信号开始上传
                 emit signal_reupload_image(path_image);
             }
         }else{
@@ -154,6 +162,7 @@ MqttHandler::disconnectFromBroker()
 void
 MqttHandler::publish_m(const QByteArray &message)
 {
+    emit messagePub(message);
     int res = -1;
     QMqttTopicName m_topic(param::mqtt_main_pub+param::imei);
     if(m_client->state() == QMqttClient::Connected)
@@ -232,7 +241,7 @@ MqttHandler::onDisconnected()
 void
 MqttHandler::onMessageReceived(const QByteArray &message, const QMqttTopicName &topic)
 {
-
+    emit messageSub(message);
     QJsonParseError error;
     this->m_client_dataBuf = message;
     this->m_client_rxByte += tc->toUnicode(m_client_dataBuf).length();

+ 392 - 15
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-04-27T16:40:20. -->
+<!-- Written by QtCreator 17.0.1, 2026-05-27T11:12:40. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -86,6 +86,10 @@
     <valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
     <value type="bool" key="ClangTools.UseGlobalSettings">true</value>
    </valuemap>
+   <valuemap type="QVariantMap" key="ClangdSettings">
+    <value type="bool" key="blockIndexing">false</value>
+    <value type="bool" key="useGlobalSettings">true</value>
+   </valuemap>
   </valuemap>
  </data>
  <data>
@@ -95,7 +99,7 @@
    <value type="bool" key="HasPerBcDcs">true</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">安卓 Qt 6.8.3 (android_arm64_v8a) Clang arm64-v8a</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">安卓 Qt 6.8.3 (android_arm64_v8a) Clang arm64-v8a</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{e189f30a-a10f-4d05-a2ec-de17da0b4fec}</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{e4f68da6-6ea7-4fc9-9e53-6e002ddfaa73}</value>
    <value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
@@ -104,27 +108,400 @@
     <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">-DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}
--DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF
--DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
+    <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}
+-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
 -DQT_MAINTENANCE_TOOL:FILEPATH=D:/Qt/Felgo/MaintenanceTool.exe
--DCMAKE_BUILD_TYPE:STRING=Release
 -DANDROID_ABI:STRING=arm64-v8a
 -DANDROID_NDK:PATH=F:/Android_Env/android_sdk/ndk/27.2.12479018
--DQT_USE_TARGET_ANDROID_BUILD_DIR:BOOL=ON
+-DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF
 -DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
--DANDROID_SDK_ROOT:PATH=F:/Android_Env/android_sdk
+-DANDROID_PLATFORM:STRING=android-23
 -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
+-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>
+    <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">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="QString" key="CMakeProjectManager.MakeStep.BuildPreset"></value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
+       <value type="QString">all</value>
+      </valuelist>
+      <value type="bool" key="CMakeProjectManager.MakeStep.ClearSystemEnvironment">false</value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.UserEnvironmentChanges"/>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="QString" key="BuildTargetSdk">android-36</value>
+      <value type="QString" key="BuildToolsVersion"></value>
+      <value type="QString" key="KeystoreLocation">F:/QT_WorkSpace/qt6_iot_all/key/android_release.keystore</value>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建安卓 APK</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmakeProjectManager.AndroidBuildApkStep</value>
+     </valuemap>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">构建</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="QString" key="CMakeProjectManager.MakeStep.BuildPreset"></value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
+       <value type="QString">clean</value>
+      </valuelist>
+      <value type="bool" key="CMakeProjectManager.MakeStep.ClearSystemEnvironment">false</value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.UserEnvironmentChanges"/>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">清除</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">清除</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release (imported)</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
+    <value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+    <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidDeployQtStep</value>
+      </valuemap>
+      <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">部署</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">部署</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+     <valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
+     <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidDeployConfiguration2</value>
+    </valuemap>
+    <value type="qlonglong" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings">
+     <valuelist type="QVariantList" key="AndroidDeviceAbis">
+      <value type="QString">arm64-v8a</value>
+      <value type="QString">armeabi-v7a</value>
+      <value type="QString">armeabi</value>
+     </valuelist>
+     <value type="QString" key="AndroidDeviceSerialNumber">6fd587f33738dc9f</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>
+     <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+     <value type="int" key="Analyzer.Valgrind.Callgrind.CostFormat">0</value>
+     <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+     <value type="QList&lt;int&gt;" key="Analyzer.Valgrind.VisibleErrorKinds"></value>
+     <valuelist type="QVariantList" key="Android.PostStartShellCmdListKey">
+      <value type="QString"></value>
+     </valuelist>
+     <valuelist type="QVariantList" key="Android.PreStartShellCmdListKey">
+      <value type="QString"></value>
+     </valuelist>
+     <valuelist type="QVariantList" key="CustomOutputParsers"/>
+     <value type="int" key="PE.EnvironmentAspect.Base">0</value>
+     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+     <value type="bool" key="PE.EnvironmentAspect.PrintOnRun">false</value>
+     <value type="QString" key="PerfRecordArgsId">-e cpu-cycles --call-graph &quot;dwarf,4096&quot; -F 250</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">q6_felgo_iot</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidRunConfiguration:</value>
+     <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">q6_felgo_iot</value>
+     <value type="bool" key="ProjectExplorer.RunConfiguration.Customized">true</value>
+     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+    </valuemap>
+    <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+   </valuemap>
+   <value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidDeployQtStep</value>
+     </valuemap>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">部署</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">部署</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
+    <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidDeployConfiguration2</value>
+   </valuemap>
+   <value type="qlonglong" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <value type="int" key="Analyzer.Valgrind.Callgrind.CostFormat">0</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="QList&lt;int&gt;" key="Analyzer.Valgrind.VisibleErrorKinds"></value>
+    <valuelist type="QVariantList" key="Android.PostStartShellCmdListKey">
+     <value type="QString"></value>
+    </valuelist>
+    <valuelist type="QVariantList" key="Android.PreStartShellCmdListKey">
+     <value type="QString"></value>
+    </valuelist>
+    <valuelist type="QVariantList" key="CustomOutputParsers"/>
+    <value type="int" key="PE.EnvironmentAspect.Base">0</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="bool" key="PE.EnvironmentAspect.PrintOnRun">false</value>
+    <value type="QString" key="PerfRecordArgsId">-e cpu-cycles --call-graph &quot;dwarf,4096&quot; -F 250</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">q6_felgo_iot</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidRunConfiguration:</value>
+    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">q6_felgo_iot</value>
+    <value type="bool" key="ProjectExplorer.RunConfiguration.Customized">true</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+   </valuemap>
+   <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.1</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="DeviceType">Android.Device.Type</value>
+   <value type="bool" key="HasPerBcDcs">true</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">安卓 Qt 6.8.3 (android_arm64_v8a) Clang arm64-v8a</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">安卓 Qt 6.8.3 (android_arm64_v8a) Clang arm64-v8a</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{fce595d6-9d6c-455c-83a2-aa4fab7f3763}</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+    <value type="QString" key="CMake.Build.Type">Release</value>
+    <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_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF
+-DCMAKE_BUILD_TYPE:STRING=Release
+-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
 -DCMAKE_GENERATOR:STRING=Ninja
+-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
+-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
+-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
+-DCMAKE_TOOLCHAIN_FILE:FILEPATH=F:/Android_Env/android_sdk/ndk/25.1.8937393/build/cmake/android.toolchain.cmake
 -DCMAKE_COLOR_DIAGNOSTICS:BOOL=ON
 -DANDROID_PLATFORM:STRING=android-23
--DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
+-DQT_USE_TARGET_ANDROID_BUILD_DIR:BOOL=ON
+-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
 -DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
+-DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON
+-DANDROID_ABI:STRING=arm64-v8a
+-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
+-DANDROID_NDK:PATH=F:/Android_Env/android_sdk/ndk/25.1.8937393
+-DANDROID_STL:STRING=c++_shared
+-DQT_MAINTENANCE_TOOL:FILEPATH=D:/Qt/Felgo/MaintenanceTool.exe
+-DANDROID_SDK_ROOT:PATH=F:/Android_Env/android_sdk
+-DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}</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.BuildStepList.Step.0">
+      <value type="QString" key="CMakeProjectManager.MakeStep.BuildPreset"></value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
+       <value type="QString">all</value>
+      </valuelist>
+      <value type="bool" key="CMakeProjectManager.MakeStep.ClearSystemEnvironment">false</value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.UserEnvironmentChanges"/>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="QString" key="BuildTargetSdk">android-36</value>
+      <value type="QString" key="BuildToolsVersion"></value>
+      <value type="QString" key="KeystoreLocation">F:/QT_WorkSpace/qt6_iot_all/key/android_release.keystore</value>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建安卓 APK</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmakeProjectManager.AndroidBuildApkStep</value>
+     </valuemap>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">构建</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="QString" key="CMakeProjectManager.MakeStep.BuildPreset"></value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
+       <value type="QString">clean</value>
+      </valuelist>
+      <value type="bool" key="CMakeProjectManager.MakeStep.ClearSystemEnvironment">false</value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.UserEnvironmentChanges"/>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">清除</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">清除</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
+    <value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+    <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidDeployQtStep</value>
+      </valuemap>
+      <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">部署</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">部署</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+     <valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
+     <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidDeployConfiguration2</value>
+    </valuemap>
+    <value type="qlonglong" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings">
+     <valuelist type="QVariantList" key="AndroidDeviceAbis">
+      <value type="QString">arm64-v8a</value>
+      <value type="QString">armeabi-v7a</value>
+      <value type="QString">armeabi</value>
+     </valuelist>
+     <value type="QString" key="AndroidDeviceSerialNumber">6fd587f33738dc9f</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>
+     <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+     <value type="int" key="Analyzer.Valgrind.Callgrind.CostFormat">0</value>
+     <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+     <value type="QList&lt;int&gt;" key="Analyzer.Valgrind.VisibleErrorKinds"></value>
+     <valuelist type="QVariantList" key="Android.PostStartShellCmdListKey">
+      <value type="QString"></value>
+     </valuelist>
+     <valuelist type="QVariantList" key="Android.PreStartShellCmdListKey">
+      <value type="QString"></value>
+     </valuelist>
+     <valuelist type="QVariantList" key="CustomOutputParsers"/>
+     <value type="int" key="PE.EnvironmentAspect.Base">0</value>
+     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+     <value type="bool" key="PE.EnvironmentAspect.PrintOnRun">false</value>
+     <value type="QString" key="PerfRecordArgsId">-e cpu-cycles --call-graph &quot;dwarf,4096&quot; -F 250</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">q6_felgo_iot</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidRunConfiguration:</value>
+     <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">q6_felgo_iot</value>
+     <value type="bool" key="ProjectExplorer.RunConfiguration.Customized">false</value>
+     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+    </valuemap>
+    <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+   </valuemap>
+   <value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidDeployQtStep</value>
+     </valuemap>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">部署</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">部署</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
+    <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidDeployConfiguration2</value>
+   </valuemap>
+   <value type="qlonglong" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <value type="int" key="Analyzer.Valgrind.Callgrind.CostFormat">0</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="QList&lt;int&gt;" key="Analyzer.Valgrind.VisibleErrorKinds"></value>
+    <valuelist type="QVariantList" key="Android.PostStartShellCmdListKey">
+     <value type="QString"></value>
+    </valuelist>
+    <valuelist type="QVariantList" key="Android.PreStartShellCmdListKey">
+     <value type="QString"></value>
+    </valuelist>
+    <valuelist type="QVariantList" key="CustomOutputParsers"/>
+    <value type="int" key="PE.EnvironmentAspect.Base">0</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="bool" key="PE.EnvironmentAspect.PrintOnRun">false</value>
+    <value type="QString" key="PerfRecordArgsId">-e cpu-cycles --call-graph &quot;dwarf,4096&quot; -F 250</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">q6_felgo_iot</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidRunConfiguration:</value>
+    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">q6_felgo_iot</value>
+    <value type="bool" key="ProjectExplorer.RunConfiguration.Customized">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+   </valuemap>
+   <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.2</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="DeviceType">Android.Device.Type</value>
+   <value type="bool" key="HasPerBcDcs">true</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">安卓 Qt 6.8.3 (android_arm64_v8a) Clang arm64-v8a</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">安卓 Qt 6.8.3 (android_arm64_v8a) Clang arm64-v8a</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{e189f30a-a10f-4d05-a2ec-de17da0b4fec}</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+    <value type="QString" key="CMake.Build.Type">Release</value>
+    <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">-DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON
+-DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}
+-DCMAKE_TOOLCHAIN_FILE:FILEPATH=F:/Android_Env/android_sdk/ndk/25.1.8937393/build/cmake/android.toolchain.cmake
+-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
+-DQT_USE_TARGET_ANDROID_BUILD_DIR:BOOL=ON
+-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
+-DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
+-DANDROID_NDK:PATH=F:/Android_Env/android_sdk/ndk/25.1.8937393
+-DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF
+-DQT_MAINTENANCE_TOOL:FILEPATH=D:/Qt/Felgo/MaintenanceTool.exe
 -DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
--DCMAKE_PREFIX_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_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
+-DCMAKE_COLOR_DIAGNOSTICS:BOOL=ON
 -DANDROID_STL:STRING=c++_shared
--DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON</value>
+-DANDROID_ABI:STRING=arm64-v8a
+-DANDROID_SDK_ROOT:PATH=F:/Android_Env/android_sdk
+-DCMAKE_BUILD_TYPE:STRING=Release
+-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
+-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
+-DCMAKE_GENERATOR:STRING=Ninja
+-DANDROID_PLATFORM:STRING=android-23</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.BuildStepList.Step.0">
@@ -223,7 +600,7 @@
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">q6_felgo_iot</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidRunConfiguration:</value>
      <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">q6_felgo_iot</value>
-     <value type="bool" key="ProjectExplorer.RunConfiguration.Customized">true</value>
+     <value type="bool" key="ProjectExplorer.RunConfiguration.Customized">false</value>
      <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
      <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
     </valuemap>
@@ -267,7 +644,7 @@
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">q6_felgo_iot</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidRunConfiguration:</value>
     <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">q6_felgo_iot</value>
-    <value type="bool" key="ProjectExplorer.RunConfiguration.Customized">true</value>
+    <value type="bool" key="ProjectExplorer.RunConfiguration.Customized">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
    </valuemap>
@@ -276,7 +653,7 @@
  </data>
  <data>
   <variable>ProjectExplorer.Project.TargetCount</variable>
-  <value type="qlonglong">1</value>
+  <value type="qlonglong">3</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.Updater.FileVersion</variable>

+ 10 - 20
q6_felgo_iot/android/src/com/yfkj/cb/Q6iot/StatusBarCtr.java

@@ -179,28 +179,18 @@ public class StatusBarCtr {
 
 
     public static int getRsrp(Context context) {
-        TelephonyManager tm =
-                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-
-        if (tm == null) return -999;
-
-        if (ActivityCompat.checkSelfPermission(
-                context, Manifest.permission.ACCESS_FINE_LOCATION)
-                != PackageManager.PERMISSION_GRANTED) {
-            return -998;
+        if (ActivityCompat.checkSelfPermission(context, "android.permission.READ_PHONE_STATE")== PackageManager.PERMISSION_GRANTED) {
+            TelephonyManager tm =(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+            /* 获取信号强度 */
+           int fragmentMac1_SignalStrength = 0;
+           SignalStrength signalStrength = tm.getSignalStrength();
+           if(signalStrength != null){
+               fragmentMac1_SignalStrength = signalStrength.getLevel();
+               return fragmentMac1_SignalStrength;
+           }
         }
 
-        List<CellInfo> infos = tm.getAllCellInfo();
-        if (infos == null) return -997;
-
-        for (CellInfo info : infos) {
-            if (info instanceof CellInfoLte) {
-                CellSignalStrengthLte lte =
-                        ((CellInfoLte) info).getCellSignalStrength();
-                return lte.getRsrp();   // ⭐ LTE 核心指标
-            }
-        }
-        return -996;
+        return 0;
     }
 
     public String getICCID(Context context) {

+ 20 - 0
q6_felgo_iot/docs/Readme.md

@@ -1,3 +1,23 @@
+
+
+## 20260527
+     #define APP_VERSION "1.10.28"
+     1. 改进信号强度获取;
+## 20260526
+    #define APP_VERSION "1.10.27"
+        1、温控保护测试胶带无反应:增加弹窗提示;
+## 20260519
+    #define APP_VERSION "1.9.27"
+        1、修复图片补录路径不存在导致重复失败,并且弹窗文字累计问题;
+        [2026-05-19 01:59:21.091] [yf_logger] [info] [mqtthandler.cpp:79] 图片重传:2!
+        [2026-05-19 01:59:21.093] [yf_logger] [info] [app_sq_save.cpp:238] getPendingImagePaths...
+        [2026-05-19 01:59:21.097] [yf_logger] [info] [mqtthandler.cpp:86] 触发重传,图片缓存路径:/storage/emulated/0/Android/data/com.yfkj.cb.Q6iot/files/Pictures/2026/05/05/20260505160033/20260505160405z0x0.jpg id:283
+        [2026-05-19 01:59:21.097] [yf_logger] [info] [app_curlFunc.cpp:26] uploadFileAsync...
+        [2026-05-19 01:59:21.787] [yf_logger] [warning] [cameramanager.cpp:599] 上传失败:Cannot open local file: /storage/emulated/0/Android/data/com.yfkj.cb.Q6iot/files/Pictures/2026/05/05/20260505160033/20260505160405z0x0.jpg
+## 20260429
+    #define APP_VERSION "1.9.26"
+        1、曝光设置在屏幕设置完后,保存到相机配置中;
+        2、增加串口信息和MQTT信息的悬浮框展示;
 ## 20260427
     #define APP_VERSION "1.9.26"
         1、优化系统设置界面:profilepage.qml

+ 20 - 27
q6_felgo_iot/header/m_json.h

@@ -6,9 +6,9 @@
 #include <QJsonParseError>
 #include <QJsonArray>
 #include <QObject>
-#include <QTextCodec>
 #include <QTime>
-#include <QProcess>
+#include <main.h>
+#include <m_loger.h>
 
 class JsonFunc : public QObject
 {
@@ -29,7 +29,9 @@ public:
     QByteArray CmdUpdate();
     QByteArray CmdReboot();
     QByteArray CmdParamconf(int sh1,int eh1,int sh2,int eh2,int sh3,int eh3);
+    QByteArray CmdParamconf_min(int sh1,int eh1,int sh2,int eh2,int sh3,int eh3);
     QByteArray CmdParamconf_xy_dis(int x_dis,int y_dis);
+    QByteArray CmdParamconf_temp(int tpl,int tph);
     QByteArray CmdFocus();
     QByteArray WarnPhoto(QString err);
 signals:
@@ -41,34 +43,25 @@ public slots:
 private:
     QString getLteRsrp()
     {
-        QProcess proc;
-        QStringList args;
-        args << "-c"
-             << "dumpsys telephony.registry | grep -o \"rsrp=-[0-9]*\" | head -n 1";
-
-        proc.start("sh", args);
-        proc.waitForFinished(1000);
-
-        QString out = QString::fromLocal8Bit(proc.readAllStandardOutput()).trimmed();
-
-        // out 形如: "rsrp=-103"
-        QRegularExpression re("rsrp=(-?\\d+)");
-        QRegularExpressionMatch match = re.match(out);
-        if (match.hasMatch()) {
-            if(match.captured(1).toInt()>=-80){
-                return "优秀";
-            }else if(match.captured(1).toInt()>=-90){
-                return "良好";
-            }else if (match.captured(1).toInt()>=-105) {
-                return "一般";
-            } else {
-                return "差";
-            }
+        auto qtContext = QJniObject(QNativeInterface::QAndroidApplication::context());    //activity
+        jint rsrp = QJniObject::callStaticMethod<jint>("com/yfkj/cb/Q6iot/StatusBarCtr",
+                                                       "getRsrp",
+                                                       "(Landroid/content/Context;)I",
+                                                       qtContext.object());
+        LOG("信号强度:{}",rsrp);
+        if(rsrp==4){
+            return "优秀";
+        }else if(rsrp==3){
+            return "良好";
+        }else if (rsrp==2) {
+            return "一般";
+        } else if (rsrp==1){
+            return "差";
+        }else if (rsrp==0){
+            return "NoSignal";  // 无效值
         }
-
         return "NoSignal";  // 无效值
     }
-
 };
 
 

+ 1 - 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.9.26"
+#define APP_VERSION "1.10.28"
 
 using namespace std;
 

+ 2 - 0
q6_felgo_iot/header/mqtthandler.h

@@ -125,6 +125,8 @@ signals:
     void disconnected();
     void mqttclient_readSuccess(int recByte);
     void dataReceived(const QByteArray &message);
+    void messageSub(const QByteArray &message);
+    void messagePub(const QByteArray &message);
     void autotakephoto(bool stat);
     void appdownload();         //apk文件下载信号
     void updateStm32();         //rbl文件下载信号

+ 8 - 0
q6_felgo_iot/header/mserial.h

@@ -70,6 +70,14 @@ public:
         sendData(m_json.CmdParamconf(sh1,eh1,sh2,eh2,sh3,eh3));
     }
 
+    Q_INVOKABLE void setCollt_min(int sh1 ,int eh1,int sh2,int eh2,int sh3,int eh3){
+        sendData(m_json.CmdParamconf_min(sh1,eh1,sh2,eh2,sh3,eh3));
+    }
+
+    Q_INVOKABLE void setTempconf(int tpl ,int tph){
+        sendData(m_json.CmdParamconf_temp(tpl,tph));
+    }
+
     Q_INVOKABLE void setHt_xy_dis(int xdis ,int ydis){
         sendData(m_json.CmdParamconf_xy_dis(xdis,ydis));
     }

+ 95 - 1
q6_felgo_iot/qml/Main.qml

@@ -1,5 +1,6 @@
 import QtQuick
-import Felgo 4.0
+import Felgo
+import QtQuick.Controls
 import "pages"
 import "common"
 import "logic"
@@ -19,14 +20,25 @@ App {
     property color cardColor: theme_select == "day" ? "#f5f5f5" :(theme_select == "night" ? "#2b2b2b":"#f5f5f5")           //背景色        //前景色
     property color fontColor: theme_select == "day" ? "black" :(theme_select == "night" ? "white":"black")
 
+    property bool floatPanel: false
+    property bool showTxData: false
+    property bool showRxData: false
+    property bool showPubData: false
+    property bool showSubData: false
+    property string floatPanel_title: "串口数据"
 
 
+    property string txDataLog: ""
+    property string rxDataLog: ""
+
     // 初始为纯黑色,强制设置为不透明,防止花屏
     color: "#000000"
 
     property string boardversionText: ""
     property string appversionText: ""
 
+    property bool tempProtectionState: false  // 温度保护状态,true表示处于保护状态
+
     property int logoutcnt
 
     signal logoutClicked
@@ -266,4 +278,86 @@ App {
         opacity: dataModel.userLoggedIn ? 0 : 1
         Behavior on opacity { NumberAnimation { duration: 250 } } // page fade in/out
     }
+
+
+
+    Rectangle {
+        id: rxFloatingWindow
+        visible: floatPanel
+        width: 400
+        height: 300
+        x: parent.width - 420
+        y: 20
+        color: "white"
+        opacity: 0.8  // 50% 透明度
+        radius: 10
+        z: 9999
+
+        Column {
+            anchors.fill: parent
+            anchors.margins: 10
+            spacing: 5
+
+            Row {
+                width: parent.width
+                spacing: 10
+                AppText {
+                    text: floatPanel_title
+                    color: "#00ffff"
+                    fontSize: 16
+                    font.bold: true
+                    anchors.verticalCenter: appbutton_clear.verticalCenter
+                }
+
+                AppButton {
+                    id: appbutton_clear
+                    text: "清空"
+                    textColor: "white"
+                    backgroundColor: "#ff4444"
+                    flat: false
+                    onClicked: {
+                        rxDataLog = ""
+                        txDataLog = ""
+                    }
+
+                }
+
+                // AppButton {
+                //     text: "X"
+                //     textColor: "white"
+                //     backgroundColor: "#ff4444"
+                //     flat: false
+                //     onClicked: {
+                //         rxSwitch.checked = false
+                //     }
+
+                // }
+            }
+
+            Flickable {
+                width: parent.width
+                height: parent.height - 40
+                contentWidth: width
+                contentHeight: txt_logdata.implicitHeight
+                clip: true
+
+                AppText {
+                    id: txt_logdata
+                    width: parent.width
+                    text: (showRxData ? rxDataLog : (showTxData ? txDataLog : "")) || (showSubData ? rxDataLog : (showPubData ? txDataLog : ""))
+                    color: "green"
+                    fontSize: 12
+                    wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                }
+            }
+        }
+
+        // 拖拽功能
+        MouseArea {
+            anchors.fill: parent
+            drag.target: rxFloatingWindow
+            drag.axis: Drag.XAndYAxis
+        }
+    }
+
 }

+ 2 - 0
q6_felgo_iot/qml/pages/HomePage.qml

@@ -169,8 +169,10 @@ AppPage {
           if(jsonData.ext.tps){
               if("1"===jsonData.ext.tps){
                   text_tempture_sta.text = "保护:" + "["+ jsonData.ext.tpl +"]"
+                  app.tempProtectionState = true
               }else{
                   text_tempture_sta.text = "正常:" + "["+ jsonData.ext.tpl +"]"
+                  app.tempProtectionState = false
               }
           }
           if(jsonData.ext.tph&&temp_setting.visible===false){

+ 1 - 2
q6_felgo_iot/qml/pages/LocalNotificationPage.qml

@@ -86,11 +86,10 @@ AppPage {
             if(success){
                 notificationtext.color = "green"
             }else{
-                notificationtext.text += error
+                notificationtext.text = error
                 notificationtext.color = "red"
             }
 
-
         }
     }
 

+ 136 - 2
q6_felgo_iot/qml/pages/TestPage.qml

@@ -37,7 +37,6 @@ AppPage {
             console.log("相机已打开")
             photoTimer.interval=60*1000
             photoTimer.start()
-
         }else{
             frames.camera_sw = true
             console.log("打开相机单次拍照!")
@@ -126,6 +125,25 @@ AppPage {
     }
 
     Connections{
+        target: mqtt
+
+        function onMessagePub(message) {
+            if(app.showPubData){
+                var time = new Date().toLocaleTimeString()
+                app.txDataLog = "[" + time + "] " + message + "\n" + app.txDataLog
+                if(app.txDataLog.length > 5000) app.txDataLog = app.txDataLog.substring(0, 5000)
+            }
+        }
+        function onMessageSub(message) {
+            if(app.showSubData){
+                var time = new Date().toLocaleTimeString()
+                app.rxDataLog = "[" + time + "] " + message + "\n" + app.rxDataLog
+                if(app.rxDataLog.length > 5000) app.rxDataLog = app.rxDataLog.substring(0, 5000)
+            }
+        }
+    }
+
+    Connections{
         target: serial
         onTakephotodone:{
             console.log("立即拍照完成!")
@@ -133,18 +151,35 @@ AppPage {
             focus_switch.enabled = true
             focus_switch.checked = false
         }
+
         onAutotestdone: {
             console.log("自动对焦完成!")
             apptext_res.text = "自动对焦完成!"
             autotest_switch.enabled = true
             autotest_switch.checked = false
         }
+
         onTranslatedone: {
             console.log("胶带传送完成!")
             apptext_res.text = "胶带传送完成!"
             jiaodai_switch.enabled = true
             jiaodai_switch.checked = false
         }
+
+         onDataReceived:function(data) {
+            if(app.showRxData){
+                var time = new Date().toLocaleTimeString()
+                app.rxDataLog = "[" + time + "] " + data + "\n" + app.rxDataLog
+                if(app.rxDataLog.length > 5000) app.rxDataLog = app.rxDataLog.substring(0, 5000)
+            }
+        }
+         onNetMessage:function(data) {
+            if(app.showTxData){
+                var time = new Date().toLocaleTimeString()
+                app.txDataLog = "[" + time + "] " + data + "\n" + app.txDataLog
+                if(app.txDataLog.length > 5000) app.txDataLog = app.txDataLog.substring(0, 5000)
+            }
+        }
     }
 
 
@@ -346,6 +381,19 @@ AppPage {
                         id: jiaodai_switch
                         onToggled: {
                             if(jiaodai_switch.checked==true){
+                                // 检查是否处于温度保护状态
+                                if(app.tempProtectionState === true){
+                                    // 弹出提示对话框
+                                    nativeUtils.displayMessageBox(
+                                        "提示",
+                                        "当前处于温控状态,请解除温控后再进行测试胶带传送",
+                                        1
+                                    );
+                                    // 恢复开关状态为未选中
+                                    jiaodai_switch.checked = false;
+                                    return;
+                                }
+                                // 正常执行胶带测试
                                 //jiaodai_switch.enabled = false
                                 apptext_res.text = "胶带测试开始"
                                 serial.sendCmd("jiaodai",true,"","");
@@ -440,10 +488,11 @@ AppPage {
                     AppText {
                         text: "选择轴:"
                         width: dp(60)  // 固定文本宽度
+                        color: app.fontColor
                         anchors.verticalCenter: parent.verticalCenter
                     }
                     ComboBox {
-                        width: parent.width - dp(60)  // 剩余宽度
+                        width: parent.width - dp(100)  // 剩余宽度
                         height: dp(40)
                         model: ["X轴", "Y轴", "Z轴"]
                         onCurrentIndexChanged: currentAxis = currentIndex
@@ -483,6 +532,7 @@ AppPage {
                     AppText {
                         text: "速度:"
                         width: dp(40)  // 固定文本宽度
+                        color: app.fontColor
                         anchors.verticalCenter: parent.verticalCenter
 
                     }
@@ -508,6 +558,7 @@ AppPage {
                     AppText {
                         text: "步进脉冲次数:"
                         width: dp(120)  // 固定文本宽度
+                        color: app.fontColor
                         anchors.verticalCenter: parent.verticalCenter
                     }
                     AppTextField {
@@ -637,6 +688,7 @@ AppPage {
                     AppText {
                         id: txt_fExposureTime
                         text: "曝光值:"
+                        color: app.fontColor
                     }
 
                     AppTextField {
@@ -672,6 +724,88 @@ AppPage {
 
                     }
                 }
+
+                Row {
+                    spacing: 100
+
+                    AppText{
+                        text: "显示Serial发送数据"
+                        color: app.fontColor
+                        fontSize: 15
+                        anchors.verticalCenter: txSwitch.verticalCenter
+                    }
+
+                    AppSwitch {
+                        id: txSwitch
+                        onToggled: {
+                            app.floatPanel = checked
+                            app.showTxData = checked
+                            app.floatPanel_title = "Serial发送数据"
+                        }
+                    }
+                }
+
+                Row {
+                    spacing: 100
+
+                    AppText{
+                        text: "显示Serial接收数据"
+                        color: app.fontColor
+                        fontSize: 15
+                        anchors.verticalCenter: rxSwitch.verticalCenter
+                    }
+
+                    AppSwitch {
+                        id: rxSwitch
+                        onToggled: {
+                            app.floatPanel = checked
+                            app.showRxData = checked
+                            app.floatPanel_title = "Serial接收数据"
+                        }
+                    }
+                }
+
+                Row {
+                    spacing: 100
+
+                    AppText{
+                        text: "显示MQTT发送数据"
+                        color: app.fontColor
+                        fontSize: 15
+                        anchors.verticalCenter: txSwitch.verticalCenter
+                    }
+
+                    AppSwitch {
+                        id: pubSwitch
+                        onToggled: {
+                            app.floatPanel = checked
+                            app.showPubData = checked
+                            app.showSubData = false
+                            app.floatPanel_title = "MQTT发送数据"
+                        }
+                    }
+                }
+
+                Row {
+                    spacing: 100
+
+                    AppText{
+                        text: "显示MQTT接收数据"
+                        color: app.fontColor
+                        fontSize: 15
+                        anchors.verticalCenter: txSwitch.verticalCenter
+                    }
+
+                    AppSwitch {
+                        id: subSwitch
+                        onToggled: {
+                            app.floatPanel = checked
+                            app.showSubData = checked
+                            app.showPubData = false
+                            app.floatPanel_title = "MQTT接收数据"
+                        }
+                    }
+                }
             }
         }
     }

+ 10 - 6
q6_felgo_iot/src/app_sq_save.cpp

@@ -73,9 +73,9 @@ bool OfflineStorage::cacheJsonMessage(const QString &topic, const QByteArray &js
     // 获取当前本地时间(基于系统时区)
     QDateTime localNow = QDateTime::currentDateTime();
     qint64 secTimestamp = localNow.toSecsSinceEpoch();
-    qDebug() << "本地秒级时间戳:" << secTimestamp;
+    LOG("本地秒级时间戳:{}",secTimestamp);
     if (!m_jsonCacheEnabled) {
-        qWarning() << "JSON缓存已禁用,拒绝缓存数据";
+        WARN("JSON缓存已禁用,拒绝缓存数据");
         return false;
     }
     QSqlQuery query(m_db);
@@ -116,7 +116,7 @@ bool OfflineStorage::cacheImagePath_Real(const QString &imagePath)
     // 获取当前本地时间(基于系统时区)
     QDateTime localNow = QDateTime::currentDateTime();
     qint64 secTimestamp = localNow.toSecsSinceEpoch();
-    qDebug() << "本地秒级时间戳:" << secTimestamp;
+    LOG("本地秒级时间戳:{}",secTimestamp);
     if (!m_imageCacheEnabled) {
         qWarning() << "图片缓存已禁用,拒绝缓存路径";
         return false;
@@ -129,7 +129,9 @@ bool OfflineStorage::cacheImagePath_Real(const QString &imagePath)
     // 1. 检查原文件是否存在
     QFileInfo originalFile(imagePath);
     if (!originalFile.exists()) {
-        qWarning() << "原文件不存在:" << imagePath;
+        WARN("原文件不存在:{}",imagePath.toStdString());
+        //删除此纪录
+        markImageUploaded(imagePath);
         return false;
     }
     // 2. 检查是否为文件(非目录)
@@ -152,7 +154,7 @@ bool OfflineStorage::cacheImagePath(const QString &imagePath)
     // 获取当前本地时间(基于系统时区)
     QDateTime localNow = QDateTime::currentDateTime();
     qint64 secTimestamp = localNow.toSecsSinceEpoch();
-    qDebug() << "本地秒级时间戳:" << secTimestamp;
+    LOG("本地秒级时间戳:{}",secTimestamp);
     if (!m_imageCacheEnabled) {
         qWarning() << "图片缓存已禁用,拒绝缓存路径";
         return false;
@@ -166,7 +168,9 @@ bool OfflineStorage::cacheImagePath(const QString &imagePath)
     // 1. 检查原文件是否存在
     QFileInfo originalFile(imagePath);
     if (!originalFile.exists()) {
-        qWarning() << "原文件不存在:" << imagePath;
+        WARN("原文件不存在:{}",imagePath.toStdString());
+        //删除此纪录
+        markImageUploaded(imagePath);
         return false;
     }
     // 2. 检查是否为文件(非目录)

+ 9 - 0
q6_felgo_iot/src/cameramanager.cpp

@@ -563,6 +563,15 @@ Frames::setExposureTime(const QString &exptime)
         }else{
             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();
 }

+ 36 - 0
q6_felgo_iot/src/m_json.cpp

@@ -292,6 +292,25 @@ JsonFunc::CmdParamconf(int sh1,int eh1,int sh2,int eh2,int sh3,int eh3){
 }
 
 QByteArray
+JsonFunc::CmdParamconf_min(int sh1,int eh1,int sh2,int eh2,int sh3,int eh3){
+    QByteArray transmitDataTemp;
+    QJsonObject mesageObj;
+    QJsonObject mesageObjext;
+    QJsonArray collTimeArray;
+    mesageObj.insert("cmd","paramconf");
+    collTimeArray.append(QString("%1-%2").arg(sh1).arg(eh1));
+    collTimeArray.append(QString("%1-%2").arg(sh2).arg(eh2));
+    collTimeArray.append(QString("%1-%2").arg(sh3).arg(eh3));
+    mesageObjext.insert("coll_min",collTimeArray);
+    mesageObj.insert("ext",mesageObjext);
+
+    QJsonDocument document=QJsonDocument(mesageObj);
+    transmitDataTemp = document.toJson();
+    transmitDataTemp = transmitDataTemp.trimmed();  //去除字符串两端的空格和换行符
+    return transmitDataTemp;
+}
+
+QByteArray
 JsonFunc::CmdParamconf_xy_dis(int x_dis,int y_dis){
     QByteArray transmitDataTemp;
     QJsonObject mesageObj;
@@ -308,6 +327,23 @@ JsonFunc::CmdParamconf_xy_dis(int x_dis,int y_dis){
 }
 
 QByteArray
+JsonFunc::CmdParamconf_temp(int tpl,int tph)
+{
+    QByteArray transmitDataTemp;
+    QJsonObject mesageObj;
+    QJsonObject mesageObjext;
+    mesageObj.insert("cmd","paramconf");
+    mesageObjext.insert("tpl",tpl);
+    mesageObjext.insert("tph",tph);
+    mesageObj.insert("ext",mesageObjext);
+
+    QJsonDocument document=QJsonDocument(mesageObj);
+    transmitDataTemp = document.toJson();
+    transmitDataTemp = transmitDataTemp.trimmed();  //去除字符串两端的空格和换行符
+    return transmitDataTemp;
+}
+
+QByteArray
 JsonFunc::CmdFocus(){
     QByteArray transmitDataTemp;
     QJsonObject mesageObj;

+ 12 - 5
q6_felgo_iot/src/mqtthandler.cpp

@@ -81,10 +81,18 @@ MqttHandler::MqttHandler(QObject *parent)
             auto pendingImage = m_storage->getPendingImagePaths(1);
             if(pendingImage.isEmpty()){ERROR("无数据!");}
             for (const auto &item : pendingImage) {
-                int dbId = item.first;           // 数据库 id
+                int dbId = item.first;
                 QString path_image = item.second;
+
+                // 检查文件是否存在,不存在则删除数据库记录,避免死循环重传
+                QFileInfo fileInfo(path_image);
+                if (!fileInfo.exists() || !fileInfo.isFile()) {
+                    WARN("文件不存在,删除数据库记录 id:{} path:{}", dbId, path_image.toStdString());
+                    m_storage->markImageUploaded(path_image);
+                    continue;
+                }
+
                 LOG("触发重传,图片缓存路径:{} id:{}",path_image.toStdString(),dbId);
-                //发射信号开始上传
                 emit signal_reupload_image(path_image);
             }
         }else{
@@ -154,6 +162,7 @@ MqttHandler::disconnectFromBroker()
 void
 MqttHandler::publish_m(const QByteArray &message)
 {
+    emit messagePub(message);
     int res = -1;
     QMqttTopicName m_topic(param::mqtt_main_pub+param::imei);
     if(m_client->state() == QMqttClient::Connected)
@@ -232,7 +241,7 @@ MqttHandler::onDisconnected()
 void
 MqttHandler::onMessageReceived(const QByteArray &message, const QMqttTopicName &topic)
 {
-
+    emit messageSub(message);
     QJsonParseError error;
     this->m_client_dataBuf = message;
     this->m_client_rxByte += tc->toUnicode(m_client_dataBuf).length();
@@ -491,5 +500,3 @@ void MqttHandler::storage_Picture_Takephoto(const QString &path)
     }
 
 }
-
-