Przeglądaj źródła

优化图像预览

zhunk 10 miesięcy temu
rodzic
commit
26d3288bc4

+ 13 - 13
q6_felgo_iot/CMakeLists.txt.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 14.0.1, 2026-01-14T14:39:10. -->
+<!-- Written by QtCreator 14.0.1, 2026-01-17T09:42:38. -->
 <qtcreator>
 <qtcreator>
  <data>
  <data>
   <variable>EnvironmentId</variable>
   <variable>EnvironmentId</variable>
@@ -102,24 +102,24 @@
     <value type="int" key="CMake.Configure.BaseEnvironment">2</value>
     <value type="int" key="CMake.Configure.BaseEnvironment">2</value>
     <value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
     <value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
     <valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
     <valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
-    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
--DANDROID_STL:STRING=c++_shared
--DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
--DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
--DCMAKE_BUILD_TYPE:STRING=Release
--DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF
+    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
+-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
 -DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}
 -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-ndk-r23c
+-DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF
+-DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=F:/Android_Env/android-ndk-r23c/build/cmake/android.toolchain.cmake
 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=F:/Android_Env/android-ndk-r23c/build/cmake/android.toolchain.cmake
--DCMAKE_GENERATOR:STRING=Ninja
--DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
+-DANDROID_SDK_ROOT:PATH=F:/Android_Env/android_sdk
+-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
 -DANDROID_NATIVE_API_LEVEL:STRING=23
 -DANDROID_NATIVE_API_LEVEL:STRING=23
 -DANDROID_ABI:STRING=arm64-v8a
 -DANDROID_ABI:STRING=arm64-v8a
+-DCMAKE_BUILD_TYPE:STRING=Release
 -DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
 -DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
--DANDROID_NDK:PATH=F:/Android_Env/android-ndk-r23c
--DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON
 -DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
 -DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
--DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
--DANDROID_SDK_ROOT:PATH=F:/Android_Env/android_sdk</value>
+-DANDROID_STL:STRING=c++_shared
+-DCMAKE_GENERATOR:STRING=Ninja</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>
     <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.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">

+ 1 - 0
q6_felgo_iot/Readme.md

@@ -3,6 +3,7 @@
     更新说明:
     更新说明:
         串口解析使用lwjson
         串口解析使用lwjson
         取图接口调整
         取图接口调整
+        增加Y轴坐标校准
 ## 20251113
 ## 20251113
     #define APP_VERSION "1.3.20"
     #define APP_VERSION "1.3.20"
     更新说明:
     更新说明:

+ 22 - 0
q6_felgo_iot/android/src/com/yfkj/cb/Q6iot/Backlight.java

@@ -116,6 +116,8 @@ public class Backlight {
             }else if(brightness == 100){
             }else if(brightness == 100){
                 MaiChongPlatformSInit(context);
                 MaiChongPlatformSInit(context);
                 MacSystemExecuteShellCommand();
                 MacSystemExecuteShellCommand();
+            }else if(brightness == 0){
+                MaiChongStartRawLauncher(context);
             }
             }
         } catch (Exception e) {
         } catch (Exception e) {
             Log.e("Backlight", "Error setting brightness: " + e.getMessage());
             Log.e("Backlight", "Error setting brightness: " + e.getMessage());
@@ -219,6 +221,26 @@ public class Backlight {
         Log.i(TAG_PLATFORM_MAICHON, "应用保活名称:" + mcKeepAliveApp.getPackagename());
         Log.i(TAG_PLATFORM_MAICHON, "应用保活名称:" + mcKeepAliveApp.getPackagename());
         Log.i(TAG_PLATFORM_MAICHON, "应用保活间隔:" + String.valueOf(mcKeepAliveApp.getInterval()));
         Log.i(TAG_PLATFORM_MAICHON, "应用保活间隔:" + String.valueOf(mcKeepAliveApp.getInterval()));
     }
     }
