zhunk 11 месяцев назад
Родитель
Сommit
c8e88f9454

+ 16 - 16
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-11-07T12:03:04. -->
+<!-- Written by QtCreator 14.0.1, 2025-11-28T11:22:38. -->
 <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">-DANDROID_ABI:STRING=arm64-v8a
+    <value type="QString" key="CMake.Initial.Parameters">-DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF
 -DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
--DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
--DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF
--DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
--DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}
--DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
--DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON
--DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
+-DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
 -DANDROID_NATIVE_API_LEVEL:STRING=23
 -DANDROID_NDK:PATH=F:/Android_Env/android-ndk-r23c
--DCMAKE_BUILD_TYPE:STRING=Release
+-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
+-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
+-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
+-DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON
 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=F:/Android_Env/android-ndk-r23c/build/cmake/android.toolchain.cmake
+-DANDROID_STL:STRING=c++_shared
 -DANDROID_SDK_ROOT:PATH=F:/Android_Env/android_sdk
--DCMAKE_GENERATOR:STRING=Ninja
--DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
--DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
--DANDROID_STL:STRING=c++_shared</value>
+-DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}
+-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
+-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
+-DANDROID_ABI:STRING=arm64-v8a
+-DCMAKE_BUILD_TYPE:STRING=Release
+-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>
     <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-31</value>
-      <value type="QString" key="BuildToolsVersion"></value>
+      <value type="QString" key="BuildToolsVersion">33.0.2</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>
@@ -198,7 +198,7 @@
      <value type="QString">armeabi-v7a</value>
      <value type="QString">armeabi</value>
     </valuelist>
-    <value type="QString" key="AndroidDeviceSerialNumber">192.168.2.148:5555</value>
+    <value type="QString" key="AndroidDeviceSerialNumber">192.168.2.189:5555</value>
     <value type="int" key="AndroidVersion.ApiLevel">32</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">

+ 9 - 1
q6_felgo_iot/Readme.md

@@ -1,4 +1,12 @@
-
+## 20251113
+    #define APP_VERSION "1.3.19"
+    更新说明:
+        自动对焦:闪退问题解决,自动对焦过程中退出程序,再次启动APP后执行对焦拍照会触发闪退;
+        原因:GPS定位成功后释放时机,延迟释放即可解决;
+## 20251110
+    #define APP_VERSION "1.3.18"
+    更新说明:
+        修复主函数数据库逻辑问题;
 ## 20251104
     #define APP_VERSION "1.3.18"
     更新说明:

+ 3 - 179
q6_felgo_iot/header/cameramanager.h

@@ -84,20 +84,6 @@ public:
 };
 
 
