zhunk hai 2 meses
pai
achega
5bc7989f32

+ 2 - 2
q6_felgo_iot/CMakeLists.txt

@@ -61,8 +61,8 @@ find_package(Qt6 COMPONENTS Core Quick SerialPort Sql Multimedia Mqtt TextToSpee
 # Project identifier and version
 # More information: https://felgo.com/doc/felgo-publishing/#project-configuration
 set(PRODUCT_IDENTIFIER "com.yfkj.cb.Q6iot")
-set(PRODUCT_VERSION_NAME "1.0.0")
-set(PRODUCT_VERSION_CODE 1)
+set(PRODUCT_VERSION_NAME "1.13.49")
+set(PRODUCT_VERSION_CODE 130)
 
 # Set either "test" or "publish" stage:产品状态,测试?发布
 set(PRODUCT_STAGE "publish")

+ 14 - 14
q6_felgo_iot/CMakeLists.txt.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 17.0.1, 2026-09-05T15:24:25. -->
+<!-- Written by QtCreator 17.0.1, 2026-09-08T09:05:48. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -108,27 +108,27 @@
     <value type="int" key="CMake.Configure.BaseEnvironment">2</value>
     <value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
     <valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
-    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_TOOLCHAIN_FILE:FILEPATH=F:/Android_Env/android_sdk/ndk/27.2.12479018/build/cmake/android.toolchain.cmake
--DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
--DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
+    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
+-DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF
 -DCMAKE_BUILD_TYPE:STRING=Release
 -DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
--DQT_MAINTENANCE_TOOL:FILEPATH=D:/Qt/Felgo/MaintenanceTool.exe
--DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF
--DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
 -DANDROID_ABI:STRING=arm64-v8a
+-DCMAKE_GENERATOR:STRING=Ninja
 -DANDROID_STL:STRING=c++_shared
--DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON
+-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
 -DANDROID_SDK_ROOT:PATH=F:/Android_Env/android_sdk
+-DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}
+-DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON
+-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_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
+-DQT_MAINTENANCE_TOOL:FILEPATH=D:/Qt/Felgo/MaintenanceTool.exe
+-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
 -DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
+-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
 -DCMAKE_COLOR_DIAGNOSTICS:BOOL=ON
--DANDROID_PLATFORM:STRING=android-23
--DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
--DCMAKE_GENERATOR:STRING=Ninja
--DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}
--DQT_USE_TARGET_ANDROID_BUILD_DIR:BOOL=ON</value>
+-DCMAKE_TOOLCHAIN_FILE:FILEPATH=F:/Android_Env/android_sdk/ndk/27.2.12479018/build/cmake/android.toolchain.cmake
+-DQT_USE_TARGET_ANDROID_BUILD_DIR:BOOL=ON
+-DANDROID_PLATFORM:STRING=android-23</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">

+ 1 - 1
q6_felgo_iot/android/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="com.yfkj.cb.Q6iot" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:dist="http://schemas.android.com/apk/distribution" xmlns:tools="http://schemas.android.com/tools" android:installLocation="auto" android:versionCode="0" android:versionName="0"> android:versionCode=&quot;0&quot; android:versionName=&quot;0&quot;&gt;
+<manifest package="com.yfkj.cb.Q6iot" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:dist="http://schemas.android.com/apk/distribution" xmlns:tools="http://schemas.android.com/tools" android:installLocation="auto" android:versionCode="130" android:versionName="1.13.49"> android:versionCode=&quot;0&quot; android:versionName=&quot;0&quot;&gt;
     <!-- Enable instant app support -->
     <!-- <module dist:instant="true"/> -->
     <application android:allowBackup="true" android:allowNativeHeapPointerTagging="false" android:hardwareAccelerated="true" android:extractNativeLibs="true" android:name="com.felgo.helper.FelgoApplication" android:label="@string/app_name" android:icon="@drawable/ic_launcher" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:preserveLegacyExternalStorage="true" android:requestLegacyExternalStorage="true">

+ 3 - 0
q6_felgo_iot/docs/Readme.md

@@ -1,4 +1,7 @@
 ## 20260905
+    #define APP_VERSION "1.13.50"
+    1、【修改】锐化图左上角水印字体大小由1.2增大到2.2,线宽由2增大到3
+## 20260905
     #define APP_VERSION "1.13.49"
     1、【修复】拍照过程偶发取流超时(GetOneFrameTimeout):根因是全局线程池被多个重CPU锐化任务
        占满,挤占取流线程导致MV_CC_GetImageBuffer取帧延迟/缓冲溢出丢帧。

+ 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.13.49"
+#define APP_VERSION "1.13.50"
 
 using namespace std;
 

+ 2 - 2
q6_felgo_iot/qml/config.json

@@ -2,7 +2,7 @@
     "title": "Q6_felgo_iot",
     "identifier": "com.yfkj.cb.Q6iot",
     "orientation": "auto",
-    "versioncode": 1,
-    "versionname": "1.0.0",
+    "versioncode": 130,
+    "versionname": "1.13.49",
     "stage": ""
 }

+ 2 - 2
q6_felgo_iot/src/cameramanager.cpp

@@ -758,9 +758,9 @@ Frames::saveMatAsJpeg(const QVideoFrame &frame){
                             QFileInfo(name_sharp).fileName().toStdString(),
                             cv::Point(15, 40),
                             cv::FONT_HERSHEY_SIMPLEX,
-                            1.2,
+                            2.2,        //增大水印字体大小
                             cv::Scalar(144,238,144),  //浅绿色 lightgreen
-                            2);
+                            3);
                 std::vector<int> jpegParams = {cv::IMWRITE_JPEG_QUALITY, 95};
                 if (!cv::imwrite(name_sharp.toStdString(), Contrast_Image, jpegParams)) {
                     ERROR("Failed to save fused image:{}",name_sharp.toStdString());