+
+    private void MaiChongStartRawLauncher(Context context){
+        enjoySDK = new EnjoySDK(context);
+        try {
+            enjoySDK.EnableKeepAlive(false);
+            Log.i(TAG_PLATFORM_MAICHON, "设置取消应用保活: 成功.");
+        } catch (EnjoyApiNotSupportException e) {
+            Log.i(TAG_PLATFORM_MAICHON, "设置取消应用保活: 失败.");
+        }
+
+        try {
+            enjoySDK.startRawLauncher();
+            Log.i("TAG", " 启动默认界面成功.");
+        } catch (EnjoyApiNotSupportException e) {
+            Log.i("TAG", " 启动默认界面失败.");
+            throw new RuntimeException(e);
+        }
+    }
+
+
     /******************************************** 相机平台预设部分功能 ********************************************/
     /******************************************** 相机平台预设部分功能 ********************************************/
     public void MacSystemExecuteShellCommand() {
     public void MacSystemExecuteShellCommand() {
         Log.i(TAG_CAMERA_OPERATE, "TakePhoto#00->> Shell端执行摄像头初始化配置.");
         Log.i(TAG_CAMERA_OPERATE, "TakePhoto#00->> Shell端执行摄像头初始化配置.");

+ 11 - 33
q6_felgo_iot/header/cameramanager.h

@@ -113,6 +113,14 @@ private:
 // Frames
 // Frames
 //
 //
 
 
+struct RawFrame
+{
+    int width;
+    int height;
+    MvGvspPixelType pixelType;
+    QByteArray data;   // 原始 buffer 拷贝
+};
+
 //! Frames listener.
 //! Frames listener.
 class Frames :public QObject//, public QQuickImageProvider //QObject  //
 class Frames :public QObject//, public QQuickImageProvider //QObject  //
 {
 {
@@ -211,7 +219,6 @@ signals:
     void stepCountChanged(const QString step);
     void stepCountChanged(const QString step);
 public slots:
 public slots:
 
 
-
     void onMovDone(const QString stepcount){
     void onMovDone(const QString stepcount){
         if(!camera_sw()){
         if(!camera_sw()){
             ERROR("Camera error!");
             ERROR("Camera error!");
@@ -233,13 +240,7 @@ private slots:
     //! Init camera.
     //! Init camera.
     void initCam();
     void initCam();
 
 
-    //! Video frame changed.
-    void newFrame( const QVideoFrame & frame );
-    //void parseFrame();
-
-
     void handleGrab(bool sta_cam);
     void handleGrab(bool sta_cam);
-    void processLoop(bool sta);
     //! 1s timer.
     //! 1s timer.
     void timer();
     void timer();
     //!
     //!
@@ -250,12 +251,14 @@ private slots:
     void imageSaved(int id, const QString &fileName);
     void imageSaved(int id, const QString &fileName);
     void displayCaptureError(int id, const QImageCapture::Error error, const QString &errorString);
     void displayCaptureError(int id, const QImageCapture::Error error, const QString &errorString);
     void displayCameraError();
     void displayCameraError();
-
+    void saveMatAsJpeg(const cv::Mat &mat);
     //void sendData(QByteArray m_byte);
     //void sendData(QByteArray m_byte);
     void displayFrame(const QVideoFrame &frame);
     void displayFrame(const QVideoFrame &frame);
     void mov_x_z_run();
     void mov_x_z_run();
+    void processFrameAsync(const RawFrame& frame);
 private:
 private:
     Q_DISABLE_COPY( Frames )
     Q_DISABLE_COPY( Frames )
+
     //! Camera.
     //! Camera.
     QCamera * m_cam;
     QCamera * m_cam;
     //声明相机捕获对象
     //声明相机捕获对象
@@ -503,31 +506,6 @@ private:
         }
         }
     }
     }
 
 
-    struct FramePacket {
-        uint8_t* data;
-        uint32_t width;
-        uint32_t height;
-        uint32_t pixelType;
-        uint64_t timestamp;
-    };
-
-    static constexpr int QUEUE_SIZE = 6;
-    FramePacket frameQueue[QUEUE_SIZE];
-
-    std::atomic<int> writeIndex{0};
-    std::atomic<int> readIndex{0};
-
-    bool pushFrame(const FramePacket& pkt)
-    {
-        int next = (writeIndex + 1) % QUEUE_SIZE;
-        if (next == readIndex.load(std::memory_order_acquire)) {
-            return false; // 丢帧
-        }
-        frameQueue[writeIndex] = pkt;
-        writeIndex.store(next, std::memory_order_release);
-        return true;
-    }
-    void convertAndSend(const FramePacket& pkt);
 }; // class Frames
 }; // class Frames
 } /* namespace Qt6QCamera */
 } /* namespace Qt6QCamera */
 
 

+ 2 - 0
q6_felgo_iot/header/mserial.h

