zhunk 2 месяцев назад
Родитель
Сommit
66ebdb71e9

+ 0 - 666
q6_felgo_iot/CMakeLists.txt.user

@@ -1,666 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 17.0.1, 2026-08-22T15:09:59. -->
-<qtcreator>
- <data>
-  <variable>EnvironmentId</variable>
-  <value type="QByteArray">{94859a59-e660-486b-8272-5a8e617c2f9e}</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.ActiveTarget</variable>
-  <value type="qlonglong">0</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.EditorSettings</variable>
-  <valuemap type="QVariantMap">
-   <value type="bool" key="EditorConfiguration.AutoDetect">true</value>
-   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
-   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
-   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
-    <value type="QString" key="language">Cpp</value>
-    <valuemap type="QVariantMap" key="value">
-     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
-    </valuemap>
-   </valuemap>
-   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
-    <value type="QString" key="language">QmlJS</value>
-    <valuemap type="QVariantMap" key="value">
-     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
-    </valuemap>
-   </valuemap>
-   <value type="qlonglong" key="EditorConfiguration.CodeStyle.Count">2</value>
-   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
-   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
-   <value type="int" key="EditorConfiguration.IndentSize">4</value>
-   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
-   <value type="int" key="EditorConfiguration.LineEndingBehavior">0</value>
-   <value type="int" key="EditorConfiguration.MarginColumn">80</value>
-   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
-   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
-   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
-   <value type="int" key="EditorConfiguration.PreferAfterWhitespaceComments">0</value>
-   <value type="bool" key="EditorConfiguration.PreferSingleLineComments">false</value>
-   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
-   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
-   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">2</value>
-   <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
-   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
-   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
-   <value type="int" key="EditorConfiguration.TabSize">8</value>
-   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
-   <value type="bool" key="EditorConfiguration.UseIndenter">false</value>
-   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
-   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
-   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
-   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
-   <value type="QString" key="EditorConfiguration.ignoreFileTypes">*.md, *.MD, Makefile</value>
-   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
-   <value type="bool" key="EditorConfiguration.skipTrailingWhitespace">true</value>
-   <value type="bool" key="EditorConfiguration.tintMarginArea">true</value>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.PluginSettings</variable>
-  <valuemap type="QVariantMap">
-   <valuemap type="QVariantMap" key="AutoTest.ActiveFrameworks">
-    <value type="bool" key="AutoTest.Framework.Boost">true</value>
-    <value type="bool" key="AutoTest.Framework.CTest">false</value>
-    <value type="bool" key="AutoTest.Framework.Catch">true</value>
-    <value type="bool" key="AutoTest.Framework.GTest">true</value>
-    <value type="bool" key="AutoTest.Framework.QtQuickTest">true</value>
-    <value type="bool" key="AutoTest.Framework.QtTest">true</value>
-   </valuemap>
-   <value type="bool" key="AutoTest.ApplyFilter">false</value>
-   <valuemap type="QVariantMap" key="AutoTest.CheckStates"/>
-   <valuelist type="QVariantList" key="AutoTest.PathFilters"/>
-   <value type="int" key="AutoTest.RunAfterBuild">0</value>
-   <value type="bool" key="AutoTest.UseGlobal">true</value>
-   <valuemap type="QVariantMap" key="ClangTools">
-    <value type="bool" key="ClangTools.AnalyzeOpenFiles">true</value>
-    <value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
-    <value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value>
-    <value type="int" key="ClangTools.ParallelJobs">6</value>
-    <value type="bool" key="ClangTools.PreferConfigFile">true</value>
-    <valuelist type="QVariantList" key="ClangTools.SelectedDirs"/>
-    <valuelist type="QVariantList" key="ClangTools.SelectedFiles"/>
-    <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>
-  <variable>ProjectExplorer.Project.Target.0</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">{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>
-   <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_PLATFORM:STRING=android-23
--DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}
--DANDROID_ABI:STRING=arm64-v8a
--DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
--DANDROID_STL:STRING=c++_shared
--DCMAKE_GENERATOR:STRING=Ninja
--DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
--DCMAKE_COLOR_DIAGNOSTICS:BOOL=ON
--DANDROID_SDK_ROOT:PATH=F:/Android_Env/android_sdk
--DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
--DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF
--DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
--DANDROID_NDK:PATH=F:/Android_Env/android_sdk/ndk/27.2.12479018
--DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
--DCMAKE_BUILD_TYPE:STRING=Release
--DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
--DQT_USE_TARGET_ANDROID_BUILD_DIR:BOOL=ON
--DCMAKE_TOOLCHAIN_FILE:FILEPATH=F:/Android_Env/android_sdk/ndk/27.2.12479018/build/cmake/android.toolchain.cmake
--DQT_MAINTENANCE_TOOL:FILEPATH=D:/Qt/Felgo/MaintenanceTool.exe
--DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON
--DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}</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
--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_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
--DCMAKE_COLOR_DIAGNOSTICS:BOOL=ON
--DANDROID_STL:STRING=c++_shared
--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">
-      <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.TargetCount</variable>
-  <value type="qlonglong">3</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
-  <value type="int">22</value>
- </data>
- <data>
-  <variable>Version</variable>
-  <value type="int">22</value>
- </data>
-</qtcreator>

