zhunk 3 meses atrás
pai
commit
a30fc9621e

Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
q6_felgo_iot/CMakeLists.txt


+ 1 - 1
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-07-31T18:09:30. -->
+<!-- Written by QtCreator 17.0.1, 2026-08-06T14:15:24. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

+ 7 - 0
q6_felgo_iot/docs/Readme.md

@@ -1,3 +1,10 @@
+## 20260806
+    #define APP_VERSION "1.13.31"
+    1、修复把未锐化处理的图片也进行上传的问题;
+## 20260803
+    #define APP_VERSION "1.13.30"
+    1、通过修改libFelgo_arm64-v8a.so把开机logo和界面的水印显示给去掉了;
+    2、修复主界面胶带使用量文字显示异常;
 ## 20260731
     #define APP_VERSION "1.12.30"
     1、孢子仪2.0的迭代:

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

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

@@ -20,6 +20,8 @@ AppPage {
   property bool isonline: false
   property var net_list:[]
   property real tapeUsage: 0
+  property real tapeMax: 50000
+  property real tapeUsed: 0
   property real filterUsage: 0
   property bool tapeAlertShown: false
   property bool filterAlertShown: false
@@ -197,6 +199,7 @@ AppPage {
 
           if(jsonData.ext.tape_used){
               tapeUsage = Number(jsonData.ext.tape_used)
+              tapeUsed = Number(jsonData.ext.tape_used)
               if(tapeUsage >= 100 && !tapeAlertShown){
                   tapeAlertShown = true
                   nativeUtils.displayMessageBox("胶带更换提醒", "胶带使用量已达到100%,请及时更换胶带!", 1)
@@ -278,7 +281,7 @@ AppPage {
                anchors.horizontalCenter: parent.horizontalCenter
                width: dp(200)
                height: dp(40)
-               text: "50000"
+               text: tapeMax.toFixed(0)
                inputMethodHints: Qt.ImhDigitsOnly
            }
 
@@ -529,7 +532,7 @@ AppPage {
                        AppText {
                            id: tapeText
                            anchors.horizontalCenter: parent.horizontalCenter
-                           text: "胶带使用量(" + Number(tape_used).toString() + "/" + Number(tape_max).toString() + "):" + tapeUsage.toFixed(2)+"%"
+                           text: "胶带使用量(" + Number(tapeUsed).toString() + "/" + Number(tapeMax).toString() + "):" + tapeUsage.toFixed(2)+"%"
                            color: tapeUsage >= 100 ? "red" : "gray"
                            fontSize: 12
                            // 长按弹出重置确认对话框

+ 1 - 1
q6_felgo_iot/src/cameramanager.cpp

@@ -728,9 +728,9 @@ Frames::saveMatAsJpeg(const QVideoFrame &frame){
                 // 保存清晰图路径,用于景深融合后的清晰度对比
                 LOG("[saveMatAsJpeg] sharp image path:{}", name_sharp.toStdString());
                 param::ptlist.append(name_sharp);
+                emit signal_cache_image(name_sharp);    //路径入库
             }
             LOG("[saveMatAsJpeg] saved:{}",name.toStdString());
-            emit signal_cache_image(name);
             mov_x_z_run();
         } else {
             WARN("[saveMatAsJpeg] write failed:{}",name.toStdString());

Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
q6_felgo_iot/src/main.cpp