Merge branch 'feature/mqtt-feature' into 'release'

Feature/mqtt feature See merge request !14

Merge branch 'feature/mqtt-feature' into 'release'
Feature/mqtt feature See merge request !14
3410b843 · 郭峰 · 7ee90995 · 1716236d · 3410b843 · 3410b843
Commit 3410b843 authored Sep 09, 2024 by 郭峰
Show whitespace changes
Inline Side-by-side

Showing with 73 additions and 15 deletions

HttpService.cpp
+1 -0

MqttSubscriber.cpp
+44 -5

MqttSubscriber.h
+14 -3

VidesData.h
+1 -0

gamera_videos.pro
+0 -3

mainwindow.cpp
+11 -3

mainwindow.h
+2 -1

No files found.
--- a/HttpService.cpp
+++ b/HttpService.cpp
@@ -556,6 +556,7 @@ vides_data::response *HttpService::httpDeviceConfig(const QString &serialNumber,
        config.mqttConfig.timeout = mqttConfigObj["timeout"].toVariant().toULongLong();
        config.mqttConfig.username=mqttConfigObj["username"].toString();
        config.mqttConfig.password=mqttConfigObj["password"].toString();
+        config.mqttConfig.updateAt=mqttConfigObj["updateAt"].toVariant().toULongLong();
        resp->msg=map["message"].toString();
    }else{

--- a/MqttSubscriber.cpp
+++ b/MqttSubscriber.cpp
@@ -3,16 +3,17 @@
 #include "CameraHandle.h"
 MqttSubscriber* MqttSubscriber::instance = nullptr;
-MqttSubscriber* MqttSubscriber::getInstance(vides_data::MqttConfig& config, QObject* parent) {
+MqttSubscriber* MqttSubscriber::getInstance(QObject* parent) {
    if (!instance) {
-        instance = new MqttSubscriber(config, parent);
+        instance = new MqttSubscriber(parent);
    }
    return instance;
 }
-MqttSubscriber::MqttSubscriber(vides_data::MqttConfig& config, QObject* parent)
+void MqttSubscriber::init(vides_data::MqttConfig &config,QString &httpUrl,QString &serialNumber){
-    : QObject(parent), config(config) {
+    this->config=config;
+    this->httpUrl=httpUrl;
+    this->serialNumber=serialNumber;
    QByteArray bAddress = config.address.toUtf8();
    char* cAddress=bAddress.data();
@@ -27,6 +28,16 @@ MqttSubscriber::MqttSubscriber(vides_data::MqttConfig& config, QObject* parent)
    }, [](void* context, char* topicName, int topicLen, MQTTAsync_message* m) {
        return static_cast<MqttSubscriber*>(context)->messageArrived(topicName, topicLen, m);
    }, nullptr);
+    // 连接信号和槽
+     connect(this, &MqttSubscriber::connectionLostSignal, this, &MqttSubscriber::reconnectAndFetchConfig);
+}
+MqttSubscriber::MqttSubscriber(QObject* parent)
+    : QObject(parent), retryTimer(new QTimer(this)) {
+    retryTimer->setInterval(10000);  // 设置重试间隔为10秒
+    retryTimer->setSingleShot(true);  // 单次触发
+    connect(retryTimer, &QTimer::timeout, this, &MqttSubscriber::reconnectAndFetchConfig);
 }
 MqttSubscriber::~MqttSubscriber() {
@@ -35,6 +46,7 @@ MqttSubscriber::~MqttSubscriber() {
 }
 void MqttSubscriber::start() {
+    retryTimer->stop(); // 确保每次开始连接前停止定时器
    MQTTAsync_connectOptions conn_opts = MQTTAsync_connectOptions_initializer;
    conn_opts.keepAliveInterval = 20;
    conn_opts.cleansession = 1;
@@ -63,6 +75,7 @@ void MqttSubscriber::start() {
 }
 void MqttSubscriber::onConnect(MQTTAsync_successData* response) {
+    retryTimer->stop();
    MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
    opts.onSuccess = [](void* context, MQTTAsync_successData* response) {
        static_cast<MqttSubscriber*>(context)->onSubscribe(response);
@@ -80,8 +93,32 @@ void MqttSubscriber::onConnect(MQTTAsync_successData* response) {
    }
 }
+void MqttSubscriber::reconnectAndFetchConfig() {
+    Common & instace= Common::getInstance();
+    vides_data::responseConfig re_config;
+    // 使用 HttpService 从远程云端拉取配置
+    HttpService httpService(httpUrl);  // 替换为实际的远程URL
+    vides_data::response *res = httpService.httpDeviceConfig(serialNumber,re_config);
+    if (res->code != 0) {
+        instace.deleteObj(res);
+        re_config.mqttConfig.clientId=serialNumber;
+        QString topic = QStringLiteral("/thingshub/%1/device/reply").arg(serialNumber);
+        re_config.mqttConfig.topic=topic;
+        this->config=re_config.mqttConfig;
+        init(re_config.mqttConfig,httpUrl,serialNumber);
+        start();
+    } else {
+        qInfo() << "配置拉取失败，等待10秒后重试";
+        instace.deleteObj(res);
+        retryTimer->start();  // 启动定时器，10秒后重试
+    }
+}
 void MqttSubscriber::onConnectFailure(MQTTAsync_failureData* response) {
    qInfo() << "连接失败, rc" << (response ? response->code : -1);
+    retryTimer->start();
 }
 void MqttSubscriber::onSubscribe(MQTTAsync_successData* response) {
@@ -97,6 +134,8 @@ void MqttSubscriber::connectionLost(char* cause) {
    if (cause) {
        qInfo() << "Cause:" << cause;
    }
+    emit connectionLostSignal();  // 发出连接丢失信号
 }
 int MqttSubscriber::messageArrived(char* topicName, int topicLen, MQTTAsync_message* m) {

--- a/MqttSubscriber.h
+++ b/MqttSubscriber.h
@@ -2,6 +2,7 @@
 #define MQTTSUBSCRIBER_H
 #include <MQTTClient.h>
 #include <MQTTAsync.h>
+#include <QTimer>
 #include <QObject>
 #include "VidesData.h"
@@ -9,15 +10,25 @@ class MqttSubscriber : public QObject
 {
    Q_OBJECT
 public:
-    static MqttSubscriber* getInstance(vides_data::MqttConfig& config, QObject* parent = nullptr);    ~MqttSubscriber();
+    static MqttSubscriber* getInstance( QObject* parent = nullptr);    ~MqttSubscriber();
+    void init(vides_data:: MqttConfig& config,QString &httpUrl,QString &serialNumber);
    void start();
+signals:
+   void connectionLostSignal();
+private slots:
+    void reconnectAndFetchConfig();
 private:
-    MqttSubscriber(vides_data:: MqttConfig& config, QObject* parent = nullptr);
+    MqttSubscriber(QObject* parent = nullptr);
-    MqttSubscriber(const MqttSubscriber&) = delete;
+    MqttSubscriber() = delete;
    MqttSubscriber& operator=(const MqttSubscriber&) = delete;
+    QTimer *retryTimer;
    MQTTAsync client;
+    QString httpUrl;
+    QString serialNumber;
    vides_data::MqttConfig config;

--- a/VidesData.h
+++ b/VidesData.h
@@ -287,6 +287,7 @@ struct MqttConfig {
    QString topic;
    QString username;
    QString password;
+    quint64 updateAt;
 };
 struct responseConfig {

--- a/gamera_videos.pro
+++ b/gamera_videos.pro
@@ -125,9 +125,6 @@ HEADERS += \
    BaseAlgorithm.h \
    MqttSubscriber.h
-#FORMS += \
-#    mainwindow.ui
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -131,11 +131,15 @@ MainWindow::MainWindow()
    QString topic = QStringLiteral("/thingshub/%1/device/reply").arg(serialNumber);
    config.mqttConfig.topic=topic;
    this->mqttConfig= config.mqttConfig;
-    MqttSubscriber* subscriber = MqttSubscriber::getInstance(mqttConfig);
+    runOrRebootMqtt(mqttConfig,httpurl,serialNumber);
+}
+void MainWindow::runOrRebootMqtt(vides_data::MqttConfig &mqtt_config,QString &httpUrl,QString &serialNumber){
+    MqttSubscriber* subscriber = MqttSubscriber::getInstance(this);
+    subscriber->init(mqtt_config,httpUrl,serialNumber);
    subscriber->start();
 }
-void MainWindow::divParameterUpdate(vides_data::responseConfig &cloudConfig ){   
+void MainWindow::divParameterUpdate(vides_data::responseConfig &cloudConfig,QString &httpUrl,QString &serialNumber ){
    bool faceAlgorithm = false, licensePlateAlgorithm = false, uniformAlgorithm = false, timeChange = false;
    AlgorithmTaskManage &algorithmTaskManage= AlgorithmTaskManage::getInstance();
@@ -162,6 +166,10 @@ void MainWindow::divParameterUpdate(vides_data::responseConfig &cloudConfig ){
    if(!faceAlgorithm && !licensePlateAlgorithm && !uniformAlgorithm && !timeChange){
        return;
    }
+    if(config.mqttConfig.updateAt!=cloudConfig.mqttConfig.updateAt){
+        cloudConfig.mqttConfig.topic=config.mqttConfig.topic;
+        runOrRebootMqtt(cloudConfig.mqttConfig,httpUrl,serialNumber);
+    }
    __uint8_t alg= this->intToUint8t(faceAlgorithm,licensePlateAlgorithm,uniformAlgorithm) ;
    vides_data::DetectionParams params;
@@ -500,7 +508,7 @@ void MainWindow::startCamera(const QString &httpurl){
            return ;
        }
        instace.deleteObj(res_config);
-        divParameterUpdate(cloudConfig);
+        divParameterUpdate(cloudConfig,nonConstHttpUrl,serialNumber);
        for (const auto& device : devices.list) {
            if(localDevices.count(device.sSn)>0 ){

--- a/mainwindow.h
+++ b/mainwindow.h
@@ -38,13 +38,14 @@ public:
    void createDirectory(int flag,const QString& dirName, const QString& successMsg, const QString& failureMsg);
+    void runOrRebootMqtt(vides_data::MqttConfig &mqtt_config,QString &httpUrl,QString &serialNumber);
    void initFaceFaceRecognition();
    void initCameras(vides_data::cameraParameters &parameter, vides_data::responseConfig &devConfig, const std::list<vides_data::responseArea>&areas,std::list<vides_data::requestCameraInfo>&camera_info_list);
    __uint8_t intToUint8t(bool faceAlgorithm,bool licensePlateAlgorithm,bool uniformAlgorithm); 
     //盒子参数更新
-     void divParameterUpdate(vides_data::responseConfig &cloudConfig ); 
+     void divParameterUpdate(vides_data::responseConfig &cloudConfig,QString &httpUrl,QString &serialNumber );
    static MainWindow * sp_this;