@@ -29,6 +29,7 @@ public:
     void setSerialPortSettings(const QString &portName, QSerialPort::BaudRate baudRate,
     void setSerialPortSettings(const QString &portName, QSerialPort::BaudRate baudRate,
                                    QSerialPort::DataBits dataBits, QSerialPort::Parity parity,
                                    QSerialPort::DataBits dataBits, QSerialPort::Parity parity,
                                    QSerialPort::StopBits stopBits, QSerialPort::FlowControl flowControl);
                                    QSerialPort::StopBits stopBits, QSerialPort::FlowControl flowControl);
+    void init();
     void run() override;
     void run() override;
     void stop();
     void stop();
 
 
@@ -130,6 +131,7 @@ public slots:
 
 
 private slots:
 private slots:
     //void readBoardData();
     //void readBoardData();
+    QString selectSerialPortName();
     void feedJsonParser(const QByteArray& data)
     void feedJsonParser(const QByteArray& data)
     {
     {
         dataBuf.append(data);
         dataBuf.append(data);

+ 2 - 0
q6_felgo_iot/qml/model/DataModel.qml

@@ -112,6 +112,8 @@ Item {
             if(password==="8888")
             if(password==="8888")
             {
             {
                  _.userLoggedIn = true
                  _.userLoggedIn = true
+            }else if(password==="156715"){
+                serial.setLightness(0)
             }
             }
             else
             else
             {
             {

+ 5 - 1
q6_felgo_iot/qml/pages/TestPage.qml

@@ -52,6 +52,10 @@ AppPage {
         onCameraOpenFailed:function(err){
         onCameraOpenFailed:function(err){
             console.log("onCameraOpenFailed",err)
             console.log("onCameraOpenFailed",err)
             nativeUtils.displayMessageBox("相机打开失败!",err,1)
             nativeUtils.displayMessageBox("相机打开失败!",err,1)
+            focus_switch.checked = false
+            focus_switch.enabled = true
+            takephoto_switch.checked = false
+            takephoto_switch.enabled = true
         }
         }
 
 
         onVideoSinkChanged: {
         onVideoSinkChanged: {
@@ -324,7 +328,7 @@ AppPage {
                             id: jiaodai_switch
                             id: jiaodai_switch
                             onToggled: {
                             onToggled: {
                                 if(jiaodai_switch.checked==true){
                                 if(jiaodai_switch.checked==true){
-                                    jiaodai_switch.enabled = false
+                                    //jiaodai_switch.enabled = false
                                     apptext_res.text = "胶带测试开始"
                                     apptext_res.text = "胶带测试开始"
                                     serial.sendCmd("jiaodai",true,"","");
                                     serial.sendCmd("jiaodai",true,"","");
                                 }
                                 }

+ 113 - 178
q6_felgo_iot/src/cameramanager.cpp

@@ -283,8 +283,6 @@ Frames::setVideoSink( QVideoSink * newVideoSink )
     m_videoSink = newVideoSink;
     m_videoSink = newVideoSink;
     m_capture.setVideoSink(m_videoSink);
     m_capture.setVideoSink(m_videoSink);
 
 
-    //connect(m_videoSink, &QVideoSink::videoFrameChanged,this, &Frames::newFrame);
-
     emit videoSinkChanged();
     emit videoSinkChanged();
 }
 }
 
 
@@ -552,44 +550,6 @@ Frames::setCameraSw(bool stat_cam)
 }
 }
 
 
 
 
-/*
- * movx b
- * movz b
- * movx f
-*/
-void
-Frames::newFrame( const QVideoFrame & frame )
-{
-    if(!isDecoding()&&m_processThread.isFinished()){
-        m_decoding = true;
-        m_processThread = QtConcurrent::run([=]() {
-            m_image = frame.toImage().convertToFormat(QImage::Format_RGB32);
-            if (m_image.isNull()) {
-              m_decoding = false;
-              return;
-            }
-
-           m_fps_timer->incrementFrame();   //启动fps刷新定时器
-           {    //opencv实现的清晰度评价
-               #if 1
-               Mat f_mat =  QImageToCvMat(m_image,true);
-               m_qulityString = m_opencvfunc.brenner(f_mat);
-               #else    //
-               m_qulityString = m_opencvfunc.calculateSharpness(m_image);
-               #endif
-           }
-           m_decoding = false;
-        });
-
-    }
-
-    //m_frame = frame;
-    //qDebug() << "newFrame:"<<m_fps;
-    //++m_fps;
-    //if(m_fps%10==0)
-    //emit frameAvailable(m_frame);
-
-}
 
 
 void
 void
 Frames::upload_handle()
 Frames::upload_handle()
@@ -722,75 +682,101 @@ Frames::mov_x_z_run(){
 
 
 
 
 
 
-void __stdcall Frames::ImageCallBackEx(
-    unsigned char* pData,
-    MV_FRAME_OUT_INFO_EX* pFrameInfo,
-    void* pUser
-    )
-{
-    Frames* self = static_cast<Frames*>(pUser);
-
-    // ❗禁止阻塞、禁止 Qt、禁止 OpenCV
-    FramePacket pkt;
-    pkt.data      = pData;
-    pkt.width     = pFrameInfo->nWidth;
-    pkt.height    = pFrameInfo->nHeight;
-    pkt.pixelType = pFrameInfo->enPixelType;
-    pkt.timestamp = pFrameInfo->nDevTimeStampHigh;
-
-    self->pushFrame(pkt); // lock-free
-    self->m_fps_timer->incrementFrame();
-}
-
-void Frames::convertAndSend(const FramePacket& pkt)
-{
-    cv::Mat raw(pkt.height, pkt.width, CV_8UC1, pkt.data);
-
-    cv::cvtColor(raw, m_frame, cv::COLOR_BayerGR2RGBA);
-
-    QVideoFrameFormat fmt(
-        QSize(pkt.width, pkt.height),
-        QVideoFrameFormat::Format_BGRA8888
-        );
-
-    QVideoFrame frame(fmt);
-    if (frame.map(QVideoFrame::WriteOnly)) {
-        memcpy(frame.bits(0), m_frame.data, m_frame.total() * m_frame.elemSize());
-        frame.unmap();
+void
+Frames::saveMatAsJpeg(const cv::Mat &mat){
+    QString ts = QDateTime::currentDateTime().toString("yyyyMMddhhmmss");
+    if (!mat.empty()) {
+        std::vector<int> params = {
+            cv::IMWRITE_JPEG_QUALITY,
+            90
+        };
+        //QImage img = f.toImage().convertToFormat(QImage::Format_RGB32);
+        QString name = picture_path_floader + "/" + ts +
+                       "z" + QString::number(z_step) +
+                       "x" + QString::number(x_step) + ".jpg";
+        bool ok = cv::imwrite(name.toStdString(), mat, params);
+        if (!ok) {
+            WARN("[saveMatAsJpeg] write failed:{}",name.toStdString());
+        } else {
+            param::ptlist.append(name);
+            LOG("[saveMatAsJpeg] saved:{}",name.toStdString());
+            mov_x_z_run();
+        }
+    }else{
+        ERROR("[saveMatAsJpeg] empty image!");
     }
     }
-
-    QMetaObject::invokeMethod(
-        m_videoSink,
-        [this, frame]() {
-            if (m_videoSink)
-                m_videoSink->setVideoFrame(frame);
-        },
-        Qt::QueuedConnection
-        );
 }
 }
 
 
-
-void Frames::processLoop(bool sta)
-{
-    while (sta) {
-        if (readIndex == writeIndex) {
-            QThread::usleep(100);
-            continue;
+void
+Frames::processFrameAsync(const RawFrame& frame){
+    QtConcurrent::run([=]() {
+        cv::Mat raw;
+        switch (frame.pixelType) {
+        case PixelType_Gvsp_BayerRG8:
+            raw = cv::Mat(frame.height, frame.width, CV_8UC1,
+                          (void*)frame.data.constData());
+            cv::cvtColor(raw, m_frame, cv::COLOR_BayerRG2BGRA);
+            break;
+
+        case PixelType_Gvsp_BayerGR8:
+            raw = cv::Mat(frame.height, frame.width, CV_8UC1,
+                          (void*)frame.data.constData());
+            cv::cvtColor(raw, m_frame, cv::COLOR_BayerGR2BGRA);
+            break;
+
+        case PixelType_Gvsp_BayerBG8:
+            raw = cv::Mat(frame.height, frame.width, CV_8UC1,
+                          (void*)frame.data.constData());
+            cv::cvtColor(raw, m_frame, cv::COLOR_BayerBG2BGRA);
+            break;
+
+        case PixelType_Gvsp_YUV422_YUYV_Packed:
+            raw = cv::Mat(frame.height, frame.width, CV_8UC2,
+                          (void*)frame.data.constData());
+            cv::cvtColor(raw, m_frame, cv::COLOR_YUV2RGBA_YUYV);
+            break;
+
+        default:
+            return;
         }
         }
 
 
-        FramePacket pkt = frameQueue[readIndex];
-        readIndex.store((readIndex + 1) % QUEUE_SIZE,
-                        std::memory_order_release);
+        if(param::camera_tc==1||param::camera_tc==100){
+            cv::Mat snapshot = m_frame.clone(); // 只 clone 一次
+            QtConcurrent::run([=](){
+                saveMatAsJpeg(snapshot);
+            });
+            if (param::camera_tc == 100) {
+                param::camera_tc = 0;
+                emit stopGrabbing(false);
+                return;
+            }
+            param::camera_tc = 0;
+        }
+        QVideoFrameFormat vfmt(
+            QSize(m_frame.cols, m_frame.rows),
+            QVideoFrameFormat::Format_RGBA8888
+            );
+
+        QVideoFrame vf(vfmt);
+        if (!vf.map(QVideoFrame::WriteOnly))
+            return;
+
+        memcpy(vf.bits(0), m_frame.data,
+               m_frame.total() * m_frame.elemSize());
+        vf.unmap();
+
+        // ✅ 投递回 UI 线程
+        QMetaObject::invokeMethod(m_videoSink, [this, vf]() {
+            if (m_videoSink) {
+                m_videoSink->setVideoFrame(vf);
+            }
+        }, Qt::QueuedConnection);
 
 
-        convertAndSend(pkt);
-    }
+    });
 }
 }
 
 
-
-
 void
 void
 Frames::handleGrab(bool sta_cam){
 Frames::handleGrab(bool sta_cam){
-    #if 1
     if (m_grabThread.isRunning()) return;
     if (m_grabThread.isRunning()) return;
     if(m_grabThread.isFinished()){
     if(m_grabThread.isFinished()){
         m_grabThread = QtConcurrent::run([=]() {
         m_grabThread = QtConcurrent::run([=]() {
@@ -811,8 +797,6 @@ Frames::handleGrab(bool sta_cam){
             if(!handle) return;
             if(!handle) return;
             const uint32_t payload = stParam.nCurValue;
             const uint32_t payload = stParam.nCurValue;
             LOG("payload size:{}",payload);
             LOG("payload size:{}",payload);
-            //MV_FRAME_OUT_INFO_EX stImageInfo = {0};
-            QVideoFrameFormat vfmt(QSize(0,0), QVideoFrameFormat::Format_BGRA8888);
             MV_FRAME_OUT stImageInfo = {0};
             MV_FRAME_OUT stImageInfo = {0};
 
 
             bool flag_cam = sta_cam;
             bool flag_cam = sta_cam;
@@ -824,76 +808,30 @@ Frames::handleGrab(bool sta_cam){
                     ERROR("GetOneFrameTimeout:{:x}",nRet);
                     ERROR("GetOneFrameTimeout:{:x}",nRet);
                     break;
                     break;
                 }
                 }
-#if 1
-                cv::Mat raw(stImageInfo.stFrameInfo.nHeight, stImageInfo.stFrameInfo.nWidth, CV_8UC1, stImageInfo.pBufAddr);
-                switch (stImageInfo.stFrameInfo.enPixelType) {
-                case PixelType_Gvsp_BayerRG8:
-                    cv::cvtColor(raw, m_frame, cv::COLOR_BayerRG2BGRA);
-                    break;
-                case PixelType_Gvsp_BayerGR8:
-                    cv::cvtColor(raw, m_frame, cv::COLOR_BayerGR2BGRA);
-                    break;
-                case PixelType_Gvsp_BayerBG8:   //MV-CU050-90GC
-                    cv::cvtColor(raw, m_frame, cv::COLOR_BayerBG2BGRA);
-                    break;
-                default:
-                    break;
-                }
-
-                vfmt = QVideoFrameFormat(QSize(m_frame.cols, m_frame.rows),
-                                         QVideoFrameFormat::Format_RGBA8888);
-                QVideoFrame f(vfmt);
-                if (f.map(QVideoFrame::WriteOnly)) {
-                    memcpy(f.bits(0), m_frame.data, m_frame.total() * m_frame.elemSize());
-                    f.unmap();
-
-                    QMetaObject::invokeMethod(m_videoSink, [this,f]() {
-                        if (m_videoSink) {
-                            m_videoSink->setVideoFrame(f);
-                        }
-                    }, Qt::QueuedConnection);
-                }
-#endif
+                RawFrame frame;
+                frame.width     = stImageInfo.stFrameInfo.nWidth;
+                frame.height    = stImageInfo.stFrameInfo.nHeight;
+                frame.pixelType = stImageInfo.stFrameInfo.enPixelType;
+                const int dataSize = stImageInfo.stFrameInfo.nFrameLen;
+                frame.data = QByteArray(
+                    (const char*)stImageInfo.pBufAddr,
+                    dataSize
+                );
+                MV_CC_FreeImageBuffer(handle, &stImageInfo);
+                // ✅ 像素处理放到新的 QFuture
+                processFrameAsync(frame);
                 // ----- FPS -----
                 // ----- FPS -----
                 m_fps_timer->incrementFrame();
                 m_fps_timer->incrementFrame();
 #if 1
 #if 1
-                if(param::camera_tc==1||param::camera_tc==100){
-                    QString ts = QDateTime::currentDateTime().toString("yyyyMMddhhmmss");
-                    if (f.isValid()) {
-                        QImage img = f.toImage().convertToFormat(QImage::Format_RGB32);
-                        QString name = picture_path_floader + "/" + ts +
-                                       "z" + QString::number(z_step) +
-                                       "x" + QString::number(x_step) + ".jpg";
-
-                        if(img.save(name, "jpg", 80)){
-                            param::ptlist.append(name);
-                            LOG("图片已保存:{}", name.toStdString());
-                            mov_x_z_run();
-                        }
-                    }
-                    if (param::camera_tc == 100) {
-                        param::camera_tc = 0;
-                        emit stopGrabbing(false);
-                        return;
-                    }
-                    param::camera_tc = 0;
-                }
                 if (param::camera_tc == -1) {
                 if (param::camera_tc == -1) {
                     emit stopGrabbing(false);
                     emit stopGrabbing(false);
                     flag_cam = false;
                     flag_cam = false;
                     break;
                     break;
                 }
                 }
 #endif
 #endif
-                MV_CC_FreeImageBuffer(handle, &stImageInfo);
             }
             }
         });
         });
     }
     }
-#else
-    // 使用 pthread 创建线程
-    pthread_t pthreadId;
-    pthread_create(&pthreadId, NULL, pthreadGrab, NULL);
-    //pthread_join(pthreadId, NULL); // 等待线程完成
-#endif
 }
 }
 
 
 
 
@@ -1077,27 +1015,24 @@ Frames::saveImage()
 {
 {
     //停止清晰度发送,关闭定时器m1s
     //停止清晰度发送,关闭定时器m1s
     LOG("saveImage start!");
     LOG("saveImage start!");
-    #ifdef focus_board
-    if(camera_sw()==true)
-        param::camera_tc = 1;
-    #else
     //灰度值检测,全黑则不再往下进行,上报预警消息
     //灰度值检测,全黑则不再往下进行,上报预警消息
     if(m_frame.empty()) return;
     if(m_frame.empty()) return;
-    Mat image_gray;
-    cv::cvtColor(m_frame,image_gray,cv::COLOR_RGBA2GRAY);
-    double grayvalue = cv::mean(image_gray)[0];
-    m_qulityString = m_opencvfunc.Tenengrad(m_frame);
-    emit serial_data(m_json.ImageFunc(m_qulityString.toDouble()));
-    emit qulityStringChanged();
-    LOG("image_gray:{}",grayvalue);
-    LOG("Tenengrad:{}",m_qulityString.toStdString());
-    if(grayvalue<10.0){
-        emit dataUpload(m_json.MakeJsonWarn("Photo ERROR",QString::number(grayvalue)));
-        setCameraSw(false); //关闭相机
-        emit signal_photoerr();
-        return;
-    }
-    #endif
+    QtConcurrent::run([=](){
+        Mat image_gray;
+        cv::cvtColor(m_frame,image_gray,cv::COLOR_RGBA2GRAY);
+        double grayvalue = cv::mean(image_gray)[0];
+        m_qulityString = m_opencvfunc.Tenengrad(m_frame);
+        emit serial_data(m_json.ImageFunc(m_qulityString.toDouble()));
+        emit qulityStringChanged();
+        LOG("image_gray:{}",grayvalue);
+        LOG("Tenengrad:{}",m_qulityString.toStdString());
+        if(grayvalue<10.0){
+            emit dataUpload(m_json.MakeJsonWarn("Photo ERROR",QString::number(grayvalue)));
+            setCameraSw(false); //关闭相机
+            emit signal_photoerr();
+            return;
+        }
+    });
 }
 }
 
 
 
 

+ 1 - 11
q6_felgo_iot/src/main.cpp

@@ -449,17 +449,7 @@ int main(int argc, char *argv[])
     uploader_ftp.setFtpParams("bzy_user", "YFkj@6O2O", "8.136.98.49", 21, remotepath);
     uploader_ftp.setFtpParams("bzy_user", "YFkj@6O2O", "8.136.98.49", 21, remotepath);
 
 
     YMODEM m_ymodem(&serialThread);
     YMODEM m_ymodem(&serialThread);
-    #if 1   //厦门四信
-
-    serialThread.setSerialPortSettings("ttySR3", QSerialPort::Baud115200, QSerialPort::Data8,
-                                           QSerialPort::NoParity, QSerialPort::OneStop,
-                                           QSerialPort::NoFlowControl);
-    #else   //南京软方/迈冲科技
-    serialThread.setSerialPortSettings("/dev/ttyS3", QSerialPort::Baud115200, QSerialPort::Data8,
-                                           QSerialPort::NoParity, QSerialPort::OneStop,
-                                           QSerialPort::NoFlowControl);
-    #endif
-
+    serialThread.init();
 
 
     MqttHandler mqttHandler;
     MqttHandler mqttHandler;
     mqttHandler.storage()->setJsonCacheEnabled(param::jsonCacheEnable);
     mqttHandler.storage()->setJsonCacheEnabled(param::jsonCacheEnable);

+ 32 - 0
q6_felgo_iot/src/mserial.cpp

@@ -174,6 +174,8 @@ SerialThread::~SerialThread()
     stop();
     stop();
 }
 }
 
 
+
+
 void SerialThread::setSerialPortSettings(const QString &portName, QSerialPort::BaudRate baudRate,
 void SerialThread::setSerialPortSettings(const QString &portName, QSerialPort::BaudRate baudRate,
                                          QSerialPort::DataBits dataBits, QSerialPort::Parity parity,
                                          QSerialPort::DataBits dataBits, QSerialPort::Parity parity,
                                          QSerialPort::StopBits stopBits, QSerialPort::FlowControl flowControl)
                                          QSerialPort::StopBits stopBits, QSerialPort::FlowControl flowControl)
@@ -186,6 +188,13 @@ void SerialThread::setSerialPortSettings(const QString &portName, QSerialPort::B
     m_serialPort.setFlowControl(flowControl);
     m_serialPort.setFlowControl(flowControl);
 }
 }
 
 
+void SerialThread::init(){
+    QString serialport_name = selectSerialPortName();
+    setSerialPortSettings(serialport_name, QSerialPort::Baud115200, QSerialPort::Data8,
+                          QSerialPort::NoParity, QSerialPort::OneStop,
+                          QSerialPort::NoFlowControl);
+}
+
 void SerialThread::run()
 void SerialThread::run()
 {
 {
     m_running = true;
     m_running = true;
@@ -394,3 +403,26 @@ SerialThread::getmodemresult(int res)
     start();
     start();
 }
 }
 
 
+QString
+SerialThread::selectSerialPortName()
+{
+    QString pname;
+    // 获取所有可用串口
+    QList<QSerialPortInfo> ports = QSerialPortInfo::availablePorts();
+    LOG("=== 可用串口列表 ===");
+    LOG("总数:{}",ports.count());
+    for (const QSerialPortInfo &port : ports) {
+        qDebug() << "\n端口名称:" << port.portName();
+        qDebug() << "描述:" << port.description();
+        qDebug() << "制造商:" << port.manufacturer();
+        qDebug() << "序列号:" << port.serialNumber();
+        qDebug() << "系统位置:" << port.systemLocation();
+        qDebug() << "供应商ID:" << QString::number(port.vendorIdentifier(), 16);
+        qDebug() << "产品ID:" << QString::number(port.productIdentifier(), 16);
+        if(port.portName()=="ttyS3"||port.portName()=="ttySR3"){
+            pname = port.portName();
+        }
+    }
+    return pname;
+}
+