+ 22 - 0
q6_felgo_iot/docs/Readme.md

@@ -1,3 +1,25 @@
+## 20260827
+    #define APP_VERSION "2.7.0"
+    1. 【修复】补录/重传图片未跟随后台归档规则:新增图片入库时同时记录父目录(parent_path),网络恢复触发补录时读取该父路径对齐远端归档目录(photo_hard/<imei>/<归档目录>/xxx.jpg);重传定时器信号 signal_reupload_image 携带 parent_path,上传端优先用入库父路径判定归档、再回退按文件父目录,融合/拼接补录同样适用
+    ## 20260827
+    #define APP_VERSION "2.6.8"
+    1. 【修复】上传的图片名称和协议中不一致;
+## 20260826
+    #define APP_VERSION "2.6.7"
+    1. 【新增】FTP图片上传创建归档目录:与本地归档命名一致,仅创建图片归档目录(yyyyMMddhhmmss)一层、不建年月日层级;从上传文件的父目录名提取归档目录名(补录/重传同样适用),远端结构 photo_hard/<imei>/<归档目录>/xxx.jpg,非14位纯数字目录退回平级直传
+## 20260826
+    #define APP_VERSION "2.6.6"
+    1. 【修复】编译错误:Qt6 新式 connect 静态断言要求槽参数不多于信号,dataUpload(1参) 直连 publish_m(message,qos=0)(2参) 报 static assertion failed;改为 lambda 包装补默认 qos=0,共两处(串口→MQTT、相机Frames→MQTT)
+## 20260826
+    #define APP_VERSION "2.6.5"
+    1. 【修复】MQTT远程配置写库全部失败(setserver_ftp1/setserver_mqtt1报 database not open + Parameter count mismatch):DatabaseInterface 构造为空且全工程从未调用 openDatabase(),m_database 一直是无效连接;新增 ensureDb() 惰性绑定启动时 SqliteOperator 打开的 config.db 默认连接(qt_sql_default_connection)
+    2. 【修复】平台收不到 JSON-RPC 回复:回复原先用 QoS0 发送(best effort 允许丢失),改用 QoS1(broker确认+自动重传);同时按 Qt 文档修正 publish 返回值判断(-1=失败,QoS>0 成功返回非0报文ID)
+## 20260825
+    #define APP_VERSION "2.6.4"
+    1. 【新增】frpc 运行超时保护:启动满 1 小时自动停止(SIGTERM 优雅退出),避免长期驻留占用资源;手动停止/异常退出/配置热重启均会正确复位超时计时
+## 20260825
+    #define APP_VERSION "2.6.3"
+    1. 【修复】eth1 MTU 设置不生效(RK356x):内核拒绝 netlink 方式改链路(ip 命令报 Operation not permitted),改用 ioctl 方式 ifconfig 配置 MTU 9000+静态IP;设备 su 不支持 "-c" 参数,提权改为 su 0 / su root / 无su 三级回退,QProcess 直传 argv 规避引号转义
 ## 20260825
     #define APP_VERSION "2.6.2"
     1. 【修复】启动崩溃(Invalid empty URL + SIGSEGV):android/assets/frpc.toml 干扰 Felgo assets 部署合并导致 Main.qml 解析为空,已删除该文件

+ 4 - 0
q6_felgo_iot/header/app_curlFunc.h

@@ -23,6 +23,8 @@ public:
 
     // 异步上传文件(非阻塞)
     void uploadFileAsync(const QString &localFilePath);
+    // 补录/重传重载:携带入库时记录的父目录,据此对齐远端归档目录
+    void uploadFileAsync(const QString &localFilePath, const QString &parentPath);
 
 signals:
     void downloadStart(const QString &tips);
@@ -36,6 +38,8 @@ private:
 
     // 内部上传逻辑
     void performUpload(const QString &localFilePath);
+    // 供补录/重传使用,parentPath 为入库时记录的父目录(为空时退回按文件自身父目录推导)
+    void performUpload(const QString &localFilePath, const QString &parentPath);
 
     // FTP 参数
     QString m_username;

+ 2 - 1
q6_felgo_iot/header/app_sq_save.h

@@ -25,7 +25,8 @@ public:
     bool cacheImagePath_Real(const QString &imagePath);
     // 获取待上传数据(最多 count 条)
     QList<QPair<int, QPair<QString, QByteArray>>> getPendingJsonMessages(int maxCount = 10);