-
-//
-class ImageProvider : public QQuickImageProvider{
-
-public:
-    ImageProvider();
-    QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize);
-    QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize);
-    void updateImage(QImage i_image);
-private:
-    QImage qml_img;
-};
-
-
 class FPSTimer : public QObject
 {
     Q_OBJECT
@@ -201,7 +187,7 @@ public:
 
     void saveImage();
     Q_INVOKABLE void captureImage();
-    inline ImageProvider *getImageProvider() { return m_pImgProvider; }
+    //inline ImageProvider *getImageProvider() { return m_pImgProvider; }
     //ImageProvider* imageProvider() const;
     static void ImageCallBackEx(unsigned char * pData, MV_FRAME_OUT_INFO_EX* pFrameInfo, void* pUser);
 
@@ -263,173 +249,11 @@ public slots:
         LOG("onMovDone:{}",m_qulityString.toStdString());
         emit serial_data(m_json.ImageFunc(m_qulityString.toDouble()));
         emit qulityStringChanged();
-#if 0
-        m_qulityString = m_opencvfunc.Tenengrad(m_frame);
-        emit qulityStringChanged();
-        LOG("onMovDone...{}",m_qulityString.toStdString());
-        if(param::ptlist.size()>0)
-        {
-            if(image_qulity_num<m_foucus_step_max){
-                image_qulity.append(m_qulityString.toDouble());
-                image_qulity_num++;
-                emit serial_data(m_json.MotorMove("movy","f4","1"));
-                if(image_qulity_num==m_foucus_step_max){
-                    max_image_qulity = *std::max_element(image_qulity.begin(), image_qulity.end());
-                }
-            }
-            LOG("max_image_qulity:{}@{}",image_qulity_num,max_image_qulity);
-            if(image_qulity_num>=m_foucus_step_max){
-                //如果当前清晰度大于最大清晰度
-                if(m_qulityString.toDouble() > max_image_qulity)
-                {
-                    image_qulity.clear();
-                    image_qulity_num = 0;
-                    param::camera_tc = 1;
-                    return;
-                }
-                if(max_image_qulity<200.0&&max_image_qulity-m_qulityString.toDouble()>0.0&&max_image_qulity-m_qulityString.toDouble()<5.0)
-                {
-                    image_qulity.clear();
-                    image_qulity_num = 0;
-                    param::camera_tc = 1;
-                    return;
-                }
-                if(max_image_qulity>200.0&&max_image_qulity-m_qulityString.toDouble()>0.0&&max_image_qulity-m_qulityString.toDouble()<20.0)
-                {
-                    image_qulity.clear();
-                    image_qulity_num = 0;
-                    param::camera_tc = 1;
-                    return;
-                }
-
-                if(max_image_qulity>600.0&&max_image_qulity-m_qulityString.toDouble()>0.0&&max_image_qulity-m_qulityString.toDouble()<50.0)
-                {
-                    image_qulity.clear();
-                    image_qulity_num = 0;
-                    param::camera_tc = 1;
-                    return;
-                }
-                if(image_qulity_num==m_foucus_step_max*2+5)
-                {
-                    image_qulity_num = 0;
-                    image_qulity.clear();
-                    emit serial_data(m_json.MotorMove("movy","b4","1"));
-                    return;
-                }
-                image_qulity_num++;
-                //如果当前清晰度小于最大清晰度,反向运动寻找清晰位置 f4
-                if(image_qulity_num>m_foucus_step_max&&max_image_qulity-m_qulityString.toDouble()>3.0){
-                    emit serial_data(m_json.MotorMove("movy","b4","1"));
-                }
-            }
-        }
-        //m_qulityString = m_opencvfunc.Laplacian(m_frame);
-        else{
-            #if 1
-            if(image_qulity_num < MAX_STEP){
-                image_qulity_num ++;
-                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());
-                    image_qulity.clear();   //清除缓存
-                }
-            }
-
-            //如果最大清晰度约等于当前清晰度或小于当前清晰度,继续往前
-            if(image_qulity_num==MAX_STEP&&max_image_qulity-m_qulityString.toDouble()<=2.0){
-                LOG("清晰度无明显变化,继续遍历!");
-                image_qulity_num=0;
-                image_qulity.clear();
-                emit serial_data(m_json.MotorMove("movy","b4","1"));
-                return;
-            }
-            // 计算索引位置
-            //size_t max_index = std::distance(image_qulity.begin(), max_image_qulity);
-
-            LOG("max_image_qulity:{} <> m_qulityString:{}",max_image_qulity,m_qulityString.toStdString());
-            if(image_qulity_num >= MAX_STEP){
-                image_qulity.append(m_qulityString.toDouble());
-                //如果当前清晰度大于最大清晰度
-                if(m_qulityString.toDouble() > max_image_qulity)
-                {
-                    image_qulity.clear();
-                    image_qulity_num = 0;
-                    param::camera_tc = 1;
-                    return;
-                }
-
-                if(image_qulity_num>MAX_STEP&&max_image_qulity-m_qulityString.toDouble()<=3.0){
-                    image_qulity.clear();
-                    image_qulity_num = 0;
-                    param::camera_tc = 1;
-                    return;
-                }
-
-                image_qulity_num++;
-
-                if(max_image_qulity<200.0&&max_image_qulity-m_qulityString.toDouble()>0.0&&max_image_qulity-m_qulityString.toDouble()<5.0)
-                {
-                    image_qulity.clear();
-                    image_qulity_num = 0;
-                    param::camera_tc = 1;
-                    return;
-                }
-                if(max_image_qulity>200.0&&max_image_qulity-m_qulityString.toDouble()>0.0&&max_image_qulity-m_qulityString.toDouble()<20.0)
-                {
-                    image_qulity.clear();
-                    image_qulity_num = 0;
-                    param::camera_tc = 1;
-                    return;
-                }
-
-                if(max_image_qulity>600.0&&max_image_qulity-m_qulityString.toDouble()>0.0&&max_image_qulity-m_qulityString.toDouble()<50.0)
-                {
-                    image_qulity.clear();
-                    image_qulity_num = 0;
-                    param::camera_tc = 1;
-                    return;
-                }
-#if 0
-            //如果最新清晰度小于上一个清晰度,表示已超过最大清晰度位置
-            if(image_qulity.last()-image_qulity[image_qulity.size()-2] < -2.0)
-            {
-                //
-                emit serial_data(m_json.MotorMove("movy","b4","1"));
-                QTimer::singleShot(500,[this](){
-                    LOG("500ms!");
-                    image_qulity.clear();
-                    image_qulity_num = 0;
-                    param::camera_tc = 1;
-                    return;
-                });
-            }
-#endif
-
-                if(image_qulity_num==MAX_STEP*2+10)
-                {
-                    image_qulity_num = 0;
-                    image_qulity.clear();
-                    emit serial_data(m_json.MotorMove("movy","f4","1"));
-                    return;
-                }
-                //如果当前清晰度小于最大清晰度,反向运动寻找清晰位置 f4
-                if(image_qulity_num>MAX_STEP&&max_image_qulity-m_qulityString.toDouble()>3.0){
-                    emit serial_data(m_json.MotorMove("movy","f4","1"));
-                }
-            }
-
-            #endif
-        }
-#endif
     }
 //    void parseFrame(const cv::Mat& frame);
     void upload_handle(void);
     void handle_reult_upload(bool success, const QString &error);
