zhunk 1 год назад
Родитель
Сommit
f3142d9247

+ 0 - 2
q6_felgo_iot/CMakeLists.txt

@@ -38,13 +38,11 @@ set(LIBUVC_PATH
     ${PROJECT_SOURCE_DIR}/../Lib/libuvc/Android-Arm-v8a
 )
 
-
 find_package(Felgo REQUIRED)
 find_package(Qt6 COMPONENTS Core Quick SerialPort Sql Multimedia Mqtt TextToSpeech Positioning ShaderTools Widgets Svg REQUIRED)
 
 #find_package(FelgoLive REQUIRED)
 
-
 # Project identifier and version
 # More information: https://felgo.com/doc/felgo-publishing/#project-configuration
 set(PRODUCT_IDENTIFIER "com.yfkj.cb.Q6iot")

+ 17 - 23
q6_felgo_iot/CMakeLists.txt.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 14.0.1, 2025-02-18T15:51:11. -->
+<!-- Written by QtCreator 14.0.1, 2025-04-23T23:00:10. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -102,24 +102,24 @@
     <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-ndk-r23c/build/cmake/android.toolchain.cmake
--DCMAKE_GENERATOR:STRING=Ninja
+    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_BUILD_TYPE:STRING=Release
+-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
+-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
+-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
+-DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
+-DANDROID_NATIVE_API_LEVEL:STRING=23
 -DANDROID_SDK_ROOT:PATH=F:/Android_Env/android_sdk
--DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
--DANDROID_ABI:STRING=arm64-v8a
--DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}
--DANDROID_NDK:PATH=F:/Android_Env/android-ndk-r23c
 -DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF
+-DANDROID_STL:STRING=c++_shared
 -DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
--DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
--DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
+-DANDROID_NDK:PATH=F:/Android_Env/android-ndk-r23c
+-DCMAKE_TOOLCHAIN_FILE:FILEPATH=F:/Android_Env/android-ndk-r23c/build/cmake/android.toolchain.cmake
+-DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}
 -DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
--DANDROID_STL:STRING=c++_shared
--DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
 -DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON
--DCMAKE_BUILD_TYPE:STRING=Release
--DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
--DANDROID_NATIVE_API_LEVEL:STRING=23</value>
+-DCMAKE_GENERATOR:STRING=Ninja
+-DANDROID_ABI:STRING=arm64-v8a
+-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}</value>
     <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:\QT_WorkSpace\qt6_iot_all\build-q6_felgo_iot-Qt_6_4_1_android_arm64_v8a_Clang_arm64_v8a-Release</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
@@ -135,7 +135,7 @@
      </valuemap>
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
       <value type="QString" key="BuildTargetSdk">android-33</value>
-      <value type="QString" key="BuildToolsVersion">34.0.0</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>
@@ -179,12 +179,7 @@
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidDeployQtStep</value>
      </valuemap>
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Install</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.InstallStep</value>
-     </valuemap>
-     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <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>
@@ -207,7 +202,6 @@
    <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">
@@ -224,7 +218,7 @@
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">q6_felgo_iot</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidRunConfiguration:q6_felgo_iot</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="ProjectExplorer.RunConfiguration.Customized">true</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
    </valuemap>

+ 2 - 0
q6_felgo_iot/android/build.gradle

