Convert AirLinkManager & UTMSPManager to Singletons

mavlink · Oct 17, 2024 · 74d7ddc · 74d7ddc
1 parent 13031c3
commit 74d7ddc
Show file tree

Hide file tree

Showing 24 changed files with 266 additions and 333 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -269,7 +269,6 @@ list(APPEND QGC_RESOURCES
 )
 
 if(QGC_UTM_ADAPTER)
-    add_definitions(-DQGC_UTM_ADAPTER)
     list(APPEND QGC_RESOURCES ${CMAKE_SOURCE_DIR}/src/UTMSP/utmsp.qrc)
 else()
     list(APPEND QGC_RESOURCES ${CMAKE_SOURCE_DIR}/src/UTMSP/dummy/utmsp_dummy.qrc)

diff --git a/src/AirLink/AirLinkManager.cc b/src/AirLink/AirLinkManager.cc
@@ -8,39 +8,39 @@
  ****************************************************************************/
 
 #include "AirLinkManager.h"
+#include "QGCApplication.h"
+#include "QGCToolbox.h"
 #include "SettingsManager.h"
+#include "QGCLoggingCategory.h"
 
+#include <QtCore/qapplicationstatic.h>
+#include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QtNetwork/QNetworkReply>
 #include <QtNetwork/QNetworkRequest>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtCore/QJsonObject>
-#include <QtCore/QJsonArray>
+
+QGC_LOGGING_CATEGORY(AirLinkManagerLog, "qgc.airlink.airlinkmanager");
 
 const QString AirLinkManager::airlinkHost = "air-link.space";
 
-AirLinkManager::AirLinkManager(QGCApplication* app, QGCToolbox* toolbox)
-    : QGCTool(app, toolbox)
-{
-}
+Q_APPLICATION_STATIC(AirLinkManager, _airLinkManager);
 
-AirLinkManager::~AirLinkManager()
+AirLinkManager::AirLinkManager(QObject *parent)
+    : QObject(parent)
+    , _mngr(new QNetworkAccessManager(this))
 {
+    // qCDebug(AirLinkManagerLog) << Q_FUNC_INFO << this;
 }
 
-void AirLinkManager::setToolbox(QGCToolbox* toolbox)
-{
-    QGCTool::setToolbox(toolbox);
-}
-
-QStringList AirLinkManager::droneList() const
+AirLinkManager::~AirLinkManager()
 {
-    return _vehiclesFromServer.keys();
+    // qCDebug(AirLinkManagerLog) << Q_FUNC_INFO << this;
 }
 
-void AirLinkManager::updateDroneList(const QString &login, const QString &pass)
+AirLinkManager *AirLinkManager::instance()
 {
-    connectToAirLinkServer(login, pass);
+    return _airLinkManager();
 }
 
 bool AirLinkManager::isOnline(const QString &drone)
@@ -52,10 +52,14 @@ bool AirLinkManager::isOnline(const QString &drone)
     }
 }
 
-void AirLinkManager::connectToAirLinkServer(const QString &login, const QString &pass)
+void AirLinkManager::updateCredentials(const QString &login, const QString &pass)
 {
-    QNetworkAccessManager *mngr = new QNetworkAccessManager(this);
+    qgcApp()->toolbox()->settingsManager()->appSettings()->loginAirLink()->setRawValue(login);
+    qgcApp()->toolbox()->settingsManager()->appSettings()->passAirLink()->setRawValue(pass);
+}
 