-#if 0
-    void sendImage(QImage frame);
-#endif
+
     void onFPSUpdated(double fps);
 private slots:
     //! Init camera.
@@ -494,7 +318,7 @@ private:
 
     QImage m_image;
     int stitch_des;
-    ImageProvider *m_pImgProvider;
+    //ImageProvider *m_pImgProvider;
 
     //libuvc
     mutable  QMutex frameMutex;  // 互斥锁,用于对帧队列的访问进行同步

+ 1 - 1
q6_felgo_iot/header/main.h

@@ -37,7 +37,7 @@
 #include <opencv2/features2d/features2d.hpp>
 #include <opencv2/xfeatures2d/nonfree.hpp>
 
-#define APP_VERSION "1.3.18"
+#define APP_VERSION "1.3.20"
 
 using namespace std;
 

+ 59 - 86
q6_felgo_iot/src/cameramanager.cpp

@@ -50,64 +50,9 @@ namespace Qt6QCamera {
 //< hikrobot
 void *handle = NULL;
 int nRet = MV_OK;
-
+bool camera_gige = false;
 SenderCustom sender_custom;
 cv::Mat cv_frame;
-// 实现JNI方法
-extern "C" void Java_com_yfkj_cb_Q6iot_UvcCameraActivity_sendToCpp(JNIEnv* env, jobject thiz, jbyteArray rgbData,jint width,jint height)
-{
-
-    // 获取RGB数据长度
-    jsize length = env->GetArrayLength(rgbData);
-    // 将Java的jbyteArray转换为C++的byte数组
-    jbyte* rgbArray = env->GetByteArrayElements(rgbData, nullptr);
-    #if 1
-    try {
-        // 将QByteArray转换为cv::Mat对象
-        cv_frame = cv::Mat(height, width, CV_8UC3, rgbArray);
-        // 检查转换后的cv::Mat是否为空
-        if (cv_frame.empty()) {
-            // 处理转换失败的情况
-            qDebug() << "Failed to convert QByteArray to cv::Mat";
-            return; // 可能需要根据实际情况进行处理,比如抛出异常或返回错误码
-        }
-        //sender_custom.sendSignal(cv_frame.clone());
-        // 在这里进行对cv_frame的处理
-    } catch (const cv::Exception& ex) {
-        // 处理OpenCV异常
-        qDebug() << "OpenCV Exception: " << ex.what();
-        return; // 可能需要根据实际情况进行处理,比如抛出异常或返回错误码
-    } catch (const std::exception& ex) {
-        // 处理其他异常
-        qDebug() << "Exception: " << ex.what();
-        return; // 可能需要根据实际情况进行处理,比如抛出异常或返回错误码
-    } catch (...) {
-        // 处理未知异常
-        qDebug() << "Unknown Exception";
-        return; // 可能需要根据实际情况进行处理,比如抛出异常或返回错误码
-    }
-    #endif
-    sender_custom.sendSignal(cv_frame.clone());
-    // 释放Java数组
-    env->ReleaseByteArrayElements(rgbData, rgbArray, JNI_ABORT);
-
-    // 在这里进行RGB数据的处理
-    //qDebug() << "Received RGB data from Java:" << width << " " << height << "@" << length;//cv_frame.total() * cv_frame.elemSize();
-}
-
-extern "C" void Java_com_yfkj_cb_Q6iot_UvcCameraActivity_UvcHandle(JNIEnv* env, jobject thiz, jstring strData)
-{
-    const char* strChars = env->GetStringUTFChars(strData, nullptr);
-    QString qstr = QString::fromUtf8(strChars);
-    env->ReleaseStringUTFChars(strData, strChars);
-    sender_custom.signalQStr(qstr);
-    qDebug() << "Received string data from Java:" << qstr;
-    if(qstr.contains("UVCFAILED"))
-    {
-        qDebug() << "相机打开失败!";
-    }
-}
-
 
 // pthread 线程函数
 static void* pthreadGrab(void* ptr){
@@ -160,31 +105,6 @@ static void* pthreadGrab(void* ptr){
     return 0;
 }
 
-ImageProvider::ImageProvider()  :
-    QQuickImageProvider(QQuickImageProvider::Image)
-{
-//   qml_img = QImage(200, 200, QImage::Format_ARGB32);
-//   QColor color;
-//   color.setGreen(200);
-//   qml_img.fill(color);
-}
-
-QImage ImageProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize)
-{
-    //qDebug()<<"ImageProvider requestImage"<<id<<size<<requestedSize;
-    return qml_img;
-}
-
-void
-ImageProvider::updateImage(QImage i_image){
-    qml_img = i_image;
-    //qDebug() << "updateImage" << qml_img.size() << qml_img.format();
-}
-
-QPixmap ImageProvider::requestPixmap(const QString &id, QSize *size, const QSize &requestedSize)
-{
-    return QPixmap::fromImage(qml_img);
-}
 
 FPSTimer::FPSTimer(QObject *parent) : QObject(parent)
 {
@@ -260,7 +180,6 @@ Frames::Frames(QObject * parent)
         qRegisterMetaType<QVector<UVCCaptureDescriptor>>("QVector<UVCCaptureDescriptor>");
     }
 
-    m_pImgProvider = new ImageProvider();
     stitch_des = 0;
 
     connect( m_1s, &QTimer::timeout, this, &Frames::timer);
@@ -300,19 +219,65 @@ Frames::Frames(QObject * parent)
 
 Frames::~Frames()
 {
+    qDebug() << "=== Frames Destructor Start ===";
+    // 1. 先停止所有定时器
+    if (m_1s && m_1s->isActive()) {
+        m_1s->stop();
+    }
+
+    if (m_fps_timer && m_fps_timer->isRunning()) {
+        m_fps_timer->setRunning(false);
+    }
+    // 2. 设置停止标志,确保相机不再运行
+    camera_sta = false;
+
     if (handle)
     {
+        // 先停止抓图
+        if (MV_CC_StopGrabbing(handle) != MV_OK) {
+            qDebug() << "Warning: Failed to stop grabbing";
+        }
+        // 等待抓图线程结束
+        if (m_grabThread.isRunning()) {
+            m_grabThread.cancel(); // 先尝试取消
+            m_grabThread.waitForFinished();
+        }
+        // 关闭设备
+        if (MV_CC_CloseDevice(handle) != MV_OK) {
+            qDebug() << "Warning: Failed to close device";
+        }
         MV_CC_DestroyHandle(handle);
         handle  = NULL;
     }
     if (m_processThread.isRunning()) {
         m_processThread.waitForFinished();  // wait for finish thread
     }
-    auto qtContext = QJniObject(QNativeInterface::QAndroidApplication::context());
-    if(qtContext.isValid()){
-        jClass->callMethod<void>("clearCameraHelper","(Landroid/content/Context;)V",qtContext.object());
+
+    //  清理JNI资源
+    if (jClass) {
+        delete jClass;
+        jClass = nullptr;
+    }
+    if (m_imageCapture) {
+        delete m_imageCapture;
+        m_imageCapture = nullptr;
+    }
+
+    if (m_1s) {
+        delete m_1s;
+        m_1s = nullptr;
     }
 
+    if (m_fps_timer) {
+        delete m_fps_timer;
+        m_fps_timer = nullptr;
+    }
+    if(m_videoSink)
+    {
+        delete m_videoSink;
+        m_videoSink = nullptr;
+    }
+    qDebug() << "=== Frames Destructor End ===";
 }
 
 
@@ -384,6 +349,8 @@ Frames::setCameraSw(bool stat_cam)
             #else
                 if (handle)
                 {
+                    MV_CC_StopGrabbing(handle);
+                    MV_CC_CloseDevice(handle);
                     MV_CC_DestroyHandle(handle);
                     handle  = NULL;
                 }
@@ -467,6 +434,7 @@ Frames::setCameraSw(bool stat_cam)
                      {
                          qDebug() << "Warning: Get Packet Size fail nRet:"<< nPacketSize;
                      }
+                     camera_gige = true;
                  }
                  // ch:设置触发模式为off | eb:Set trigger mode as off
                  nRet = MV_CC_SetEnumValue(handle, "TriggerMode", MV_TRIGGER_MODE_OFF);
@@ -711,7 +679,12 @@ Frames::handleGrab(bool sta_cam){
                             cv::cvtColor(tempMat, bgrImage, cv::COLOR_YUV2RGB_YVYU);//YUV422
                             cv::cvtColor(bgrImage,m_frame,cv::COLOR_RGB2RGBA);
                             #else
-                            cv::cvtColor(tempMat,m_frame,cv::COLOR_BayerRG2RGBA);
+                            if(!camera_gige){
+                                cv::cvtColor(tempMat,m_frame,cv::COLOR_BayerRG2RGBA);
+                            }else {
+                                cv::cvtColor(tempMat,m_frame,cv::COLOR_BayerGR2BGRA);
+                            }
+
                             #endif
                             #if 1
                             const int size_frame = m_frame.total()*m_frame.elemSize();  //字节数

+ 15 - 14
q6_felgo_iot/src/main.cpp

@@ -106,8 +106,9 @@ public:
     int  recv_cnt = 0;
     QGeoPositionInfoSource *positionSource;
 public:
-    GPSInfo(QObject *parent = nullptr)
-        : QObject(parent)
+    GPSInfo(SqliteOperator *db,QObject *parent = nullptr)
+        : QObject(parent)  // 注入外部数据库对象
+        , gpsConfig(db)
     {
         param::gps_state = "0";
         positionSource = QGeoPositionInfoSource::createDefaultSource(this);
@@ -123,7 +124,7 @@ public:
 signals:
     void position_success();
 private:
-    SqliteOperator *gpsConfig;
+    SqliteOperator *gpsConfig = nullptr; // 不再在内部创建
 private slots://槽函数中实现了GPS部分信息的读取
     void positionUpdated(const QGeoPositionInfo &info)
     {
@@ -141,6 +142,13 @@ private slots://槽函数中实现了GPS部分信息的读取
             recv_cnt++;
             if(recv_cnt==20){  //定位成功后120S把定位信息保存到数据库中
                 emit position_success();
+                gpsConfig->OpenDb();
+                 if(gpsConfig->isTableExist(param::table_location)){
+                     gpsConfig->UpdateData(param::table_location,"gps_lat",param::gps_lat);
+                     gpsConfig->UpdateData(param::table_location,"gps_lng",param::gps_lng);
+                 }
+                 gpsConfig->CloseDb();
+                 positionSource->stopUpdates();
             }
         }
         param::gps_lat = QString::number(nowLatitude);
@@ -155,6 +163,7 @@ private slots://槽函数中实现了GPS部分信息的读取
         LOG("垂直精度:{}",nowVerticalAccuracy);
         LOG("定位次数:{}",recv_cnt);
     }
+
 };
 
 void sendBroadcastFromQt(QString btn_type) {
@@ -436,13 +445,13 @@ int main(int argc, char *argv[])
     uploader_ftp.setFtpParams("bzy_user", "YFkj@6O2O", "8.136.98.49", 21, remotepath);
 
     YMODEM m_ymodem(&serialThread);
-    #if 1   //厦门四信
+    #if 0   //厦门四信
 
     serialThread.setSerialPortSettings("ttySR3", QSerialPort::Baud115200, QSerialPort::Data8,
                                            QSerialPort::NoParity, QSerialPort::OneStop,
                                            QSerialPort::NoFlowControl);
     #else   //南京软方
-    serialThread.setSerialPortSettings("ttyS3", QSerialPort::Baud115200, QSerialPort::Data8,
+    serialThread.setSerialPortSettings("/dev/ttyS4", QSerialPort::Baud115200, QSerialPort::Data8,
                                            QSerialPort::NoParity, QSerialPort::OneStop,
                                            QSerialPort::NoFlowControl);
     #endif
@@ -660,17 +669,9 @@ int main(int argc, char *argv[])
     //FelgoLiveClient client (&engine);
 
 
-    GPSInfo *gps_start = new GPSInfo;
+    GPSInfo *gps_start = new GPSInfo(sqlConfig);
     QObject::connect(gps_start,&GPSInfo::position_success,[&](){
         emit serialThread.gpsSuccess();
-        sqlConfig->OpenDb();
-        if(sqlConfig->isTableExist(param::table_location)){
-            sqlConfig->UpdateData(param::table_location,"gps_lat",param::gps_lat);
-            sqlConfig->UpdateData(param::table_location,"gps_lng",param::gps_lng);
-        }
-        sqlConfig->CloseDb();
-        gps_start->positionSource->stopUpdates();
-        gps_start->deleteLater();
     });
     
     return app.exec();

+ 4 - 3
q6_felgo_iot/src/mserial.cpp

@@ -189,7 +189,7 @@ void SerialThread::run()
     m_running = true;
     if (!m_serialPort.open(QIODevice::ReadWrite)) {
         emit dataReceived("Failed to open serial port");
-        qDebug() << "Failed to open serial port";
+        ERROR("Failed to open serial port:{}",m_serialPort.portName().toStdString());
         m_running = false;
         return;
     }
@@ -347,7 +347,8 @@ SerialThread::processJsonData(QByteArray &jsonData)
                     }
                 }
 
-            }else if(value_cmd=="data"){                
+            }else if(value_cmd=="data"){
+                connect_board = 0;
                 emit dataReceived(jsonData);
                 if(data_upload)
                     emit dataUpload(jsonData);
@@ -419,7 +420,7 @@ void
 SerialThread::mqtttoserial(const QByteArray &data)
 {
     sendData(data);
-    if(data.contains("paramconf"))
+    if(data.contains("paramconf")||data.contains("read"))
         data_upload = true;
 }