From 0aba7ba0dbc196d0960a93668cdf913f66c0d858 Mon Sep 17 00:00:00 2001
From: donghualin <donghualin@uniontech.com>
Date: Tue, 21 Jun 2022 16:24:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=89=98=E7=9B=98?=
 =?UTF-8?q?=E5=B1=95=E5=BC=80=E5=9B=BE=E6=A0=87=E5=AF=B9AM=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E7=9A=84=E8=AE=BF=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

托盘图标需要通过AM接口来获取透明度，增加该接口对AM服务的访问

Log:
Influence: 任务栏
Task: https://pms.uniontech.com/task-view-133075.html
Change-Id: If4c981e23254776ea73b45834910899f39913ae8
---
 frame/window/tray/widgets/expandiconwidget.cpp | 3 ++-
 frame/window/tray/widgets/expandiconwidget.h   | 7 ++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/frame/window/tray/widgets/expandiconwidget.cpp b/frame/window/tray/widgets/expandiconwidget.cpp
index 21da2b1bb..0c858a142 100644
--- a/frame/window/tray/widgets/expandiconwidget.cpp
+++ b/frame/window/tray/widgets/expandiconwidget.cpp
@@ -230,9 +230,10 @@ void ExpandIconWidget::onGlobMousePress(const QPoint &mousePos, const int flag)
  * @brief 圆角窗体的绘制
  * @param parent
  */
+
 RoundWidget::RoundWidget(QWidget *parent)
     : QWidget (parent)
-    , m_dockInter(new DBusDock("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this))
+    , m_dockInter(new DockInter(dockServiceName(), dockServicePath(), QDBusConnection::sessionBus(), this))
 {
     setAttribute(Qt::WA_TranslucentBackground);
 }
diff --git a/frame/window/tray/widgets/expandiconwidget.h b/frame/window/tray/widgets/expandiconwidget.h
index 97e5dbe01..3560dae1f 100644
--- a/frame/window/tray/widgets/expandiconwidget.h
+++ b/frame/window/tray/widgets/expandiconwidget.h
@@ -23,15 +23,12 @@
 
 #include "constants.h"
 #include "basetraywidget.h"
-
-#include <com_deepin_dde_daemon_dock.h>
+#include "dbusutil.h"
 
 class TrayGridView;
 class TrayModel;
 class TrayDelegate;
 
-using DBusDock = com::deepin::dde::daemon::Dock;
-
 namespace Dtk { namespace Gui { class DRegionMonitor; } }
 
 class ExpandIconWidget : public BaseTrayWidget
@@ -91,7 +88,7 @@ private:
     QColor maskColor() const;
 
 private:
-    DBusDock *m_dockInter;
+    DockInter *m_dockInter;
 };
 
 #endif // EXPANDICONWIDGET_H