feat: Service Registry + Bridge 解耦架构 + 全工程代码清理
## 架构升级:Service Registry + Bridge 模式 - 新增 PluginSDK/IPluginServices.h:10 个纯虚服务接口(IDataProvider/ILinkProvider/...) - 新增 MavLinkServiceBridge:单 QObject 实现全部服务,隔离 MavLinkNode 依赖 - 升级 PluginManifest:支持 plugin.json 的 provides/consumes 声明式依赖 - 实现 ExtensionHost::autoWire():元对象自省自动连接信号槽 - 集成到 AppController:initModules() 中创建桥接器并注册到 ServiceRegistry - CockpitPlugin 演示服务发现:initialize() 中通过 PluginContext 查找服务 ## 代码清理 - Plugins/opmap:~280 行死代码(waypointsetting 100行注释块/tilematrix 54行/等27个文件) - Plugins/MavLinkNode:~200 行 GBK 乱码注释翻译为 UTF-8 + 12 行注释死代码 - Plugins/ToolsUI:~222 行死代码(ECU.cpp 82行/INS.cpp 113行/Parse/ToolsUI 等) - StatusUI/Setting/MissionUI:~65 行注释死代码 - Cockpit/leftladder.cpp:10 处 GBK 乱码翻译为中文 - 清理头文件注释掉的 #include(19 处)、空 if-else 分支、注释变量声明 ## 编译验证 - [100%] Built target GCS 零错误 - 运行时 timeout 3s 正常退出,无崩溃
This commit is contained in:
@@ -0,0 +1,108 @@
|
||||
/****************************************************************************
|
||||
*
|
||||
* (c) 2009-2020 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
|
||||
*
|
||||
* QGroundControl is licensed according to the terms in the file
|
||||
* COPYING.md in the root of the source code directory.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef GeoFenceManager_H
|
||||
#define GeoFenceManager_H
|
||||
|
||||
#include <QObject>
|
||||
#include <QGeoCoordinate>
|
||||
|
||||
#if defined(QGC_AIRMAP_ENABLED)
|
||||
#include "AirspaceManager.h"
|
||||
#endif
|
||||
|
||||
#include "QGCLoggingCategory.h"
|
||||
#include "FactSystem.h"
|
||||
#include "PlanManager.h"
|
||||
#include "QGCFencePolygon.h"
|
||||
#include "QGCFenceCircle.h"
|
||||
|
||||
class Vehicle;
|
||||
class QmlObjectListModel;
|
||||
class PlanManager;
|
||||
|
||||
Q_DECLARE_LOGGING_CATEGORY(GeoFenceManagerLog)
|
||||
|
||||
/// This is the base class for firmware specific geofence managers. A geofence manager is responsible
|
||||
/// for communicating with the vehicle to set/get geofence settings.
|
||||
class GeoFenceManager : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
GeoFenceManager(Vehicle* vehicle);
|
||||
~GeoFenceManager();
|
||||
|
||||
/// Returns true if GeoFence is supported by this vehicle
|
||||
virtual bool supported(void) const;
|
||||
|
||||
/// Returns true if the manager is currently communicating with the vehicle
|
||||
virtual bool inProgress(void) const;
|
||||
|
||||
/// Load the current settings from the vehicle
|
||||
/// Signals loadComplete when done
|
||||
virtual void loadFromVehicle(void);
|
||||
|
||||
/// Send the geofence settings to the vehicle
|
||||
/// Signals sendComplete when done
|
||||
virtual void sendToVehicle(const QGeoCoordinate& breachReturn, ///< Breach return point
|
||||
QmlObjectListModel& polygons, ///< List of QGCFencePolygons
|
||||
QmlObjectListModel& circles); ///< List of QGCFenceCircles
|
||||
|
||||
/// Remove all fence related items from vehicle (does not affect parameters)
|
||||
/// Signals removeAllComplete when done
|
||||
virtual void removeAll(void);
|
||||
|
||||
/// Returns true if polygon fence is currently enabled on this vehicle
|
||||
/// Signal: polygonEnabledChanged
|
||||
virtual bool polygonEnabled(void) const { return true; }
|
||||
|
||||
const QList<QGCFencePolygon>& polygons(void) { return _polygons; }
|
||||
const QList<QGCFenceCircle>& circles(void) { return _circles; }
|
||||
const QGeoCoordinate& breachReturnPoint(void) const { return _breachReturnPoint; }
|
||||
|
||||
/// Error codes returned in error signal
|
||||
typedef enum {
|
||||
InternalError,
|
||||
PolygonTooFewPoints, ///< Too few points for valid fence polygon
|
||||
PolygonTooManyPoints, ///< Too many points for valid fence polygon
|
||||
IncompletePolygonLoad, ///< Incomplete polygon loaded
|
||||
UnsupportedCommand, ///< Usupported command in mission type
|
||||
BadPolygonItemFormat, ///< Error re-creating polygons from mission items
|
||||
InvalidCircleRadius,
|
||||
} ErrorCode_t;
|
||||
|
||||
signals:
|
||||
void loadComplete (void);
|
||||
void inProgressChanged (bool inProgress);
|
||||
void error (int errorCode, const QString& errorMsg);
|
||||
void removeAllComplete (bool error);
|
||||
void sendComplete (bool error);
|
||||
|
||||
private slots:
|
||||
void _sendComplete (bool error);
|
||||
void _planManagerLoadComplete (bool removeAllRequested);
|
||||
|
||||
private:
|
||||
void _sendError(ErrorCode_t errorCode, const QString& errorMsg);
|
||||
|
||||
Vehicle* _vehicle;
|
||||
PlanManager _planManager;
|
||||
QList<QGCFencePolygon> _polygons;
|
||||
QList<QGCFenceCircle> _circles;
|
||||
QGeoCoordinate _breachReturnPoint;
|
||||
bool _firstParamLoadComplete;
|
||||
QList<QGCFencePolygon> _sendPolygons;
|
||||
QList<QGCFenceCircle> _sendCircles;
|
||||
#if defined(QGC_AIRMAP_ENABLED)
|
||||
AirspaceManager* _airspaceManager;
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user