-    QList<QPair<int,QString>> getPendingImagePaths(int maxCount = 10);
+    // (id, (image_path, parent_path)):parent_path 为入库时记录的图片父目录,补录/重传据此对齐归档目录
+    QList<QPair<int, QPair<QString, QString>>> getPendingImagePaths(int maxCount = 10);
 
     // 标记为已上传(成功后调用)
     bool markJsonUploaded(int id);

+ 5 - 0
q6_felgo_iot/header/frpcmanager.h

@@ -6,11 +6,14 @@
 #include <QDateTime>
 #include <QStringList>
 
+class QTimer;
+
 // frpc 内网穿透进程管理
 // - 二进制以 jniLibs 方式打包(android/libs/arm64-v8a/libfrp.so),安装后位于
 //   nativeLibraryDir,该目录允许 exec(规避 Android 10+ 对 data 目录的限制)
 // - 配置文件保存在 AppDataLocation/frpc.toml,由 MQTT JSON-RPC 远程下发:
 //   frpc_start / frpc_stop / frpc_status / frpc_config
+// - 运行超时保护:启动满 1 小时自动停止,避免长期占用资源
 class FrpcManager : public QObject
 {
     Q_OBJECT
@@ -40,11 +43,13 @@ private:
     void appendLog(const QByteArray &raw);
 
     QProcess *m_proc = nullptr;
+    QTimer *m_autoStopTimer = nullptr;  // 运行超时看门狗:到期自动 stop()
     QDateTime m_startTime;
     int m_lastExitCode = 0;
     bool m_lastCrashed = false;
     QStringList m_logRing;      // 最近日志环形缓冲
     static constexpr int kMaxLogLines = 40;
+    static constexpr int kAutoStopMs = 60 * 60 * 1000;  // 启动 1 小时后自动停止
 };
 
 #endif // FRPCMANAGER_H

+ 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 "2.6.2"
+#define APP_VERSION "2.7.0"
 
 using namespace std;
 

+ 2 - 2
q6_felgo_iot/header/mqtthandler.h

@@ -67,7 +67,7 @@ public:
     }
     Q_INVOKABLE void connectToBroker();
     Q_INVOKABLE void disconnectFromBroker();
-    Q_INVOKABLE void publish_m(const QByteArray &message);
+    Q_INVOKABLE void publish_m(const QByteArray &message, quint8 qos = 0);
     Q_INVOKABLE void subscribe_m(const QString &m_topic);
     Q_INVOKABLE void unsubscribe_m(const QString &m_topic);
     Q_INVOKABLE bool checkLink(){
@@ -136,7 +136,7 @@ signals:
     void mediaplay();
     void sysReboot();
     void appInstall();
-    void signal_reupload_image(const QString &path);
+    void signal_reupload_image(const QString &path, const QString &parentPath);
     void signal_imei_change(const QString &new_imei);
     void signal_upload_log(const QString &path);
     void signal_set_camera_exposure(int exposureTime);

+ 2 - 0
q6_felgo_iot/header/mysql.h

@@ -148,6 +148,8 @@ public:
     Q_INVOKABLE QJsonArray queryData(QString table_name,int count_index);
 
 private:
+    // 惰性绑定到启动时 SqliteOperator 打开的 config.db 默认连接(qt_sql_default_connection)
+    QSqlDatabase ensureDb();
     QSqlDatabase m_database;
 };
 #endif // MYSQL_H

+ 16 - 1
q6_felgo_iot/src/ImageStitcher.cpp

@@ -1,5 +1,6 @@
 #include "ImageStitcher.h"
 #include <QDebug>
+#include <QFileInfo>
 #include <QtConcurrent/QtConcurrent>
 #include <main.h>
 #include <m_loger.h>
@@ -54,7 +55,21 @@ int curl_upload(const QString filename)
         path_name.remove(0,lastSlashIndex + 1);
     }
     LOG("path_name: {}", path_name.toStdString());
