From 7ce3a6c70dfff074850a72e215b9b76868b53479 Mon Sep 17 00:00:00 2001 From: shaojun Date: Tue, 10 Sep 2019 16:20:18 +0800 Subject: [PATCH] feat(plugin interface):interface method move to below,and add a version to interface --- frame/util/abstractpluginscontroller.cpp | 42 +++++++++++++----------- interfaces/constants.h | 2 +- interfaces/pluginsiteminterface.h | 7 +++- plugins/multitasking/multitasking.json | 2 +- plugins/show-desktop/show-desktop.json | 2 +- 5 files changed, 31 insertions(+), 24 deletions(-) diff --git a/frame/util/abstractpluginscontroller.cpp b/frame/util/abstractpluginscontroller.cpp index 2e67f5136..858ffdda6 100644 --- a/frame/util/abstractpluginscontroller.cpp +++ b/frame/util/abstractpluginscontroller.cpp @@ -30,6 +30,7 @@ static const QStringList CompatiblePluginApiList { "1.1.1", "1.2", + "1.2.1", DOCK_PLUGIN_API_VERSION }; @@ -45,7 +46,8 @@ AbstractPluginsController::AbstractPluginsController(QObject *parent) connect(m_dockDaemonInter, &DockDaemonInter::PluginSettingsSynced, this, &AbstractPluginsController::refreshPluginSettings, Qt::QueuedConnection); } -void AbstractPluginsController::saveValue(PluginsItemInterface *const itemInter, const QString &key, const QVariant &value) { +void AbstractPluginsController::saveValue(PluginsItemInterface *const itemInter, const QString &key, const QVariant &value) +{ // is it necessary? // refreshPluginSettings(); @@ -61,7 +63,8 @@ void AbstractPluginsController::saveValue(PluginsItemInterface *const itemInter, m_dockDaemonInter->MergePluginSettings(QJsonDocument(remoteObject).toJson(QJsonDocument::JsonFormat::Compact)); } -const QVariant AbstractPluginsController::getValue(PluginsItemInterface *const itemInter, const QString &key, const QVariant& fallback) { +const QVariant AbstractPluginsController::getValue(PluginsItemInterface *const itemInter, const QString &key, const QVariant &fallback) +{ // load from local cache QVariant v = m_pluginSettingsObject.value(itemInter->pluginName()).toObject().value(key).toVariant(); if (v.isNull() || !v.isValid()) { @@ -71,7 +74,7 @@ const QVariant AbstractPluginsController::getValue(PluginsItemInterface *const i return v; } -void AbstractPluginsController::removeValue(PluginsItemInterface * const itemInter, const QStringList &keyList) +void AbstractPluginsController::removeValue(PluginsItemInterface *const itemInter, const QStringList &keyList) { if (keyList.isEmpty()) { m_pluginSettingsObject.remove(itemInter->pluginName()); @@ -91,7 +94,7 @@ QMap > &AbstractPluginsControll return m_pluginsMap; } -QObject *AbstractPluginsController::pluginItemAt(PluginsItemInterface * const itemInter, const QString &itemKey) const +QObject *AbstractPluginsController::pluginItemAt(PluginsItemInterface *const itemInter, const QString &itemKey) const { if (!m_pluginsMap.contains(itemInter)) return nullptr; @@ -133,7 +136,7 @@ void AbstractPluginsController::startLoader(PluginLoader *loader) QGSettings gsetting("com.deepin.dde.dock", "/com/deepin/dde/dock/"); QTimer::singleShot(gsetting.get("delay-plugins-time").toUInt(), - loader, [=] { loader->start(QThread::LowestPriority); }); + loader, [ = ] { loader->start(QThread::LowestPriority); }); } void AbstractPluginsController::displayModeChanged() @@ -160,8 +163,7 @@ void AbstractPluginsController::loadPlugin(const QString &pluginFile) const QJsonObject &meta = pluginLoader->metaData().value("MetaData").toObject(); const QString &pluginApi = meta.value("api").toString(); bool pluginIsValid = true; - if (pluginApi.isEmpty() || !CompatiblePluginApiList.contains(pluginApi)) - { + if (pluginApi.isEmpty() || !CompatiblePluginApiList.contains(pluginApi)) { qWarning() << objectName() << "plugin api version not matched! expect versions:" << CompatiblePluginApiList << ", got version:" << pluginApi @@ -171,8 +173,7 @@ void AbstractPluginsController::loadPlugin(const QString &pluginFile) } PluginsItemInterface *interface = qobject_cast(pluginLoader->instance()); - if (!interface) - { + if (!interface) { qWarning() << objectName() << "load plugin failed!!!" << pluginLoader->errorString() << pluginFile; pluginLoader->unload(); @@ -193,27 +194,28 @@ void AbstractPluginsController::loadPlugin(const QString &pluginFile) if (!dbusService.isEmpty() && !m_dbusDaemonInterface->isServiceRegistered(dbusService).value()) { qDebug() << objectName() << dbusService << "daemon has not started, waiting for signal"; connect(m_dbusDaemonInterface, &QDBusConnectionInterface::serviceOwnerChanged, this, - [=](const QString &name, const QString &oldOwner, const QString &newOwner) { - Q_UNUSED(oldOwner); - if (name == dbusService && !newOwner.isEmpty()) { - qDebug() << objectName() << dbusService << "daemon started, init plugin and disconnect"; - initPlugin(interface); - disconnect(m_dbusDaemonInterface); - } + [ = ](const QString & name, const QString & oldOwner, const QString & newOwner) { + Q_UNUSED(oldOwner); + if (name == dbusService && !newOwner.isEmpty()) { + qDebug() << objectName() << dbusService << "daemon started, init plugin and disconnect"; + initPlugin(interface); + disconnect(m_dbusDaemonInterface); } - ); + } + ); return; } // NOTE(justforlxz): 插件的所有初始化工作都在init函数中进行， // loadPlugin函数是按队列执行的，initPlugin函数会有可能导致 // 函数执行被阻塞。 - QTimer::singleShot(1, this, [=] { + QTimer::singleShot(1, this, [ = ] { initPlugin(interface); }); } -void AbstractPluginsController::initPlugin(PluginsItemInterface *interface) { +void AbstractPluginsController::initPlugin(PluginsItemInterface *interface) +{ qDebug() << objectName() << "init plugin: " << interface->pluginName(); interface->init(this); qDebug() << objectName() << "init plugin finished: " << interface->pluginName(); @@ -278,7 +280,7 @@ bool AbstractPluginsController::eventFilter(QObject *o, QEvent *e) if (e->type() != QEvent::DynamicPropertyChange) return false; - QDynamicPropertyChangeEvent * const dpce = static_cast(e); + QDynamicPropertyChangeEvent *const dpce = static_cast(e); const QString propertyName = dpce->propertyName(); if (propertyName == PROP_POSITION) diff --git a/interfaces/constants.h b/interfaces/constants.h index 9814db480..5a85f647c 100644 --- a/interfaces/constants.h +++ b/interfaces/constants.h @@ -27,7 +27,7 @@ namespace Dock { #define DOCK_PLUGIN_MIME "dock/plugin" -#define DOCK_PLUGIN_API_VERSION "1.2.1" +#define DOCK_PLUGIN_API_VERSION "1.2.2" #define PROP_DISPLAY_MODE "DisplayMode" diff --git a/interfaces/pluginsiteminterface.h b/interfaces/pluginsiteminterface.h index dc09082aa..7f2a6092d 100644 --- a/interfaces/pluginsiteminterface.h +++ b/interfaces/pluginsiteminterface.h @@ -54,7 +54,6 @@ public: virtual const QString pluginName() const = 0; virtual const QString pluginDisplayName() const { return QString(); } - virtual PluginType type() { return Normal; } /// /// \brief init /// init your plugins, you need to save proxyInter to m_proxyInter @@ -224,6 +223,12 @@ public: /// virtual void pluginSettingsChanged() {} + /// + /// \brief type + /// default plugin add dock right,fixed plugin add to dock fixed area + /// + virtual PluginType type() { return Normal; } + protected: /// /// \brief m_proxyInter diff --git a/plugins/multitasking/multitasking.json b/plugins/multitasking/multitasking.json index ad498eeb3..fdabbaaaa 100644 --- a/plugins/multitasking/multitasking.json +++ b/plugins/multitasking/multitasking.json @@ -1,3 +1,3 @@ { - "api": "1.1.1" + "api": "1.2.2" } diff --git a/plugins/show-desktop/show-desktop.json b/plugins/show-desktop/show-desktop.json index ad498eeb3..fdabbaaaa 100644 --- a/plugins/show-desktop/show-desktop.json +++ b/plugins/show-desktop/show-desktop.json @@ -1,3 +1,3 @@ { - "api": "1.1.1" + "api": "1.2.2" }