+void AirLinkManager::_connectToAirLinkServer(const QString &login, const QString &pass)
+{
     const QUrl url("https://air-link.space/api/gs/getModems");
     QNetworkRequest request(url);
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
@@ -64,48 +68,43 @@ void AirLinkManager::connectToAirLinkServer(const QString &login, const QString
     obj["login"] = login;
     obj["password"] = pass;
     QJsonDocument doc(obj);
-    QByteArray data = doc.toJson();
-
-    _reply = mngr->post(request, data);
-
-    QObject::connect(_reply, &QNetworkReply::finished, [this](){
-        _processReplyAirlinkServer(*_reply);
-        _reply->deleteLater();
-    });
+    const QByteArray data = doc.toJson();
 
-    mngr = nullptr;
-    delete mngr;
+    QNetworkReply *const reply = _mngr->post(request, data);
+    (void) QObject::connect(reply, &QNetworkReply::finished, this, &AirLinkManager::_processReplyAirlinkServer);
 }
 
-void AirLinkManager::updateCredentials(const QString &login, const QString &pass)
+void AirLinkManager::_processReplyAirlinkServer()
 {
-    _toolbox->settingsManager()->appSettings()->loginAirLink()->setRawValue(login);
-    _toolbox->settingsManager()->appSettings()->passAirLink()->setRawValue(pass);
+    QNetworkReply* const reply = qobject_cast<QNetworkReply*>(sender());
+    if (!reply) {
+        return;
+    }
+    reply->deleteLater();
+
+    if (reply->error() != QNetworkReply::NoError) {
+        qCDebug(AirLinkManagerLog) << "Airlink auth - network error";
+        return;
+    }
+
+    const QByteArray ba = reply->readAll();
+
+    if (!QJsonDocument::fromJson(ba)["modems"].toArray().isEmpty()) {
+        _parseAnswer(ba);
+    } else {
+        qCDebug(AirLinkManagerLog) << "No airlink modems in answer";
+    }
 }
 
 void AirLinkManager::_parseAnswer(const QByteArray &ba)
 {
     _vehiclesFromServer.clear();
+
     for (const auto &arr : QJsonDocument::fromJson(ba)["modems"].toArray()) {
-        QString droneModem = arr.toObject()["name"].toString();
-        bool isOnline = arr.toObject()["isOnline"].toBool();
+        const QString droneModem = arr.toObject()["name"].toString();
+        const bool isOnline = arr.toObject()["isOnline"].toBool();
         _vehiclesFromServer[droneModem] = isOnline;
     }
-    emit droneListChanged();
-}
 
-void AirLinkManager::_processReplyAirlinkServer(QNetworkReply &reply)
-{
-    QByteArray ba = reply.readAll();
-
-    if (reply.error() == QNetworkReply::NoError) {
-        if (!QJsonDocument::fromJson(ba)["modems"].toArray().isEmpty()) {
-            _parseAnswer(ba);
-        } else {
-            qDebug() << "No airlink modems in answer";
-        }
-    } else {
-        qDebug() << "Airlink auth - network error";
-    }
+    emit droneListChanged();
 }
-
diff --git a/src/AirLink/AirLinkManager.h b/src/AirLink/AirLinkManager.h
@@ -9,44 +9,47 @@
 
 #pragma once
 
-#include "QGCToolbox.h"
-
+#include <QtCore/QLoggingCategory>
 #include <QtCore/QMap>
+#include <QtCore/QObject>
+
+class QNetworkAccessManager;
 
-class AppSettings;
-class QGCApplication;
-class LinkInterface;
-class QNetworkReply;
+Q_DECLARE_LOGGING_CATEGORY(AirLinkManagerLog)
 
-//-----------------------------------------------------------------------------
-class AirLinkManager : public QGCTool
+class AirLinkManager : public QObject
 {
     Q_OBJECT
 
-public:
     Q_PROPERTY(QStringList droneList READ droneList NOTIFY droneListChanged)
-    Q_INVOKABLE void updateDroneList(const QString &login, const QString &pass);
+
+public:
+    explicit AirLinkManager(QObject *parent = nullptr);
+    ~AirLinkManager();
+
+    /// Gets the singleton instance of AirLinkManager.
+    ///     @return The singleton instance.
+    static AirLinkManager *instance();
+
+    Q_INVOKABLE void updateDroneList(const QString &login, const QString &pass) { _connectToAirLinkServer(login, pass); }
     Q_INVOKABLE bool isOnline(const QString &drone);
-    Q_INVOKABLE void connectToAirLinkServer(const QString &login, const QString &pass);
     Q_INVOKABLE void updateCredentials(const QString &login, const QString &pass);
 
-    explicit AirLinkManager(QGCApplication* app, QGCToolbox* toolbox);
-    ~AirLinkManager() override;
-
-    void setToolbox (QGCToolbox* toolbox) override;
-    QStringList droneList() const;
+    QStringList droneList() const { return _vehiclesFromServer.keys(); }
 
     static const QString airlinkHost;
     static constexpr int airlinkPort = 10000;
 
 signals:
-    void    droneListChanged();
+    void droneListChanged();
 
-private:
-    void                _parseAnswer                (const QByteArray &ba);
-    void                _processReplyAirlinkServer  (QNetworkReply &reply);
+private slots:
+    void _processReplyAirlinkServer();
 
 private:
+    void _connectToAirLinkServer(const QString &login, const QString &pass);
+    void _parseAnswer(const QByteArray &ba);
+
+    QNetworkAccessManager *_mngr = nullptr;
     QMap<QString, bool> _vehiclesFromServer;
-    QNetworkReply*      _reply;
 };