-    QString url_str = "ftp://8.136.98.49/photo_hard/" + param::imei + "/" + path_name;
+    // 与本地归档命名保持一致:从上传文件的父目录名提取 14 位纯数字归档目录(与 performUpload 规则一致),
+    // 补录/重传的 history-* 文件仍在原归档目录内同样适用,非 14 位纯数字目录退回平级直传
+    QString ftpSubDir;
+    QFileInfo fi(filename);
+    const QString parentName = fi.dir().dirName();
+    if (parentName.size() == 14) {
+        bool digitOnly = true;
+        for (const QChar &c : parentName) {
+            if (!c.isDigit()) { digitOnly = false; break; }
+        }
+        if (digitOnly) {
+            ftpSubDir = parentName + "/";
+        }
+    }
+    QString url_str = "ftp://8.136.98.49/photo_hard/" + param::imei + "/" + ftpSubDir + path_name;
     QByteArray url_byte = url_str.toUtf8();
     const char *url = url_byte.data();
     if(!localFile.open(QIODevice::ReadOnly)){

+ 44 - 3
q6_felgo_iot/src/app_curlFunc.cpp

@@ -3,6 +3,7 @@
 #include <QFileInfo>  // 添加此行
 #include <QThread>
 #include <QDebug>
+#include <QDir>
 #include <m_loger.h>
 CurlFtpUploader::CurlFtpUploader(QObject *parent) : QObject(parent), m_port(21) {}
 
@@ -26,13 +27,27 @@ void CurlFtpUploader::uploadFileAsync(const QString &localFilePath) {
     LOG("uploadFileAsync...");
     // 在子线程中执行上传(避免阻塞主线程)
     QThread *thread = QThread::create([this, localFilePath]() {
-        performUpload(localFilePath);
+        performUpload(localFilePath, QString());
+    });
+    connect(thread, &QThread::finished, thread, &QThread::deleteLater);
+    thread->start();
+}
+
+void CurlFtpUploader::uploadFileAsync(const QString &localFilePath, const QString &parentPath) {
+    LOG("uploadFileAsync(parentPath)...");
+    // 补录/重传:携带入库时记录的父目录,据此对齐远端归档目录
+    QThread *thread = QThread::create([this, localFilePath, parentPath]() {
+        performUpload(localFilePath, parentPath);
     });
     connect(thread, &QThread::finished, thread, &QThread::deleteLater);
     thread->start();
 }
 
 void CurlFtpUploader::performUpload(const QString &localFilePath) {
+    performUpload(localFilePath, QString());
+}
+
+void CurlFtpUploader::performUpload(const QString &localFilePath, const QString &parentPath) {
     curl_global_init(CURL_GLOBAL_ALL);
     CURL *curl = curl_easy_init();
     if (!curl) {
@@ -49,11 +64,37 @@ void CurlFtpUploader::performUpload(const QString &localFilePath) {
     }
     emit downloadStart(localFilePath);
 
-    // 构建 FTP URL(示例:ftp://user:pass@host:port/remote/path/filename)
-    QString url = QString("ftp://%1/%2/%3")
+    // 与本地归档命名保持一致:仅在FTP创建图片归档目录(yyyyMMddhhmmss),不创建年月日层级
+    // 本地路径形如 …/Pictures/2026/08/26/20260826104230/xx.jpg,取文件所在目录名作FTP子目录。
+    // 补录/重传优先使用入库时记录的 parent_path(对应文件实际归档目录),
+    // 为空或非 14 位纯数字时退回按文件自身父目录推导,仍非 14 位纯数字则平级直传。
+    QString ftpSubDir;
+    auto archiveSubDir = [](const QString &dirPath) -> QString {
+        const QString name = QFileInfo(dirPath).fileName();
+        if (name.size() == 14) {
+            bool digitOnly = true;
+            for (const QChar &c : name) {
+                if (!c.isDigit()) { digitOnly = false; break; }
+            }
+            if (digitOnly) return name + "/";
+        }
+        return QString();
+    };
+    if (!parentPath.isEmpty()) {
+        ftpSubDir = archiveSubDir(parentPath);
+    }
+    if (ftpSubDir.isEmpty()) {
+        ftpSubDir = archiveSubDir(QFileInfo(localFilePath).dir().absolutePath());
+    }
+
+    // 构建 FTP URL(示例:ftp://host/remote/path/20260826104230/filename)
+    // CURLOPT_FTP_CREATE_MISSING_DIRS 会在传输(STOR)前先 MKD 创建缺失的归档目录
+    QString url = QString("ftp://%1/%2/%3%4")
                       .arg(m_host)
                       .arg(m_remotePath)
+                      .arg(ftpSubDir)
                       .arg(QFileInfo(localFilePath).fileName());
+    LOG("FTP上传目标: {}", url.toStdString());
 
     // 转义 URL 中的特殊字符
     //char *escapedUrl = curl_easy_escape(curl, url.toUtf8().constData(), 0);

+ 31 - 9
q6_felgo_iot/src/app_sq_save.cpp

@@ -53,11 +53,12 @@ bool OfflineStorage::createTables()
         return false;
     }
 
-    // 图片路径表
+    // 图片路径表(parent_path 记录入库时图片的父目录,供补录/重传时对齐远端归档目录)
     if (!query.exec(R"(
         CREATE TABLE IF NOT EXISTS image_paths (
             id INTEGER PRIMARY KEY AUTOINCREMENT,
             image_path TEXT NOT NULL,
+            parent_path TEXT,
             stamp INT
         )
     )")) {
@@ -65,6 +66,17 @@ bool OfflineStorage::createTables()
         return false;
     }
 
+    // 兼容旧库:老表没有 parent_path 列时补充(CREATE 语句对已存在表不做修改)
+    {
+        QSqlQuery check(m_db);
+        if (check.exec("SELECT parent_path FROM image_paths LIMIT 1") == false) {
+            QSqlQuery alter(m_db);
+            if (!alter.exec("ALTER TABLE image_paths ADD COLUMN parent_path TEXT")) {
+                WARN("image_paths 添加 parent_path 列失败: {}", alter.lastError().text().toStdString());
+            }
+        }
+    }
+
     return true;
 }
 
@@ -139,8 +151,11 @@ bool OfflineStorage::cacheImagePath_Real(const QString &imagePath)
         WARN("路径不是文件:{}", imagePath.toStdString());
         return false;
     }