@@ -174,7 +174,9 @@ android {
 
     tasks.withType(JavaCompile) {
         options.incremental = true
+        options.compilerArgs += ["-Xlint:deprecation"]
     }
+
     packagingOptions {
         jniLibs {
             useLegacyPackaging = true

+ 1 - 0
q6_felgo_iot/android/src/com/yfkj/cb/Q6iot/UvcCameraActivity.java

@@ -85,6 +85,7 @@ public class UvcCameraActivity extends QtNative{//
                     if (DEBUG) Log.v(TAG, "selectDevice:" + state);
                 }else{
                     if (DEBUG) Log.e(TAG, "mCameraHelper: null");
+                    UvcHandle("UVCFAILED");
                 }
             }
         }else{

+ 42 - 28
q6_felgo_iot/header/cameramanager.h

@@ -18,6 +18,7 @@
 #include <mserial.h>
 #include <ymodem.h>
 #include <m_json.h>
+#include <m_loger.h>
 #include <QFuture>
 #include <ImageStitcher.h>
 #include <libuvc.h>
@@ -221,51 +222,64 @@ public slots:
 
     void onMovDone(){
         if(!camera_sw()){
+            ERROR("Camera error!");
             m_1s->stop();
+            setCameraSw(false);
             return;
         }
         m_1s->start();
-        //m_qulityString = m_opencvfunc.brenner(m_frame);
-        m_qulityString = m_opencvfunc.Laplacian(m_frame);
+        m_qulityString = m_opencvfunc.Tenengrad(m_frame);
+        //m_qulityString = m_opencvfunc.Laplacian(m_frame);
         emit qulityStringChanged();
-        qDebug() << "onMovDone:" << m_qulityString;
-
-        if(MAX_STEP<10&&m_qulityString.toDouble()>1.0&&m_qulityString.toDouble()>max_image_qulity/1.05){
-            image_qulity.clear();
-            image_qulity_num = 0;
-            param::camera_tc = 1;
-            return;
-        }
-
+        LOG("onMovDone...{}",m_qulityString.toStdString());
         #if 1
         if(image_qulity_num < MAX_STEP){
             image_qulity_num ++;
-            emit serial_data(m_json.MotorMove("movy","f4",""));
+            emit serial_data(m_json.MotorMove("movy","b4","1"));
             qDebug() << image_qulity_num << " m_qulityString:" << m_qulityString << " size:" <<image_qulity.size();
             image_qulity.append(m_qulityString.toDouble());
             if(image_qulity_num==MAX_STEP){
                 max_image_qulity = *std::max_element(image_qulity.begin(), image_qulity.end());
             }
         }
-
-        qDebug() << "max_iq:" << max_image_qulity << "m_qulityString:" << m_qulityString;
+        LOG("max_image_qulity:{} <> m_qulityString:{}",max_image_qulity,m_qulityString.toStdString());
         if(image_qulity_num >= MAX_STEP){
+            //如果当前清晰度大于最大清晰度
+            if(m_qulityString.toDouble() > max_image_qulity)
+            {
+                image_qulity.clear();
+                image_qulity_num = 0;
+                param::camera_tc = 1;
+                return;
+            }
+            //如果最大清晰度约等于当前清晰度或小于当前清晰度,继续往前
+            if(max_image_qulity-m_qulityString.toDouble()<2.0){
+                image_qulity_num=0;
+                image_qulity.clear();
+                emit serial_data(m_json.MotorMove("movy","b4","1"));
+                return;
+            }
+            //如果当前清晰度小于最大清晰度,反向运动寻找清晰位置 f4
+            if(max_image_qulity-m_qulityString.toDouble()>3.0){
+                emit serial_data(m_json.MotorMove("movy","f4","1"));
+            }
             image_qulity_num++;
-            if(m_qulityString.toDouble()>=1.0 && m_qulityString.toDouble() >= (max_image_qulity/1.1)||image_qulity_num == MAX_STEP*2+5){
-                qDebug() << "m_qulityString:" << m_qulityString;
-                if(image_qulity_num==MAX_STEP*2+5){   //没有找到,重新扫描
-                    image_qulity_num = 0;
-                    image_qulity.clear();
-                    emit serial_data(m_json.MotorMove("movy","f4",""));
-                    return;
-                }else{
-                    image_qulity.clear();
-                    image_qulity_num = 0;
-                    param::camera_tc = 1;
-                    return;
-                }
+
+            if(max_image_qulity-m_qulityString.toDouble()>0.0&&max_image_qulity-m_qulityString.toDouble()<10.0)
+            {
+                image_qulity.clear();
+                image_qulity_num = 0;
+                param::camera_tc = 1;
+                return;
+            }
+
+            if(image_qulity_num==MAX_STEP*2+5)
+            {
+                image_qulity_num = 0;
+                image_qulity.clear();
+                emit serial_data(m_json.MotorMove("movy","f4","1"));
+                return;
             }
-            emit serial_data(m_json.MotorMove("movy","b4",""));
         }
 
         #endif

+ 29 - 15
q6_felgo_iot/header/m_loger.h

@@ -1,27 +1,41 @@
 #ifndef M_LOGER_H
 #define M_LOGER_H
 #include <QObject>
-#include <main.h>
-class Logger : public QObject
-{
-    Q_OBJECT
+#include <memory>
 
-public:
-    static Logger* instance();
+//spdlog
+// 记录INFO及以上级别日志
+#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_TRACE
+#include "spdlog/spdlog.h"
+#include "spdlog/logger.h"
+#include "spdlog/sinks/rotating_file_sink.h"
+#include "spdlog/sinks/stdout_color_sinks.h"
+#include "spdlog/sinks/android_sink.h"
+#include <iostream>
 
-signals:
-    void logMessage(const QString& message);
+class Logger {
+public:
+    static Logger* getInstance() {
+        static Logger instance;
+        return &instance;
+    }
+    //c++14返回值可设置为auto
+    std::shared_ptr<spdlog::logger> getLogger() {
+        return loggerPtr;
+    }
 
-public slots:
-    void log(const QString& message);
+    void Init();
 
 private:
-    Logger() {}
-    ~Logger() {}
-
-    Logger(const Logger&) = delete;
-    Logger& operator=(const Logger&) = delete;
+    Logger() = default;
+    std::shared_ptr<spdlog::logger> loggerPtr;
 };
 
+#define INITLOG()      Logger::getInstance()->Init()
+// 定义日志宏
+#define LOG(...) SPDLOG_LOGGER_INFO(Logger::getInstance()->getLogger(), __VA_ARGS__)
+#define WARN(...) SPDLOG_LOGGER_WARN(Logger::getInstance()->getLogger(), __VA_ARGS__)
+#define ERROR(...) SPDLOG_LOGGER_ERROR(Logger::getInstance()->getLogger(), __VA_ARGS__)
+#define DEBUG(...) SPDLOG_LOGGER_DEBUG(Logger::getInstance()->getLogger(), __VA_ARGS__)
 
 #endif // M_LOGER_H

+ 1 - 0
q6_felgo_iot/header/m_opencv.h

@@ -24,6 +24,7 @@ public:
     OpencvFunc();
     QString  brenner(cv::Mat &image);
     QString  Laplacian(cv::Mat &image);
+    QString  Tenengrad(cv::Mat &image);
     QString  calculateSharpness(const QImage& image);
     Mat qim2mat(QImage &qim);
 };

+ 0 - 16
q6_felgo_iot/header/main.h

@@ -37,22 +37,6 @@
 #include <opencv2/features2d/features2d.hpp>
 #include <opencv2/xfeatures2d/nonfree.hpp>
 
-#include <string.h>
-
-#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_TRACE
-#include <spdlog/spdlog.h>
-#include <spdlog/logger.h>
-#include <spdlog/sinks/rotating_file_sink.h>
-#include <spdlog/sinks/stdout_color_sinks.h>
-#include <spdlog/sinks/android_sink.h>  // Include the Android sink
-
-
-#define LOG(...) SPDLOG_LOGGER_INFO(spdlog::get("console"), __VA_ARGS__);SPDLOG_LOGGER_INFO(spdlog::get("my_logger"), __VA_ARGS__)
-#define WARN(...) SPDLOG_LOGGER_WARN(spdlog::get("console"), __VA_ARGS__);SPDLOG_LOGGER_WARN(spdlog::get("my_logger"), __VA_ARGS__)
-#define SPD_ERROR(...) SPDLOG_LOGGER_ERROR(spdlog::get("console"), __VA_ARGS__);SPDLOG_LOGGER_ERROR(spdlog::get("my_logger"), __VA_ARGS__)
-#define DEBUG(...) SPDLOG_LOGGER_DEBUG(spdlog::get("console"), __VA_ARGS__);SPDLOG_LOGGER_DEBUG(spdlog::get("my_logger"), __VA_ARGS__)
-
-
 #define APP_VERSION "1.0.10"
 
 using namespace std;

+ 1 - 1
q6_felgo_iot/header/mqtthandler.h

@@ -141,7 +141,7 @@ protected:
 
                 res = curl_easy_perform(curl);
                 if (res == CURLE_OK) {
-                    Logger::instance()->log("File downloaded and saved.");
+                    LOG("File downloaded and saved.");
                     emit downloadFinished(true,update_type);
                 } else {
                     emit downloadFinished(false,update_type);

+ 2 - 7
q6_felgo_iot/qml/Main.qml

@@ -168,7 +168,7 @@ App {
             }
             loginpage.logintimeout--
             ProfilePage.boardversion = "123"
-            logger.log("休眠计数:" + loginpage.logintimeout.toString())
+            console.log("休眠计数:",loginpage.logintimeout)
             if(loginpage.logintimeout===0){  //?秒后进入休眠
                 loginpage.logintimeout = 300
                 logoutClicked()
@@ -177,12 +177,7 @@ App {
             }
         }
     }
-
-    // 接收并显示日志消息
-    Connections {
-        target: logger
-    }
-
+    
     Connections{
         target: curl
         onDownloadFinished :function(result){

+ 10 - 11
q6_felgo_iot/qml/pages/AnimationsPage.qml

@@ -13,7 +13,6 @@ AppPage {
     iconType: IconType.paintbrush
     onClicked: {
         audio.play()
-        logger.log("这是一条日志消息。")
     }
   }
 
@@ -31,16 +30,16 @@ AppPage {
     bottomMargin: nativeUtils.safeAreaInsets.bottom
 
     // 接收并显示日志消息
-    Connections {
-        target: logger
-        onLogMessage: {
-            logTextArea.text += message + "\n"
-            console.log("logTextArea:",logTextArea.contentHeight)
-            if(logTextArea.contentHeight>5000){
-                logTextArea.clear()
-            }
-        }
-    }
+    // Connections {
+    //     target: logger
+    //     onLogMessage: {
+    //         logTextArea.text += message + "\n"
+    //         console.log("logTextArea:",logTextArea.contentHeight)
+    //         if(logTextArea.contentHeight>5000){
+    //             logTextArea.clear()
+    //         }
+    //     }
+    // }
 
     Column {
       id: content

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

@@ -50,10 +50,7 @@ AppPage {
           mqtt_sta.detailText="MQTT已断开"
         }
   }
-  //日志
-  Connections {
-      target: logger
-  }
+
 
   Connections{
       target: myClass
@@ -63,7 +60,7 @@ AppPage {
       target: serial
       onDataReceived:{
           var jsonData = JSON.parse(data)
-          logger.log("接收到主板数据:" + data.toString())
+          console.debug("接收到主板数据:",data.toString())
           if(jsonData.ext.work_sta==="0"){
               if(jsonData.ext.ds==="0"){
                 work_header.text =qsTr("<b>设备开关:</b> 关机") + "-" +  qsTr("<b>工作状态:</b> 待机")

+ 1 - 6
q6_felgo_iot/qml/pages/HomePage.qml

@@ -67,11 +67,6 @@ AppPage {
         }
   }
 
-  //日志
-  Connections {
-      target: logger
-  }
-
   Connections{
       target: myClass
   }
@@ -80,7 +75,7 @@ AppPage {
       target: serial
       onDataReceived:{
           var jsonData = JSON.parse(data)
-          logger.log("接收到主板数据:" + data.toString())
+          console.log("接收到主板数据:",data.toString())
           if(jsonData.ext.work_sta==="0"){
               text_devicesta.text = qsTr("<b>工作状态:</b> 待机")
               if(jsonData.ext.ds==="0"){

+ 3 - 7
q6_felgo_iot/qml/pages/ProfilePage.qml

@@ -45,10 +45,6 @@ AppPage {
               }
             }
 
-            Connections {
-                target: logger
-            }
-
             //行表头-竖向的
             property int verHeaderHeight: 30
             property int verHeaderWidth: 150
@@ -430,7 +426,7 @@ AppPage {
                                     if(sqlite_switch.checked){
                                         var dbs = db_cfg.openDatabase(sqlite_combox.displayText)
                                         if(dbs){
-                                            logger.log("打开数据库成功");
+                                            console.log("打开数据库成功");
                                             sqlite_combox.enabled = false
                                             table_combox.enabled = true
                                             if(sqlite_combox.displayText==="data.db")
@@ -444,12 +440,12 @@ AppPage {
                                         }else{
                                             sqlite_switch.checked = false
                                             sqlite_combox.enabled = true;
-                                            logger.log("打开数据库失败");
+                                            console.log("打开数据库失败");
                                         }
                                     }else{
                                         sqlite_combox.enabled = true;
                                         db_cfg.closeDatabase()
-                                        logger.log("关闭数据库");
+                                        console.log("关闭数据库");
                                     }
                                 }
                             }

+ 3 - 7
q6_felgo_iot/qml/pages/SqlScreen.qml

@@ -26,10 +26,6 @@ AppPage {
       }
     }
 
-    Connections {
-        target: logger
-    }
-
     //行表头-竖向的
     property int verHeaderHeight: 30
     property int verHeaderWidth: 150
@@ -411,7 +407,7 @@ AppPage {
                             if(sqlite_switch.checked){
                                 var dbs = db_cfg.openDatabase(sqlite_combox.displayText)
                                 if(dbs){
-                                    logger.log("打开数据库成功");
+                                    console.log("打开数据库成功");
                                     sqlite_combox.enabled = false
                                     table_combox.enabled = true
                                     if(sqlite_combox.displayText==="data.db")
@@ -425,12 +421,12 @@ AppPage {
                                 }else{
                                     sqlite_switch.checked = false
                                     sqlite_combox.enabled = true;
-                                    logger.log("打开数据库失败");
+                                    console.log("打开数据库失败");
                                 }
                             }else{
                                 sqlite_combox.enabled = true;
                                 db_cfg.closeDatabase()
-                                logger.log("关闭数据库");
+                                console.log("关闭数据库");
                             }
                         }
                     }

+ 50 - 3
q6_felgo_iot/qml/pages/TestPage.qml

@@ -220,12 +220,12 @@ AppPage {
                   color:  "red"
                 }
                 AppText {
-                  visible: app.photoclarity
+                  visible: true//app.photoclarity
                   id: photoclarity2_text
                   anchors.top:  photoclarity_text.bottom
                   width: parent.width
                   text: frames.qulityString
-                  color:  "red"
+                  color:  "green"
                 }
             }
         }
@@ -521,7 +521,7 @@ AppPage {
                             onClicked:
                             {
                                 console.log("停止")
-                                serial.sendCmd("movx",false,"f"+stepDistance,speed.toString())
+                                serial.sendCmd("movx",false,"f0","")
                             }
                         }
                         AppButton {
@@ -534,6 +534,53 @@ AppPage {
                             minimumHeight: dp(30)
                             minimumWidth: dp(50)
                             width: (parent.width - dp(30))/3  // 平均分配宽度
+
+                            // property var pressTime: 0
+                            // property bool isLongPress: false
+
+                            // Timer{
+                            //     id: longPressTimer
+                            //     interval: 200
+                            //     onTriggered: {
+                            //         if (myButton.pressed) {
+                            //             myButton.isLongPress = true
+                            //             console.log("长按") // 持续按下超过 200ms,打印
+                            //             if(currentAxis==0)
+                            //             {
+                            //                 console.log("X轴反转:",stepDistance)
+                            //                 serial.sendCmd("movx",false,"b1000","0")
+                            //             }else if(currentAxis==1)
+                            //             {
+                            //                 console.log("Y轴反转:",stepDistance)
+                            //                 serial.sendCmd("movy",false,"b1000","0")
+                            //             }else if(currentAxis==2)
+                            //             {
+                            //                 console.log("Z轴反转:",stepDistance)
+                            //                 serial.sendCmd("movz",false,"b1000","0")
+                            //             }
+                            //         }
+                            //     }
+                            // }
+
+                            // onPressed:
+                            // {
+                            //     console.log("反转按钮按下!")  //持续200ms后,长时运动
+                            //     longPressTimer.start() // 启动定时器
+                            // }
+                            // onReleased:
+                            // {
+                            //     console.log("反转按钮释放!")  //立即关闭电机驱动
+                            //     longPressTimer.stop() // 停止定时器
+                            //     if (myButton.isLongPress) {
+                            //         console.log("0") // 释放时打印 0
+                            //     } else {
+                            //         console.log("1") // 按下时间小于 200ms,打印 1
+                            //     }
+
+                            //     // 重置状态
+                            //     myButton.isLongPress = false
+                            // }
+
                             onClicked:
                             {
                                 if(currentAxis==0)

+ 2 - 2
q6_felgo_iot/src/ImageStitcher.cpp

@@ -203,7 +203,7 @@ int ImageStitcher::stitch_default()
                 DataPath += "/" + currentDateTimeString + "result-2.jpg";
                 param::ptlist_res.append(DataPath);
             }
-            Logger::instance()->log("图片拼接成功,路径:"+DataPath);
+            LOG("图片拼接成功:{}",DataPath.toStdString());
             cvMatToQImage(result).save(DataPath,"jpg",100);
             //cv:imwrite(DataPath.toStdString(),result);
             DataPath = uripath + DataPath;
@@ -219,7 +219,7 @@ int ImageStitcher::stitch_default()
             param::camera_tc = 0;
             return 0;
         }else{
-            Logger::instance()->log("图片拼接失败!");
+            ERROR("图片拼接失败!");
             emit stitchFailed();
             for(int i=0;i<param::ptlist.size();++i){
                 curl_upload(param::ptlist.at(i));

+ 95 - 62
q6_felgo_iot/src/cameramanager.cpp

@@ -38,8 +38,6 @@
 #include <m_workthread.h>
 #include <mserial.h>
 #include <curl/curl.h>
-#include <iostream>
-#include <string>
 #include <main.h>
 #include <m_loger.h>
 #include <QMessageBox>
@@ -105,6 +103,10 @@ extern "C" void Java_com_yfkj_cb_Q6iot_UvcCameraActivity_UvcHandle(JNIEnv* env,
     env->ReleaseStringUTFChars(strData, strChars);
     sender_custom.signalQStr(qstr);
     qDebug() << "Received string data from Java:" << qstr;
+    if(qstr.contains("UVCFAILED"))
+    {
+        qDebug() << "相机打开失败!";
+    }
 }
 
 
@@ -271,8 +273,8 @@ Frames::Frames(QObject * parent)
             this, &Frames::onFPSUpdated);
 
 
-//    connect(this,&Frames::startGrabbing,
-//            this,&Frames::handleGrab);
+   connect(this,&Frames::startGrabbing,
+           this,&Frames::handleGrab);
 
     connect(this,&Frames::uvcframeAvailable,
             this,&Frames::parseFrame);
@@ -330,7 +332,7 @@ Frames::setVideoSink( QVideoSink * newVideoSink )
 void
 Frames::setChange(bool stat_t)
 {
-    qDebug() << "开始自动对焦,发送指令到控制板!";
+    LOG("开始自动对焦,发送指令到控制板!");
     if(stat_t){
         emit serial_data(m_json.Autofocus());
     }
@@ -437,6 +439,11 @@ Frames::setCameraSw(bool stat_cam)
                     jClass->callMethod<void>("openDevice","(Landroid/content/Context;)V",qtContext.object());
                 }
             #else
+                if (handle)
+                {
+                    MV_CC_DestroyHandle(handle);
+                    handle  = NULL;
+                }
                 unsigned int nIndex = 0;
                 MV_CC_DEVICE_INFO_LIST stDeviceList;
                 memset(&stDeviceList, 0, sizeof(MV_CC_DEVICE_INFO_LIST));
@@ -521,6 +528,7 @@ Frames::setCameraSw(bool stat_cam)
                      qDebug() << "Set Trigger Mode fail! nRet" << QString::number(unsignedValue, 16).toUpper();
                      return;
                  }
+                 #if 0
                  //注册抓图回调
                  nRet = MV_CC_RegisterImageCallBackEx(handle,ImageCallBackEx,this);
                  if (MV_OK != nRet)
@@ -531,6 +539,7 @@ Frames::setCameraSw(bool stat_cam)
                  }else{
                      qDebug() << "MV_CC_RegisterImageCallBackEx Success!";
                  }
+                #endif
                  MVCC_INTVALUE_EX width,height;
                  nRet = MV_CC_GetIntValueEx(handle, "Width", &width);
                  if(nRet==MV_OK){
@@ -559,6 +568,7 @@ Frames::setCameraSw(bool stat_cam)
                  }else{
                      m_fps_timer->setRunning(true);
                      m_1s->start();
+                     emit startGrabbing(true);
                  }
             #endif
         }
@@ -578,6 +588,7 @@ Frames::setCameraSw(bool stat_cam)
                 unsigned int unsignedValue = static_cast<unsigned int>(nRet);
                 qDebug() << "MV_CC_StopGrabbing fail! nRet:" << QString::number(unsignedValue, 16).toUpper();
             }
+            #if 0
             // ch:注销抓图回调 | en:Unregister image callback
             nRet = MV_CC_RegisterImageCallBackEx(handle, NULL, NULL);
             if (MV_OK != nRet)
@@ -585,6 +596,7 @@ Frames::setCameraSw(bool stat_cam)
                 unsigned int unsignedValue = static_cast<unsigned int>(nRet);
                 qDebug() << "MV_CC_RegisterImageCallBackEx fail! nRet:" << QString::number(unsignedValue, 16).toUpper();
             }
+            #endif
             // close device
             nRet = MV_CC_CloseDevice(handle);
             if (MV_OK != nRet)
@@ -608,7 +620,7 @@ Frames::setCameraSw(bool stat_cam)
         m_processThread.waitForFinished();  //阻塞
     }
 
-    Logger::instance()->log("设置相机状态: " + QString::number(camera_sta));
+    LOG("设置相机状态:{}",camera_sta);
     emit cameraStaChanged(camera_sta);                   //同步状态到qml
     emit serial_data(m_json.setLedState(camera_sta));    //设置补光灯状态
 }
@@ -688,22 +700,26 @@ Frames::handleGrab(bool sta_cam){
                 if(flag_cam){
                     nRet = MV_CC_GetOneFrameTimeout(handle, pData, nDataSize, &stImageInfo, 10000);
                     if (nRet == MV_OK){
-                        qDebug() << "MV_CC_GetOneFrameTimeout Success" <<stImageInfo.enPixelType << stImageInfo.nHeight << stImageInfo.nWidth;
+                        //qDebug() << "MV_CC_GetOneFrameTimeout Success" <<stImageInfo.enPixelType << stImageInfo.nHeight << stImageInfo.nWidth;
                         if ( stImageInfo.enPixelType == 0 )
                         {
                             //转换为Mat类型
                             //cv::Mat tempMat = Mat(stImageInfo.nHeight , stImageInfo.nWidth, CV_8UC3,pData);  //BGR
-                            tempMat = Mat(stImageInfo.nHeight , stImageInfo.nWidth, CV_8UC2,pData);
+                            tempMat = Mat(stImageInfo.nHeight , stImageInfo.nWidth, CV_8UC1,pData);  //YUV CV_8UC2
                             if (tempMat.empty()) {
                                 // 处理转换失败的情况
                                 qDebug() << "Failed to convert QByteArray to cv::Mat";
                                 return; // 可能需要根据实际情况进行处理,比如抛出异常或返回错误码
                             }
+                            #if 0
                             cv::Mat bgrImage;
                             cv::cvtColor(tempMat, bgrImage, cv::COLOR_YUV2RGB_YVYU);//YUV422
                             cv::cvtColor(bgrImage,m_frame,cv::COLOR_RGB2RGBA);
-
-                            const int size_frame = m_frame.rows * m_frame.cols * 4;
+                            #else
+                            cv::cvtColor(tempMat,m_frame,cv::COLOR_BayerRG2RGBA);
+                            #endif
+                            #if 1
+                            const int size_frame = m_frame.total()*m_frame.elemSize();  //字节数
                             //m_image = cvMatToQImage(m_frame);
                             // 创建 QVideoFrame 对象,并设置相关参数
                             QVideoFrameFormat frame_format(QSize(m_frame.cols, m_frame.rows),
@@ -714,12 +730,35 @@ Frames::handleGrab(bool sta_cam){
                                memcpy(f.bits(0),m_frame.data,size_frame);
                                f.setStartTime(0);
                                f.unmap();
-                               if(m_videoSink != nullptr){
-                                   m_videoSink->setVideoFrame(f);
-                               }
+                               // 确保在主线程更新UI
+                               QMetaObject::invokeMethod(m_videoSink, [this, f]() {
+                                   if (m_videoSink) {
+                                       m_videoSink->setVideoFrame(f);
+                                   }
+                               }, Qt::QueuedConnection);
+                               // if(m_videoSink != nullptr){
+                               //     m_videoSink->setVideoFrame(f);
+                               // }
                             }
+                            m_fps_timer->incrementFrame();
+                            if(param::camera_tc==1||param::camera_tc==100){
+                                QDateTime currentDateTime = QDateTime::currentDateTime();
+                                QString currentDateTimeString = currentDateTime.toString("yyyyMMddhhmmss");
+                                QString appDataPath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
+                                if(f.isValid()) m_image = f.toImage().convertToFormat(QImage::Format_RGB32);
+                                param::camera_tc = 0;
+                                param::ptlist.append(appDataPath + "/" + currentDateTimeString + "-1.jpg");
+                                LOG("Pt1 is:{}",param::ptlist.at(0).toStdString());
+                                if(m_image.save(param::ptlist.at(0),"jpg",100))
+                                {
+                                    emit signal_stitch();
+                                    setCameraSw(false);
+                                    break;
+                                }
+                            }
+                            #else
                             emit uvcframeAvailable(m_frame);
-                            QThread::msleep(100);  // 休眠2秒
+                            #endif
                         }else{
                             qDebug() << "enPixelType:" << stImageInfo.enPixelType;
                         }
@@ -755,7 +794,7 @@ Frames::parseFrame(const cv::Mat& frame){
 #if 1
                 //进行色彩转换
                 // 将YUV422数据转换为RGB格式
-                cv::cvtColor(frame,m_frame,cv::COLOR_RGB2RGBA);
+                //cv::cvtColor(frame,m_frame,cv::COLOR_RGB2RGBA);
                 const int size_frame = m_frame.total()*m_frame.elemSize();  //字节数
 
                 // 创建 QVideoFrame 对象,并设置相关参数
@@ -770,7 +809,7 @@ Frames::parseFrame(const cv::Mat& frame){
                        m_videoSink->setVideoFrame(f);
                    }
                 }
-                #if 1
+                #if 0
                 if(m_1s->isActive())
                     m_qulityString = m_opencvfunc.brenner(m_frame);     //计算对比度
                 #endif            
@@ -781,7 +820,7 @@ Frames::parseFrame(const cv::Mat& frame){
                 QString setup_s;
                 if(param::camera_tc==100){       //拍照上传
                     param::ptlist.append(appDataPath + "/" + currentDateTimeString + "-1.jpg");
-                    Logger::instance()->log("pt1 is:"+param::ptlist.at(0));
+                    LOG("Pt1 is:{}",param::ptlist.at(0).toStdString());
                     if(param::camera_type.contains("hikrobot")){
                         if(cv::imwrite(param::ptlist.at(0).toStdString(), m_frame)){
                             param::camera_tc = 10;
@@ -801,7 +840,7 @@ Frames::parseFrame(const cv::Mat& frame){
                     switch(param::stitch_photonum){ //拼接数量
                         case 1:
                             param::ptlist.append(appDataPath + "/" + currentDateTimeString + "-1.jpg");
-                            Logger::instance()->log("pt1 is:"+param::ptlist.at(0));
+                            LOG("pt1 is:{}",param::ptlist.at(0).toStdString());
                             if(m_image.save(param::ptlist.at(0),"jpg",100)) param::camera_tc = 10;
                             break;
                         case 2:
@@ -812,7 +851,7 @@ Frames::parseFrame(const cv::Mat& frame){
                                 case 0:
                                     if(stitch_des==0){
                                         param::ptlist.append(appDataPath + "/" + currentDateTimeString + "-1.jpg");
-                                        Logger::instance()->log("pt1 is:"+param::ptlist.at(0));
+                                        LOG("pt1 is:{}",param::ptlist.at(0).toStdString());
                                         if(m_image.save(param::ptlist.at(0),"jpg",100)){
                                             //movx b
                                             setup_s = "b" + QString::number(param::photo_width);
@@ -825,7 +864,7 @@ Frames::parseFrame(const cv::Mat& frame){
                                 case 1:
                                     if(stitch_des==1){
                                         param::ptlist.append(appDataPath + "/" + currentDateTimeString + "-2.jpg");
-                                        Logger::instance()->log("pt2 is:"+param::ptlist.at(1));
+                                        LOG("pt2 is:{}",param::ptlist.at(1).toStdString());
                                         if(m_image.save(param::ptlist.at(1),"jpg",100)){
                                             stitch_des = 10;
                                         }
@@ -842,7 +881,7 @@ Frames::parseFrame(const cv::Mat& frame){
                                 case 0:
                                     if(stitch_des==0){
                                         param::ptlist.append(appDataPath + "/" + currentDateTimeString + "-1.jpg");
-                                        Logger::instance()->log("pt1 is:"+param::ptlist.at(0));
+                                        LOG("pt1 is:{}",param::ptlist.at(0).toStdString());
                                         if(m_image.save(param::ptlist.at(0),"jpg",100)){
                                             //movx b
                                             setup_s = "b" + QString::number(param::photo_width);
@@ -854,8 +893,8 @@ Frames::parseFrame(const cv::Mat& frame){
                                     break;
                                 case 1:
                                     if(stitch_des==1){
-                                        param::ptlist.append(appDataPath + "/" + currentDateTimeString + "-2.jpg");
-                                        Logger::instance()->log("pt2 is:"+param::ptlist.at(1));
+                                        param::ptlist.append(appDataPath + "/" + currentDateTimeString + "-2.jpg");;
+                                        LOG("pt2 is:{}",param::ptlist.at(1).toStdString());
                                         if(m_image.save(param::ptlist.at(1),"jpg",100)){
                                             //movx b
                                             setup_s = "b" + QString::number(param::photo_width);
@@ -867,7 +906,8 @@ Frames::parseFrame(const cv::Mat& frame){
                                 case 2:
                                     if(stitch_des==2){
                                         param::ptlist.append(appDataPath + "/" + currentDateTimeString + "-3.jpg");
-                                        Logger::instance()->log("pt3 is:"+param::ptlist.at(2));
+
+                                        LOG("pt3 is:{}",param::ptlist.at(2).toStdString());
                                         if(m_image.save(param::ptlist.at(1),"jpg",100)) stitch_des = 10;
                                     }
                                     break;
@@ -883,7 +923,8 @@ Frames::parseFrame(const cv::Mat& frame){
                                 case 0:
                                     if(stitch_des==0){
                                         param::ptlist.append(appDataPath + "/" + currentDateTimeString + "-1.jpg");
-                                        Logger::instance()->log("pt1 is:"+param::ptlist.at(0));
+
+                                        LOG("pt1 is:{}",param::ptlist.at(0).toStdString());
                                         if(m_image.save(param::ptlist.at(0),"jpg",100)){
                                             //movx b
                                             setup_s = "b" + QString::number(param::photo_width);
@@ -896,7 +937,8 @@ Frames::parseFrame(const cv::Mat& frame){
                                 case 1:
                                     if(stitch_des==1){
                                         param::ptlist.append(appDataPath + "/" + currentDateTimeString + "-2.jpg");
-                                        Logger::instance()->log("pt2 is:"+param::ptlist.at(1));
+
+                                        LOG("pt2 is:{}",param::ptlist.at(1).toStdString());
                                         if(m_image.save(param::ptlist.at(1),"jpg",100)){
                                             //movz f
                                             setup_s = "f" + QString::number(param::photo_height);
@@ -909,7 +951,8 @@ Frames::parseFrame(const cv::Mat& frame){
                                 case 2:
                                     if(stitch_des==2){
                                         param::ptlist.append(appDataPath + "/" + currentDateTimeString + "-3.jpg");
-                                        Logger::instance()->log("pt3 is:"+param::ptlist.at(2));
+
+                                        LOG("pt3 is:{}",param::ptlist.at(2).toStdString());
                                         if(m_image.save(param::ptlist.at(2),"jpg",100)){
                                             //movx b
                                             setup_s = "f" + QString::number(param::photo_width);
@@ -922,7 +965,8 @@ Frames::parseFrame(const cv::Mat& frame){
                                 case 3:
                                     if(stitch_des==3){
                                         param::ptlist.append(appDataPath + "/" + currentDateTimeString + "-4.jpg");
-                                        Logger::instance()->log("pt4 is:"+param::ptlist.at(3));
+
+                                        LOG("pt4 is:{}",param::ptlist.at(3).toStdString());
                                         if(m_image.save(param::ptlist.at(3),"jpg",100)){
                                             param::camera_tc = 10;
                                         }
@@ -954,7 +998,8 @@ Frames::parseFrame(const cv::Mat& frame){
                             case 0:
                                 if(stitch_des==0){
                                     param::ptlist.append(appDataPath + "/" + currentDateTimeString + "-1.jpg");
-                                    Logger::instance()->log("pt1 is:"+param::ptlist.at(0));
+
+                                    LOG("pt1 is:{}",param::ptlist.at(0).toStdString());
                                     if(m_image.save(param::ptlist.at(0),"jpg",90)){
                                         //movx b
                                         setup_s = "b" + QString::number(param::photo_width);
@@ -967,7 +1012,7 @@ Frames::parseFrame(const cv::Mat& frame){
                             case 1:
                                 if(stitch_des==1){
                                     param::ptlist.append(appDataPath + "/" + currentDateTimeString + "-2.jpg");
-                                    Logger::instance()->log("pt1 is:"+param::ptlist.at(1));
+                                    LOG("pt2 is:{}",param::ptlist.at(1).toStdString());
                                     if(m_image.save(param::ptlist.at(1),"jpg",90)){
                                         //movx b
                                         setup_s = "b" + QString::number(param::photo_height);
@@ -980,7 +1025,8 @@ Frames::parseFrame(const cv::Mat& frame){
                             case 2:
                                 if(stitch_des==2){
                                     param::ptlist.append(appDataPath + "/" + currentDateTimeString + "-3.jpg");
-                                    Logger::instance()->log("pt1 is:"+param::ptlist.at(2));
+
+                                    LOG("pt3 is:{}",param::ptlist.at(2).toStdString());
                                     if(m_image.save(param::ptlist.at(2),"jpg",90)){
                                         //movz f
                                         setup_s = "f" + QString::number(param::photo_width);
@@ -993,7 +1039,8 @@ Frames::parseFrame(const cv::Mat& frame){
                             case 3: //movx f
                                 if(stitch_des==3){
                                     param::ptlist.append(appDataPath + "/" + currentDateTimeString + "-4.jpg");
-                                    Logger::instance()->log("pt1 is:"+param::ptlist.at(3));
+
+                                    LOG("pt4 is:{}",param::ptlist.at(3).toStdString());
                                     if(m_image.save(param::ptlist.at(3),"jpg",90)){
                                         //movx f
                                         setup_s = "f" + QString::number(param::photo_width);
@@ -1005,7 +1052,8 @@ Frames::parseFrame(const cv::Mat& frame){
                             case 4: //movx f
                                 if(stitch_des==4){
                                     param::ptlist.append(appDataPath + "/" + currentDateTimeString + "-5.jpg");
-                                    Logger::instance()->log("pt1 is:"+param::ptlist.at(4));
+
+                                    LOG("pt5 is:{}",param::ptlist.at(4).toStdString());
                                     if(m_image.save(param::ptlist.at(4),"jpg",90)){
                                         //movx f
                                         setup_s = "f" + QString::number(param::photo_width);
@@ -1017,7 +1065,8 @@ Frames::parseFrame(const cv::Mat& frame){
                             case 5: //movz f
                                 if(stitch_des==5){
                                     param::ptlist.append(appDataPath + "/" + currentDateTimeString + "-6.jpg");
-                                    Logger::instance()->log("pt1 is:"+param::ptlist.at(5));
+
+                                    LOG("pt6 is:{}",param::ptlist.at(5).toStdString());
                                     if(m_image.save(param::ptlist.at(5),"jpg",90)){
 
                                         setup_s = "f" + QString::number(param::photo_width);
@@ -1029,7 +1078,8 @@ Frames::parseFrame(const cv::Mat& frame){
                             case 6: //movx b
                                 if(stitch_des==6){
                                     param::ptlist.append(appDataPath + "/" + currentDateTimeString + "-7.jpg");
-                                    Logger::instance()->log("pt1 is:"+param::ptlist.at(6));
+
+                                    LOG("pt7 is:{}",param::ptlist.at(6).toStdString());
                                     if(m_image.save(param::ptlist.at(6),"jpg",90)){
                                         //movx f
                                         setup_s = "b" + QString::number(param::photo_width);
@@ -1041,7 +1091,8 @@ Frames::parseFrame(const cv::Mat& frame){
                             case 7: //movx b
                                 if(stitch_des==7){
                                     param::ptlist.append(appDataPath + "/" + currentDateTimeString + "-8.jpg");
-                                    Logger::instance()->log("pt1 is:"+param::ptlist.at(7));
+
+                                    LOG("pt8 is:{}",param::ptlist.at(7).toStdString());
                                     if(m_image.save(param::ptlist.at(7),"jpg",90)){
                                         //movx f
                                         setup_s = "b" + QString::number(param::photo_width);
@@ -1053,7 +1104,7 @@ Frames::parseFrame(const cv::Mat& frame){
                             case 8:
                                 if(stitch_des==8){
                                     param::ptlist.append(appDataPath + "/" + currentDateTimeString + "-9.jpg");
-                                    Logger::instance()->log("pt1 is:"+param::ptlist.at(8));
+                                    LOG("pt9 is:{}",param::ptlist.at(8).toStdString());
                                     if(m_image.save(param::ptlist.at(8),"jpg",90)){
                                         param::camera_tc = 10;
                                         stitch_des = 9;
@@ -1266,7 +1317,7 @@ void
 Frames::saveImage()
 {
     //停止清晰度发送,关闭定时器m1s
-    Logger::instance()->log("saveImage!");
+    LOG("saveImage start!");
     #ifdef focus_board
     if(camera_sw()==true)
         param::camera_tc = 1;
@@ -1276,9 +1327,10 @@ Frames::saveImage()
     Mat image_gray;
     cv::cvtColor(m_frame,image_gray,cv::COLOR_RGBA2GRAY);
     double grayvalue = cv::mean(image_gray)[0];
-    m_qulityString = m_opencvfunc.Laplacian(m_frame);
+    m_qulityString = m_opencvfunc.Tenengrad(m_frame);
     emit qulityStringChanged();
-    Logger::instance()->log("image_gray!"+QString::number(grayvalue) + "Laplacian:" + m_qulityString);
+    LOG("image_gray:{}",grayvalue);
+    LOG("Tenengrad:{}",m_qulityString.toStdString());
     if(grayvalue<50.0){
         emit dataUpload(m_json.MakeJsonWarn("Photo ERROR",QString::number(grayvalue)));
         setCameraSw(false); //关闭相机
@@ -1291,28 +1343,9 @@ Frames::saveImage()
 
 
     if(max_image_qulity < 1.0){
-         emit serial_data(m_json.MotorMove("movy","f4",""));
-        return;
+        emit serial_data(m_json.MotorMove("movy","b50","1"));
     }
 
-    if(m_qulityString.toDouble()>2.0&&m_qulityString.toDouble()>max_image_qulity/1.1)
-    {
-        if(param::auto_focus=="done"){
-            MAX_STEP = 6;
-            emit serial_data(m_json.MotorMove("movy","b100",""));
-            return;
-        }
-        param::camera_tc = 1;
-        return;
-    }else{
-        //对焦
-        MAX_STEP = 6;
-        emit serial_data(m_json.MotorMove("movy","b100",""));
-    }
-
-    //if(param::auto_focus=="done")
-    //max_image_qulity = 100.0;
-
     #endif
 
 }
@@ -1378,11 +1411,11 @@ Frames::captureImage(){
             m_imageCapture->captureToFile();
 
         }
-    }else if(param::camera_type.contains("uvc")){
+    }else if(param::camera_type.contains("uvc")||param::camera_type.contains("hikrobot")){
         setCameraSw(true);
         // 延时一段时间后触发拍照
         QTimer::singleShot(10000, [](){
-            Logger::instance()->log("立即拍照");
+            LOG("立即拍照!");
             param::camera_tc = 100;
         });
     }

+ 26 - 30
q6_felgo_iot/src/m_loger.cpp

@@ -1,34 +1,30 @@
 #include <m_loger.h>
-#include <QDateTime>
+#include <QStandardPaths>
 
-#define LOG_HEAD "[" __FILE__ ":" << __LINE__ << "]: "
+void Logger::Init() {
+    static std::once_flag flag;
+    std::call_once(flag, [this]() {
+        try {
+            QString appDataPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
+            // 在内部存储空间路径下创建子目录
+            QString subDirName = "/run_log.txt";
+            QString subDirPath = appDataPath + subDirName;
+            // 滚动日志设置:最大文件大小为5MB,最多保留3个文件
+            auto console_sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
+            auto rotating_sink = std::make_shared<spdlog::sinks::rotating_file_sink_mt>(subDirPath.toStdString(), 1024 * 1024 * 10, 10);
+            auto android_logger = std::make_shared<spdlog::sinks::android_sink_mt>();
+            console_sink->set_level(spdlog::level::debug);
+            rotating_sink->set_level(spdlog::level::trace);
 
-Logger* Logger::instance()
-{
-    static Logger logger;
-    return &logger;
-}
-
-void Logger::log(const QString& message)
-{
-    const char* filePath = __FILE__; // 获取完整路径
-    std::string fileName = filePath; // 将完整路径转换为字符串
-    // 使用标准库查找最后一个路径分隔符(通常是斜杠或反斜杠)
-    size_t lastSlash = fileName.find_last_of("/\\");
-    if (lastSlash != std::string::npos) {
-        // 如果找到路径分隔符,则截取文件名部分
-        fileName = fileName.substr(lastSlash + 1);
-    }
-    const int fLine = __LINE__; // 获取完整路径
-    // 将字符串流的内容转换为 QString
-    QString logHeader = QString::fromStdString(fileName) + "-" + QString::number(fLine);
-
-    // 获取当前日期和时间
-    QDateTime currentDateTime = QDateTime::currentDateTime();
-    // 将日期和时间转换为字符串
-    QString currentDateTimeStr = currentDateTime.toString(" yyyy-MM-dd hh:mm:ss ");
-    QString log_str = logHeader + currentDateTimeStr + message;
-    emit logMessage(log_str);
-    LOG(message.toStdString());
-    qDebug()<<logHeader<<currentDateTimeStr<<message;
+            loggerPtr = std::make_shared<spdlog::logger>("yf_logger", spdlog::sinks_init_list({console_sink, rotating_sink,android_logger}));
+            loggerPtr->set_level(spdlog::level::trace);
+            loggerPtr->flush_on(spdlog::level::trace);
+            //每三秒刷新一次
+            spdlog::flush_every(std::chrono::seconds(3));
+            spdlog::register_logger(loggerPtr);
+        } catch (const spdlog::spdlog_ex& ex) {
+            std::cerr << "Log initialization failed: " << ex.what() << std::endl;
+            throw;
+        }
+    });
 }

+ 31 - 0
q6_felgo_iot/src/m_opencv.cpp

@@ -90,6 +90,37 @@ QString OpencvFunc::Laplacian(cv::Mat &image){
     return QString::number(sharpness,'f',3);
 }
 
+QString OpencvFunc::Tenengrad(cv::Mat &image)
+{
+    // 1. 检查输入有效性
+    if (image.empty()) {
+        return QString("Error: Input image is empty!");
+    }
+     // 2. 转换为灰度图(如果是彩色图像)
+    cv::Mat gray;
+    if (image.channels() > 1) {
+        cv::cvtColor(image, gray, cv::COLOR_BGR2GRAY);
+    } else {
+        gray = image.clone();
+    }
+    // 3. 计算Sobel梯度
+    cv::Mat gx, gy;
+    cv::Sobel(gray, gx, CV_64F, 1, 0, 3); // x方向梯度 (64位浮点)
+    cv::Sobel(gray, gy, CV_64F, 0, 1, 3); // y方向梯度
+
+    // 4. 计算梯度平方和
+    cv::Mat gradient_sq;
+    cv::multiply(gx, gx, gx); // gx = gx²
+    cv::multiply(gy, gy, gy); // gy = gy²
+    cv::add(gx, gy, gradient_sq); // gradient_sq = gx² + gy²
+
+    // 5. 计算均值 (Tenengrad评分)
+    double sharpness = cv::mean(gradient_sq)[0];
+
+    // 6. 转换为保留两位小数的字符串
+    return QString::number(sharpness,'f',3);
+}
+
 Mat OpencvFunc::qim2mat(QImage &qim)
 {
     Mat mat;

+ 32 - 48
q6_felgo_iot/src/main.cpp

@@ -8,6 +8,7 @@
 #include <mysql.h>
 #include <EasyTableModel.h>
 #include <customitem.h>
+#include <m_loger.h>
 // uncomment this line to add the Live Client Module and use live reloading with your custom C++ code
 //#include <FelgoLiveClient>
 
@@ -48,27 +49,27 @@ public slots:
         emit recvqmlslot();
     }
     void systemPage(){
-        Logger::instance()->log("systemPage");
+        LOG("systemPage");
         emit tosystempage();
     }
     void openbar_btnClicked(){
-        Logger::instance()->log("openbar_btnClicked");
-         emit opensystembar();
+        LOG("openbar_btnClicked");
+        emit opensystembar();
     }
 
     void closebar_btnClicked(){
-        Logger::instance()->log("closebar_btnClicked");
-         emit closesystembar();
+        LOG("closebar_btnClicked");
+        emit closesystembar();
     }
 
     void opennav_btnClicked(){
-        Logger::instance()->log("opennav_btnClicked");
-         emit opensystemnav();
+        LOG("opennav_btnClicked");
+        emit opensystemnav();
     }
 
     void closenav_btnClicked(){
-        Logger::instance()->log("closenav_btnClicked");
-         emit closesystemnav();
+        LOG("closenav_btnClicked");
+        emit closesystemnav();
     }
 
 
@@ -152,15 +153,15 @@ private slots://槽函数中实现了GPS部分信息的读取
         }
         param::gps_lat = QString::number(nowLatitude);
         param::gps_lng = QString::number(nowLongitude);
-        Logger::instance()->log("经度:" + QString::number(nowLongitude));
-        Logger::instance()->log("纬度:" + QString::number(nowLatitude));
-        Logger::instance()->log("角度:" + QString::number(nowDirection));
-        Logger::instance()->log("地表速度:" + QString::number(nowGroundSpeed));
-        Logger::instance()->log("垂直速度:" + QString::number(nowVerticalSpeed));
-        Logger::instance()->log("磁偏角:" + QString::number(nowMagneticVariation));
-        Logger::instance()->log("水平精度:" + QString::number(nowHorizontalAccuracy));
-        Logger::instance()->log("垂直精度:" + QString::number(nowVerticalAccuracy));
-        Logger::instance()->log("定位次数:" + QString::number(recv_cnt));
+        LOG("经度:{}",nowLongitude);
+        LOG("纬度:{}",nowLatitude);
+        LOG("角度:{}",nowDirection);
+        LOG("地表速度:{}",nowGroundSpeed);
+        LOG("垂直速度:{}",nowVerticalSpeed);
+        LOG("磁偏角:{}",nowMagneticVariation);
+        LOG("水平精度:{}",nowHorizontalAccuracy);
+        LOG("垂直精度:{}",nowVerticalAccuracy);
+        LOG("定位次数:{}",recv_cnt);
     }
 };
 
@@ -192,7 +193,7 @@ void sendBroadcastFromQt(QString btn_type) {
                 if(!imei.isEmpty()){
                     param::imei = imei;
                 }
-                Logger::instance()->log("IMEI:" + imei);
+                LOG("IMEI:{}",param::imei.toStdString());
             }
         }else if(btn_type=="csq"){
             jClass.callMethod<void>("getMobileNetworkSignal","(Landroid/content/Context;)V",qtContext.object());
@@ -204,7 +205,7 @@ void sendBroadcastFromQt(QString btn_type) {
                 if(!iccid.isEmpty()){
                     param::iccid = iccid;
                 }
-                Logger::instance()->log("iccid:" + param::iccid);
+                LOG("ICCID:{}",param::iccid.toStdString());
             }
         }else if(btn_type=="install"){
             qDebug() << "install process start!";
@@ -230,7 +231,7 @@ void sendBroadcastFromQt(QString btn_type) {
 
 int main(int argc, char *argv[])
 {
-
+    INITLOG();
     //sendBroadcastFromQt("service");
     // get android storage permisson
     // 该接口也可以直接使用字符串,可自行跳转到头文件自行查看
@@ -268,21 +269,8 @@ int main(int argc, char *argv[])
     #else
     // 获取应用程序内部存储空间路径
     QString appDataPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
-    //Logger::instance()->log(appDataPath);
-    // 在内部存储空间路径下创建子目录
-    QString subDirName = "/run_log.txt";
-    QString subDirPath = appDataPath + subDirName;
+    LOG("appDataPath:{}",appDataPath.toStdString());
     #endif
-    auto rotating_logger = spdlog::rotating_logger_mt("my_logger", subDirPath.toStdString(), 1024*1024*10, 10);
-    //遇到info级别,立马将缓存的buffer写到文件中
-    spdlog::flush_on(spdlog::level::trace);
-    //每三秒刷新一次
-    spdlog::flush_every(std::chrono::seconds(3));
-    spdlog::get("my_logger")->set_level(spdlog::level::trace);
-    // Set the default logger to file logger
-    auto console = spdlog::stdout_color_mt("console");
-    spdlog::get("console")->set_level(spdlog::level::trace);
-
 
     sendBroadcastFromQt("imei");
     sendBroadcastFromQt("iccid");
@@ -366,12 +354,7 @@ int main(int argc, char *argv[])
     QQmlApplicationEngine engine;
     felgo.initialize(&engine);
 
-
-    //格式设置:[年月日 时分秒毫秒] [logger实例名] [日志等级缩写] [线程ID] 日志正文
-    //rotating_logger->set_pattern("[%Y-%m-%d %T.%e] [%n] [%L] [thread %t] %v");
-    //spdlog::set_pattern("%Y-%m-%d %H:%M:%S [%l] [%t] - <%s>|<%#>|<%!>,%v");
     LOG("信息(Info)");
-    engine.rootContext()->setContextProperty("logger", Logger::instance());
     engine.setOfflineStoragePath(appDataPath);  //设置数据库存储路径
     engine.rootContext()->setContextProperty("appdir", qApp->applicationDirPath()); //使用QApplication::applicationDirPath()获取,并注册到qml中
     qmlRegisterType<EasyTableModel>("EasyModel",1,0,"EasyTableModel");  //注册C++模块到QML中
@@ -406,7 +389,7 @@ int main(int argc, char *argv[])
             sqlConfig->UpdateData(param::table_camera,"stitch_photonum",QString::number(param::stitch_photonum));
         }
         sqlConfig->CloseDb();
-        Logger::instance()->log("保存拼接数量:"+QString::number(param::stitch_photonum));
+        LOG("保存拼接数量:{}",param::stitch_photonum);
     });
 
     QObject::connect(&imagestitcher,&ImageStitcher::stitchFailed,[&](){
@@ -459,7 +442,7 @@ int main(int argc, char *argv[])
 
     QObject::connect(&serialThread,&SerialThread::dataUpload,&mqttHandler,&MqttHandler::publish_m);     //串口到MQTT
     QObject::connect(&mqttHandler,&MqttHandler::dataReceived,&serialThread,&SerialThread::mqtttoserial);//MQTT到串口
-    QObject::connect(&serialThread,&SerialThread::updatestart,&m_ymodem,&YMODEM::start_ymodem);            //串口到Ymodem
+    QObject::connect(&serialThread,&SerialThread::updatestart,&m_ymodem,&YMODEM::start_ymodem);         //串口到Ymodem
     QObject::connect(&m_ymodem,&YMODEM::modem_result,&serialThread,&SerialThread::getmodemresult);      //Ymodem到串口
 
     QObject::connect(&mqttHandler,&MqttHandler::updateStm32,[&](){
@@ -481,7 +464,7 @@ int main(int argc, char *argv[])
 
 
     QObject::connect(&mqttHandler,&MqttHandler::sysReboot,[&](){
-        Logger::instance()->log("系统重启!");
+        WARN("系统重启");
         sendBroadcastFromQt("rebootSystem");
     });
 
@@ -497,7 +480,7 @@ int main(int argc, char *argv[])
     });
 
     QObject::connect(&curlHandler,&CurlHandler::downloadFinished,[&](bool result,QString mtype){
-        Logger::instance()->log("downloadFinished:" + QString::number(result) + mtype);
+        LOG("downloadFinished:{}-{}",result,mtype.toStdString());
         if(result&&mtype.contains("App")){
 //            QByteArray download_success("{\"cmd\":\"warn\",\"ext\":{\"status\":\"App DownLoad Success!\"}}");
 //            mqttHandler.publish_m(download_success);
@@ -527,7 +510,7 @@ int main(int argc, char *argv[])
         QObject::connect(&mqttHandler,&MqttHandler::autotakephoto,[&](bool stat){
              QObject *Navigation_main = rootItem->findChild<QObject*>("Navigation_main");
              if(Navigation_main){
-                 qDebug() << "Navigation_main is !!!!!"<<stat;
+                qDebug() << "Navigation_main is !!!!!"<<stat;
                 QMetaObject::invokeMethod(Navigation_main, "setCurrentTab", Q_ARG(QVariant, 1));
                 //打开相机
                 QObject *autoFocus_Page = rootItem->findChild<QObject*>("autoFocus_Page");
@@ -632,9 +615,10 @@ int main(int argc, char *argv[])
         }
 
     }else{
-        Logger::instance()->log("rootItem is null !!!!!");       
+        ERROR("rootItem is null !!!!!");
     }
-    Logger::instance()->log("app start!");
+    LOG("app start!");
+
     // to start your project as Live Client, comment (remove) the lines "felgo.setMainQmlFileName ..." & "engine.load ...",
     // and uncomment the line below
     //FelgoLiveClient client (&engine);
@@ -655,7 +639,7 @@ int main(int argc, char *argv[])
     // 10秒后恢复屏幕休眠
     // 延时一段时间后恢复屏幕常亮
     QTimer::singleShot(10000, [](){
-        Logger::instance()->log("关闭屏幕背光");
+        LOG("关闭屏幕背光");
         #if 0
         auto act = QJniObject(QtAndroidPrivate::activity());
         QAndroidIntent activityIntent(act.object(),"com/yfkj/cb/Q6iot/MainActivity");

+ 10 - 15
q6_felgo_iot/src/mqtthandler.cpp

@@ -55,12 +55,11 @@ MqttHandler::~MqttHandler()
 
 void MqttHandler::connectToBroker()
 {
-    Logger::instance()->log("connectToBroker!");
-    Logger::instance()->log("ip:" + param::mqtt_main_ip);
-    Logger::instance()->log("port:" + QString::number(param::mqtt_main_port));
-    Logger::instance()->log("keepalive:" + QString::number(param::mqtt_main_keepalive));
-    Logger::instance()->log("imei:" + param::imei);
-
+    LOG("connectToBroker...");
+    LOG("ip:{}",param::mqtt_main_ip.toStdString());
+    LOG("port:{}",param::mqtt_main_port);
+    LOG("keepalive:{}",param::mqtt_main_keepalive);
+    LOG("imei?:{}",param::imei.toStdString());
     m_client->setHostname(param::mqtt_main_ip);
     m_client->setPort(param::mqtt_main_port); // Default MQTT port is 1883
     m_client->setKeepAlive(param::mqtt_main_keepalive);
@@ -69,8 +68,8 @@ void MqttHandler::connectToBroker()
     m_client->setUsername(param::mqtt_main_uid);
     m_client->setPassword(param::mqtt_main_pwd);
     param::mqtt_main_offline = param::mqtt_main_offline + param::imei;
-    Logger::instance()->log("离线主题:"+param::mqtt_main_offline);
-    Logger::instance()->log("离线消息:"+mqtt_json.WillMessage());
+    LOG("离线主题:{}",param::mqtt_main_offline.toStdString());
+    LOG("离线消息{}:",mqtt_json.WillMessage().constData());
     m_client->setCleanSession(false);
     m_client->setWillTopic(param::mqtt_main_offline);
     m_client->setWillMessage(mqtt_json.WillMessage());
@@ -141,15 +140,11 @@ MqttHandler::onConnected()
 {
     if(m_client->state()==QMqttClient::Connected){
         emit connected();
-        Logger::instance()->log("mqtt连接成功!");
+        LOG("mqtt连接成功!");
         subscribe_m(param::mqtt_main_sub+param::imei);
         //QMqttTopicName topicName("/yfkj/bzy/c2s/202308051121");
         QByteArray da("turnon");
         publish_m(da);
-        if(param::stitch_mode.contains("start")){
-            param::stitch_mode = "working";
-            emit autotakephoto(true);
-        }
     }
 }
 
@@ -158,7 +153,7 @@ MqttHandler::onDisconnected()
 {
     if(m_client->state()==QMqttClient::Disconnected){
         emit disconnected();
-        Logger::instance()->log("mqtt断开连接!");
+        ERROR("mqtt断开连接!");
         // Try to auto-reconnect
         QTimer::singleShot(10000, this, &MqttHandler::reConnect);
     }
@@ -209,7 +204,7 @@ MqttHandler::onMessageReceived(const QByteArray &message, const QMqttTopicName &
                             emit autotakephoto(false);
                             // 延时一段时间后触发拍照
                             QTimer::singleShot(10000, [](){
-                                Logger::instance()->log("立即拍照");
+                                LOG("立即拍照!");
                                 param::camera_tc = 100;
                             });
 

+ 4 - 6
q6_felgo_iot/src/mserial.cpp

@@ -152,7 +152,7 @@ SerialThread::SerialThread(QObject *parent)
     connect(timeout_mov,&QTimer::timeout,this,[=](){
         dataBuf.clear();        //可能是字节码错误,清除接收缓存
         param::camera_tc = 1;   //全局变量 通知继续进行
-        Logger::instance()->log("串口通信超时:滑台移动");
+        WARN("串口通信超时:滑台移动");
         timeout_mov->stop();
     });
 
@@ -258,7 +258,7 @@ void SerialThread::stop()
 void SerialThread::sendData(const QByteArray &data)
 {
     emit netMessage(data);
-    Logger::instance()->log("sendData:" + QString(data));
+    LOG("sendData:{}",data.constData());
     //拼接流程串口异常处理
     if(data.contains("movx") ||data.contains("movz")) {
         //启动定时器,超时后主动停止 param::camera_tc = 1;
@@ -308,9 +308,8 @@ SerialThread::processJsonData(QByteArray &jsonData)
                             QString subDirPath = appDataPath + subDirName;
                             qDebug() << "FilePath is:"<< subDirPath;
                             emit dataUpload(jsonData);
-                            stop();
                             emit updatestart(subDirPath);
-
+                            this->stop();
                         }else if(statusValue.toString().contains("auto_takephoto")){
                             param::ptlist_res.clear();
                             param::ptlist.clear();      //对焦拍照前清除图片路径
@@ -381,14 +380,13 @@ SerialThread::sendCmd(QString cmd_type,bool sw,QString setup,QString speed)
     }else if(cmd_type.contains("mov")&&sw==false){
         sendData(m_json.MotorMove(cmd_type,setup,speed));
     }
-
 }
 
 
 void
 SerialThread::update_dat_f_main(QString freq)
 {
-    Logger::instance()->log("更新数据上传间隔:" + freq);
+    LOG("更新数据上传间隔:{}",freq.toStdString());
     if(freq.toInt()!=param::dat_f_main){
         param::dat_f_main = freq.toInt();
         //保存到sqlite中

+ 16 - 19
q6_felgo_iot/src/mysql.cpp

@@ -71,7 +71,7 @@ int param::datupload_remain;
 
  SqliteOperator::SqliteOperator(QString &dbname)
 {
-     Logger::instance()->log("实例化:SqliteOperator:"+dbname);
+    LOG("实例化:SqliteOperator:{}",dbname.toStdString());
     if(QSqlDatabase::contains("qt_sql_default_connection"))
     {
         db = QSqlDatabase::database("qt_sql_default_connection");
@@ -128,7 +128,7 @@ bool InsertJson_mqtt()
        else
        {
            //qDebug() <<"mqtt data Table created!";
-           Logger::instance()->log("mqtt data Table created!");
+           LOG("mqtt data Table created!");
        }
     }
     //获取游标对象
@@ -363,7 +363,7 @@ bool InsertJson_mqtt()
      }
      else
      {
-         Logger::instance()->log("InsertData Success!");
+         LOG("InsertData Success!");
      }
     return 0;
  }
@@ -378,17 +378,16 @@ void InertListConfig(QList<config_mqtt_db> &moreData,QString tablename)
 
 int SqliteOperator::UpdateData(QString tablename, QString name, QString value)
 {
-     Logger::instance()->log("UpdateData:"+tablename + " " + name + " " + value);
-     //QString update_sql = "UPDATE mqtt SET ip = :ip WHERE id = :id";
+     LOG("UpdateData:{}-{}-{}",tablename.toStdString(),name.toStdString(),value.toStdString());
+    //QString update_sql = "UPDATE mqtt SET ip = :ip WHERE id = :id";
      QSqlQuery sql_query;
      sql_query.prepare(QString("UPDATE %1 SET %2=?").arg(tablename,name));
      sql_query.addBindValue(value);
      if(!sql_query.exec())
      {
-        //qDebug() << sql_query.lastError();
-        Logger::instance()->log("update Failed!");
+        ERROR("update Failed!");
      }else{
-        Logger::instance()->log("updated Success!");
+         LOG("updated Success!");
      }
      return 0;
  }
@@ -426,9 +425,8 @@ int SqliteOperator::UpdateData(QString tablename, QString name, QString value)
                  param::mqtt_main_pub = sql_query.value(11).toString();
                  param::mqtt_main_offline = sql_query.value(12).toString();
                  param::dat_f_main = sql_query.value(13).toInt();
-                 Logger::instance()->log("ip:" + param::mqtt_main_ip);
-                 Logger::instance()->log("dat_f:" + QString::number(param::dat_f_main));
-
+                 LOG("ip:{}",param::mqtt_main_ip.toStdString());
+                 LOG("dat_f:{}",param::dat_f_main);
              }
              else if(table_name == QString::fromLocal8Bit("mqtt_other"))
              {
@@ -480,14 +478,13 @@ int SqliteOperator::UpdateData(QString tablename, QString name, QString value)
                  param::photo_width = sql_query.value(3).toInt();
                  param::photo_height = sql_query.value(4).toInt();
                  param::auto_focus = sql_query.value(5).toString();
-                 Logger::instance()->log("camera_type:"+param::camera_type);
-                 Logger::instance()->log("stitch_mode:"+param::stitch_mode);
-                 Logger::instance()->log("stitch_photonum:"+QString::number(param::stitch_photonum));
-                 Logger::instance()->log("photo_width:"+QString::number(param::photo_width));
-                 Logger::instance()->log("photo_height:"+QString::number(param::photo_height));
-             }
-             Logger::instance()->log("data_num:" + QString::number(data_num));
-
+                 LOG("camera_type:{}",param::camera_type.toStdString());
+                 LOG("stitch_mode:{}",param::stitch_mode.toStdString());
+                 LOG("stitch_photonum:{}",param::stitch_photonum);
+                 LOG("photo_width:{}",param::photo_width);
+                 LOG("photo_height:{}",param::photo_height);
+             }             
+             LOG("data_num:{}",data_num);
          }
      }
      return 0;