From 7091b322397dac1131fd681df4637a52d0a14561 Mon Sep 17 00:00:00 2001 From: donghualin Date: Tue, 21 Jun 2022 17:42:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=A1=8C=E9=9D=A2?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=9B=BE=E6=A0=87=E7=9A=84AM=E8=AE=BF?= =?UTF-8?q?=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复DockItemManager和AppItem类中对AM接口的访问 Log: Influence: 任务栏 Task: https://pms.uniontech.com/task-view-133075.html Change-Id: I93a656f5437a24fb2d964b337b793d4759375dc2 --- frame/controller/dockitemmanager.cpp | 20 ++++++++++---------- frame/controller/dockitemmanager.h | 6 ++---- frame/item/appitem.cpp | 2 +- frame/item/appitem.h | 4 +--- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/frame/controller/dockitemmanager.cpp b/frame/controller/dockitemmanager.cpp index df5879c16..e31714dd2 100644 --- a/frame/controller/dockitemmanager.cpp +++ b/frame/controller/dockitemmanager.cpp @@ -38,7 +38,7 @@ const QGSettings *DockItemManager::m_dockedSettings = Utils::ModuleSettingsPtr(" DockItemManager::DockItemManager(QObject *parent) : QObject(parent) - , m_appInter(new DBusDock("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this)) + , m_appInter(new DockInter(dockServiceName(), dockServicePath(), QDBusConnection::sessionBus(), this)) , m_pluginsInter(new DockPluginsController(this)) , m_loadFinished(false) { @@ -50,9 +50,9 @@ DockItemManager::DockItemManager(QObject *parent) AppItem *it = new AppItem(m_appSettings, m_activeSettings, m_dockedSettings, entry); manageItem(it); - connect(it, &AppItem::requestActivateWindow, m_appInter, &DBusDock::ActivateWindow, Qt::QueuedConnection); - connect(it, &AppItem::requestPreviewWindow, m_appInter, &DBusDock::PreviewWindow); - connect(it, &AppItem::requestCancelPreview, m_appInter, &DBusDock::CancelPreviewWindow); + connect(it, &AppItem::requestActivateWindow, m_appInter, &DockInter::ActivateWindow, Qt::QueuedConnection); + connect(it, &AppItem::requestPreviewWindow, m_appInter, &DockInter::PreviewWindow); + connect(it, &AppItem::requestCancelPreview, m_appInter, &DockInter::CancelPreviewWindow); connect(this, &DockItemManager::requestUpdateDockItem, it, &AppItem::requestUpdateEntryGeometries); @@ -62,9 +62,9 @@ DockItemManager::DockItemManager(QObject *parent) // 托盘区域和插件区域 由DockPluginsController获取 // 应用信号 - connect(m_appInter, &DBusDock::EntryAdded, this, &DockItemManager::appItemAdded); - connect(m_appInter, &DBusDock::EntryRemoved, this, static_cast(&DockItemManager::appItemRemoved), Qt::QueuedConnection); - connect(m_appInter, &DBusDock::ServiceRestarted, this, &DockItemManager::reloadAppItems); + connect(m_appInter, &DockInter::EntryAdded, this, &DockItemManager::appItemAdded); + connect(m_appInter, &DockInter::EntryRemoved, this, static_cast(&DockItemManager::appItemRemoved), Qt::QueuedConnection); + connect(m_appInter, &DockInter::ServiceRestarted, this, &DockItemManager::reloadAppItems); // 插件信号 connect(m_pluginsInter, &DockPluginsController::pluginItemInserted, this, &DockItemManager::pluginItemInserted, Qt::QueuedConnection); @@ -203,9 +203,9 @@ void DockItemManager::appItemAdded(const QDBusObjectPath &path, const int index) manageItem(item); - connect(item, &AppItem::requestActivateWindow, m_appInter, &DBusDock::ActivateWindow, Qt::QueuedConnection); - connect(item, &AppItem::requestPreviewWindow, m_appInter, &DBusDock::PreviewWindow); - connect(item, &AppItem::requestCancelPreview, m_appInter, &DBusDock::CancelPreviewWindow); + connect(item, &AppItem::requestActivateWindow, m_appInter, &DockInter::ActivateWindow, Qt::QueuedConnection); + connect(item, &AppItem::requestPreviewWindow, m_appInter, &DockInter::PreviewWindow); + connect(item, &AppItem::requestCancelPreview, m_appInter, &DockInter::CancelPreviewWindow); connect(this, &DockItemManager::requestUpdateDockItem, item, &AppItem::requestUpdateEntryGeometries); m_itemList.insert(insertIndex, item); diff --git a/frame/controller/dockitemmanager.h b/frame/controller/dockitemmanager.h index 2548728c2..0887bd9e9 100644 --- a/frame/controller/dockitemmanager.h +++ b/frame/controller/dockitemmanager.h @@ -27,12 +27,10 @@ #include "dockitem.h" #include "appitem.h" #include "placeholderitem.h" - -#include +#include "dbusutil.h" #include -using DBusDock = com::deepin::dde::daemon::Dock; /** * @brief The DockItemManager class * 管理类，管理所有的应用数据，插件数据 @@ -78,7 +76,7 @@ private: void manageItem(DockItem *item); private: - DBusDock *m_appInter; + DockInter *m_appInter; DockPluginsController *m_pluginsInter; static DockItemManager *INSTANCE; diff --git a/frame/item/appitem.cpp b/frame/item/appitem.cpp index 8d43562d9..5040480f0 100644 --- a/frame/item/appitem.cpp +++ b/frame/item/appitem.cpp @@ -55,7 +55,7 @@ AppItem::AppItem(const QGSettings *appSettings, const QGSettings *activeAppSetti , m_activeAppSettings(activeAppSettings) , m_dockedAppSettings(dockedAppSettings) , m_appPreviewTips(nullptr) - , m_itemEntryInter(new DockEntryInter("com.deepin.dde.daemon.Dock", entry.path(), QDBusConnection::sessionBus(), this)) + , m_itemEntryInter(new DockEntryInter(dockServiceName(), entry.path(), QDBusConnection::sessionBus(), this)) , m_swingEffectView(nullptr) , m_itemAnimation(nullptr) , m_wmHelper(DWindowManagerHelper::instance()) diff --git a/frame/item/appitem.h b/frame/item/appitem.h index eb78d0406..69c556b64 100644 --- a/frame/item/appitem.h +++ b/frame/item/appitem.h @@ -28,15 +28,13 @@ #include "appdrag.h" #include "dbusclientmanager.h" #include "../widgets/tipswidget.h" +#include "dbusutil.h" #include #include #include #include -#include - -using DockEntryInter = com::deepin::dde::daemon::dock::Entry; class QGSettings; class AppItem : public DockItem