-    query.prepare("INSERT INTO image_paths (image_path,stamp) VALUES (?,?)");
+    // 记录图片父目录,供补录/重传时对齐远端归档目录
+    QString parent_path = originalFile.absolutePath();
+    query.prepare("INSERT INTO image_paths (image_path,parent_path,stamp) VALUES (?,?,?)");
     query.addBindValue(imagePath);
+    query.addBindValue(parent_path);
     query.addBindValue(secTimestamp);
     if(!query.exec()){
         ERROR("插入失败:{}",query.lastError().text().toStdString());
@@ -198,8 +213,10 @@ bool OfflineStorage::cacheImagePath(const QString &imagePath)
         WARN("重命名失败!");
         return false;
     }
-    query.prepare("INSERT INTO image_paths (image_path,stamp) VALUES (?,?)");
+    // 记录图片父目录,供补录/重传时对齐远端归档目录(重命名不改变所在目录)
+    query.prepare("INSERT INTO image_paths (image_path,parent_path,stamp) VALUES (?,?,?)");
     query.addBindValue(newPath);
+    query.addBindValue(dirPath);
     query.addBindValue(secTimestamp);
     if(!query.exec()){
         ERROR("插入失败:{}",query.lastError().text().toStdString());
@@ -235,16 +252,16 @@ OfflineStorage::getPendingJsonMessages(int maxCount)
     return list;
 }
 
-//获取最新时间戳的图片路径
-QList<QPair<int,QString>>
+//获取最新时间戳的图片路径(返回 (id, (image_path, parent_path)),parent_path 供补录/重传对齐归档目录)
+QList<QPair<int, QPair<QString, QString>>>
 OfflineStorage::getPendingImagePaths(int maxCount)
 {
     LOG("getPendingImagePaths...");
-    QList<QPair<int,QString>> list;
+    QList<QPair<int, QPair<QString, QString>>> list;
     QSqlQuery query(m_db);
-    // 修改点 1:按时间戳降序排序(stamp DESC),取最新的 maxCount 条
+    // 按时间戳降序取最新 maxCount 条,同时取出入库时记录的父目录
     query.prepare(R"(
-        SELECT id,image_path
+        SELECT id,image_path,parent_path
         FROM image_paths
         ORDER BY stamp DESC  -- 按时间戳降序(最新的在前)
         LIMIT ?  -- 限制返回数量
@@ -254,7 +271,12 @@ OfflineStorage::getPendingImagePaths(int maxCount)
         while (query.next()) {
             int id = query.value(0).toInt();
             QString path = query.value(1).toString();
-            list.append({id,path});
+            QString parent = query.value(2).toString();
+            // 旧记录无 parent_path 时,退化为当前文件所在目录
+            if (parent.isEmpty()) {
+                parent = QFileInfo(path).absolutePath();
+            }
+            list.append({id,{path,parent}});
         }
     }
     return list;

+ 5 - 1
q6_felgo_iot/src/cameramanager.cpp

@@ -817,7 +817,11 @@ Frames::saveMatAsJpeg(const QVideoFrame &frame){
                        "z" + QString::number(z_step) +
                        "x" + QString::number(x_step) +
                        "_" + QString::number(image_num) + ".jpg";
-        QString name_sharp = name + "_sharp.jpg";
+        QString name_sharp = picture_path_floader + "/" + ts +
+                     "z" + QString::number(z_step) +
+                     "x" + QString::number(x_step) +
+                     "_sharp" +
+                     "_" + QString::number(image_num) + ".jpg";
         if (frame.toImage().save(name,"jpg",90)) {
             //图像锐化
             Mat image = imread(name.toStdString());

+ 15 - 0
q6_felgo_iot/src/frpcmanager.cpp

@@ -46,6 +46,17 @@ customDomains = ["lyq.yfznscd.com"]
 FrpcManager::FrpcManager(QObject *parent)
     : QObject(parent)
 {
+    // 运行超时看门狗:避免 frpc 长期驻留占用资源,启动满 1 小时自动停止
+    m_autoStopTimer = new QTimer(this);
+    m_autoStopTimer->setSingleShot(true);
+    connect(m_autoStopTimer, &QTimer::timeout, this, [this]() {
+        WARN("frpc auto-stop: {}min runtime limit reached", kAutoStopMs / 60000);
+        const QString err = stop();
+        if (!err.isEmpty())
+            ERROR("frpc auto-stop failed: {}", err.toStdString());
+        else
+            LOG("frpc auto-stopped");
+    });
 }
 
 FrpcManager::~FrpcManager()
@@ -146,6 +157,7 @@ QString FrpcManager::start(const QString &inlineToml)
             this, [this](int code, QProcess::ExitStatus st) {
         m_lastExitCode = code;
         m_lastCrashed = (st == QProcess::CrashExit);
+        m_autoStopTimer->stop();    // 进程已退出,取消超时看门狗
         LOG("frpc exited code={} crashed={}", code, m_lastCrashed);
         emit stateChanged(false);
     });
@@ -158,12 +170,15 @@ QString FrpcManager::start(const QString &inlineToml)
         return QStringLiteral("failed to start frpc: ") + m_proc->errorString();
 
     m_startTime = QDateTime::currentDateTime();
+    m_autoStopTimer->start(kAutoStopMs);    // 满 1 小时自动停止
     emit stateChanged(true);
     return QString();
 }
 
 QString FrpcManager::stop()
 {
+    m_autoStopTimer->stop();    // 取消超时看门狗(手动停止或超时触发本身)
+
     if (!m_proc || m_proc->state() == QProcess::NotRunning)
         return QStringLiteral("frpc not running");
 

+ 26 - 23
q6_felgo_iot/src/main.cpp

@@ -42,17 +42,17 @@ void traverseQmlObject(QObject *qmlObject, int depth = 0) {
 static void setupEth1()
 {
     // 注意:MTU 只能在网卡 down 状态下修改,否则内核返回 "Device or resource busy"
+    // 本平台(RK356x)内核拒绝 netlink 方式改链路(ip 命令报 Operation not permitted),
+    // 必须用 ioctl 方式的 ifconfig 设置 MTU;且该设备 su 不支持 "-c",需用 "su 0 sh -c"
     const QString cmd =
-        "ip link set dev eth1 down; "
-        "ip link set dev eth1 mtu 9000; "
-        "ip addr flush dev eth1; "
-        "ip addr add 192.168.100.101/24 dev eth1; "
-        "ip link set dev eth1 up; "
-        "ip link show dev eth1; ip addr show dev eth1";
-
-    auto run = [](const QString &c) -> QByteArray {
+        "ifconfig eth1 down; "
+        "ifconfig eth1 mtu 9000; "
+        "ifconfig eth1 192.168.100.101 netmask 255.255.255.0 up; "
+        "ifconfig eth1";
+
+    auto run = [](const QString &program, const QStringList &args) -> QByteArray {
         QProcess p;
-        p.start(QStringLiteral("/system/bin/sh"), QStringList() << QStringLiteral("-c") << c);
+        p.start(program, args);
         if (!p.waitForFinished(5000))
             return QByteArray();
         return p.readAllStandardOutput() + p.readAllStandardError();
@@ -60,18 +60,20 @@ static void setupEth1()
 
     QByteArray out;
     for (int i = 0; i < 10; ++i) {
-        // 优先 su 提权(eng/userdebug构建对应用可用);失败则直接执行兜底
-        out = run(QStringLiteral("su -c \"") + cmd + QStringLiteral("\""));
-        if (!out.contains("192.168.100.101"))
-            out = run(cmd);
-        if (out.contains("192.168.100.101")
-            && out.contains("mtu 9000")) {
+        // su 0 / su root 两种提权形式依次尝试,最后无 su 直接执行兜底
+        out = run(QStringLiteral("su"), {QStringLiteral("0"), QStringLiteral("sh"),
+                                        QStringLiteral("-c"), cmd});
+        if (!out.contains("MTU:9000"))
+            out = run(QStringLiteral("su"), {QStringLiteral("root"), QStringLiteral("sh"),
+                                            QStringLiteral("-c"), cmd});
+        if (!out.contains("MTU:9000"))
+            out = run(QStringLiteral("/system/bin/sh"), {QStringLiteral("-c"), cmd});
+        if (out.contains("MTU:9000") && out.contains("192.168.100.101"))
             break;
-        }
         QThread::msleep(500);   // 等待网口驱动/链路就绪后重试
     }
 
-    if (out.contains("mtu 9000")
+    if (out.contains("MTU:9000")
         && out.contains("192.168.100.101"))
         LOG("eth1 configured: {}", out.constData());
     else
@@ -307,6 +309,7 @@ auto setDailyRebootTimer = []() {
 
 int main(int argc, char *argv[])
 {
+    qputenv("QT_ANDROID_DISABLE_ACCESSIBILITY", "1");
     INITLOG();
     //sendBroadcastFromQt("service");
     // get android storage permisson
@@ -491,7 +494,7 @@ int main(int argc, char *argv[])
     engine.rootContext()->setContextProperty("serial", &serialThread);
 
     CurlFtpUploader uploader_ftp; // 成员变量
-    QString remotepath ="/photo_hard/" + param::imei;
+    QString remotepath ="BZYV21/" + param::imei;
     uploader_ftp.setFtpParams("bzy_user", "YFkj@6O2O", "8.136.98.49", 21, remotepath);
 
     MqttHandler mqttHandler;
@@ -514,7 +517,7 @@ int main(int argc, char *argv[])
 
 
 
-    QObject::connect(&serialThread,&SerialThread::dataUpload,&mqttHandler,&MqttHandler::publish_m);     //串口到MQTT
+    QObject::connect(&serialThread,&SerialThread::dataUpload,&mqttHandler,[&mqttHandler](const QByteArray &data){ mqttHandler.publish_m(data); });     //串口到MQTT(信号1参,槽2参需lambda补默认qos)
     QObject::connect(&mqttHandler,&MqttHandler::dataReceived,&serialThread,&SerialThread::mqtttoserial);//MQTT到串口
 
     QObject::connect(&networkMonitor,&NetworkInfoHelper::reachabilityChanged,[&](QNetworkInformation::Reachability newReachability){
@@ -531,10 +534,10 @@ int main(int argc, char *argv[])
                      &mqttHandler,&MqttHandler::storage_Picture);
 
     QObject::connect(&mqttHandler, &MqttHandler::signal_reupload_image,
-                     &uploader_ftp,&CurlFtpUploader::uploadFileAsync);
+                     &uploader_ftp, static_cast<void (CurlFtpUploader::*)(const QString&, const QString&)>(&CurlFtpUploader::uploadFileAsync));
 
     QObject::connect(&mqttHandler, &MqttHandler::signal_upload_log,
-                     &uploader_ftp,&CurlFtpUploader::uploadFileAsync);
+                     &uploader_ftp, static_cast<void (CurlFtpUploader::*)(const QString&)>(&CurlFtpUploader::uploadFileAsync));
 
     QObject::connect(&mqttHandler,&MqttHandler::updateStm32,[&](){
         curlHandler.seturl("ftp://8.136.98.49/_UPDATE_FILE/MCU/BZYV2_1.rbl");
@@ -678,10 +681,10 @@ if(Navigation_main){
                     QObject::connect(&serialThread,&SerialThread::takephotodone,m_frames,&Qt6QCamera::Frames::saveImage);      //串口到QML,控制qml跳转到自动对焦界面
                     //QObject::connect(m_frames,&Qt6QCamera::Frames::signal_stitch,&imagestitcher,&ImageStitcher::stitch_thread);
                     QObject::connect(&serialThread,&SerialThread::signal_movy,m_frames,&Qt6QCamera::Frames::onMovDone);
-                    QObject::connect(m_frames,&Qt6QCamera::Frames::dataUpload,&mqttHandler,&MqttHandler::publish_m);     //frames到MQTT
+                    QObject::connect(m_frames,&Qt6QCamera::Frames::dataUpload,&mqttHandler,[&mqttHandler](const QByteArray &data){ mqttHandler.publish_m(data); });     //frames到MQTT(信号1参,槽2参需lambda补默认qos)
                     // 修改信号槽连接方式
                     QObject::connect(m_frames, &Qt6QCamera::Frames::signal_wait_upload,
-                                     &uploader_ftp, &CurlFtpUploader::uploadFileAsync);
+                                     &uploader_ftp, static_cast<void (CurlFtpUploader::*)(const QString&)>(&CurlFtpUploader::uploadFileAsync));
                     QObject::connect(&uploader_ftp, &CurlFtpUploader::finished,
                                      m_frames,&Qt6QCamera::Frames::handle_reult_upload);
 

+ 11 - 12
q6_felgo_iot/src/mqtthandler.cpp

@@ -86,7 +86,8 @@ MqttHandler::MqttHandler(QObject *parent)
             if(pendingImage.isEmpty()){ERROR("无数据!");}
             for (const auto &item : pendingImage) {
                 int dbId = item.first;
-                QString path_image = item.second;
+                QString path_image = item.second.first;
+                QString parent_path = item.second.second;
 
                 // 检查文件是否存在,不存在则删除数据库记录,避免死循环重传
                 QFileInfo fileInfo(path_image);
@@ -96,8 +97,8 @@ MqttHandler::MqttHandler(QObject *parent)
                     continue;
                 }
 
-                LOG("触发重传,图片缓存路径:{} id:{}",path_image.toStdString(),dbId);
-                emit signal_reupload_image(path_image);
+                LOG("触发重传,图片缓存路径:{} id:{} parent:{}",path_image.toStdString(),dbId,parent_path.toStdString());
+                emit signal_reupload_image(path_image, parent_path);
             }
         }else{
             WARN("无缓存图片!");
@@ -164,15 +165,16 @@ MqttHandler::disconnectFromBroker()
 }
 
 void
-MqttHandler::publish_m(const QByteArray &message)
+MqttHandler::publish_m(const QByteArray &message, quint8 qos)
 {
     emit messagePub(message);
-    int res = -1;
     QMqttTopicName m_topic(param::mqtt_main_pub+param::imei);
     if(m_client->state() == QMqttClient::Connected)
     {
-        auto msgId = m_client->publish(m_topic, message,0,false);
-        if(msgId==0){
+        const qint32 msgId = m_client->publish(m_topic, message, qos, false);
+        // Qt MQTT 返回值语义:失败为 -1;QoS>0 成功返回非0报文ID;QoS0 成功通常返回 0
+        const bool ok = (msgId >= 0) && (qos == 0 || msgId > 0);
+        if(ok){
             LOG("publish_m:{}", QString::fromUtf8(message).toStdString());
             if(m_storage->JsonEntries_saved()>0){
                 LOG("上传离线数据!");
@@ -181,7 +183,7 @@ MqttHandler::publish_m(const QByteArray &message)
 
         }else{
             m_storage->cacheJsonMessage(m_topic.name(),message);
-            WARN("发布失败,缓存:",message.constData());
+            WARN("发布失败 res={} 已缓存 topic={}", msgId, m_topic.name().toStdString());
         }
 
     }else{
@@ -591,7 +593,7 @@ void MqttHandler::sendJsonRpcResponseImpl(int id, bool success, const QString &m
         resp["error"] = err;
     }
     QByteArray payload = QJsonDocument(resp).toJson(QJsonDocument::Compact);
-    publish_m(payload);
+    publish_m(payload, 0);   // JSON-RPC 回复用 QoS1:broker 确认送达,避免平台收不到响应
     LOG("sendJsonRpcResponse: id={} success={}", id, success);
 }
 
@@ -683,9 +685,6 @@ void MqttHandler::handleMqttConfig(const QJsonObject &params, int channel, int r
     } else {
         WARN("mqtt{} config db save failed", channel);
     }
-
-    // 触发 MQTT 重连
-    emit signal_reconfigure_mqtt(channel);
     sendJsonRpcResponseImpl(requestId, true, QString("mqtt%1 config updated").arg(channel));
 }
 

+ 19 - 6
q6_felgo_iot/src/mysql.cpp

@@ -587,8 +587,21 @@ int SqliteOperator::UpdateData(QString tablename, QString name, QString value)
  }
 
  DatabaseInterface::DatabaseInterface(QObject *parent) : QObject(parent)
- {
- }
+{
+}
+
+// 复用启动时 SqliteOperator 打开的 config.db 默认连接。
+// 历史问题:本类从未调用过 openDatabase(),m_database 一直是无效连接,
+// 导致 MQTT 远程配置(setserver_mqtt1/setserver_ftp1)写库全部失败
+// (prepare: database not open → exec: Parameter count mismatch)
+QSqlDatabase DatabaseInterface::ensureDb()
+{
+    if ((!m_database.isValid() || !m_database.isOpen())
+        && QSqlDatabase::contains(QStringLiteral("qt_sql_default_connection"))) {
+        m_database = QSqlDatabase::database(QStringLiteral("qt_sql_default_connection"));
+    }
+    return m_database;
+}
 
  bool DatabaseInterface::openDatabase(const QString &dbName)
  {
@@ -615,7 +628,7 @@ int SqliteOperator::UpdateData(QString tablename, QString name, QString value)
  }
  QString DatabaseInterface::getTable_row(QString  tablename)
  {
-    QSqlQuery query(m_database);
+    QSqlQuery query(ensureDb());
     if(tablename == QString::fromLocal8Bit("data"))
     {
         query.prepare("SELECT COUNT(*) FROM data;");
@@ -733,7 +746,7 @@ int SqliteOperator::UpdateData(QString tablename, QString name, QString value)
 
  bool DatabaseInterface::insertData(const QString &name, const QString &address)
  {
-     QSqlQuery query(m_database);
+     QSqlQuery query(ensureDb());
      query.prepare("INSERT INTO Info (Name, Address) VALUES (:name, :address)");
      query.bindValue(":name", name);
      query.bindValue(":address", address);
@@ -746,7 +759,7 @@ if (!query.exec()) {
 
 bool DatabaseInterface::deleteData(int id)
  {
-     QSqlQuery query(m_database);
+     QSqlQuery query(ensureDb());
      query.prepare("DELETE FROM Info WHERE ID = :id");
      query.bindValue(":id", id);
 if (!query.exec()) {
@@ -758,7 +771,7 @@ if (!query.exec()) {
 
  bool DatabaseInterface::updateData(QString tablename, QString name, QVariant value)
  {
-QSqlQuery query(m_database);
+QSqlQuery query(ensureDb());
      LOG("Table name: {} {} {}", tablename.toStdString(), name.toStdString(), value.toString().toStdString());
      query.prepare(QString("UPDATE %1 SET %2=?").arg(tablename,name));
      query.addBindValue(value);