chore: 使用am启动deepin-system-monitor

使用am启动deepin-system-monitor Issue: linuxdeepin/developer-center#9890 linuxdeepin/developer-center#9832
linuxdeepin · Jul 29, 2024 · 3526de5 · 3526de5
1 parent a409fa0
commit 3526de5
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/deepin-system-monitor-plugin/gui/monitor_plugin.cpp b/deepin-system-monitor-plugin/gui/monitor_plugin.cpp
@@ -453,8 +453,22 @@ double MonitorPlugin::autoRateUnits(qlonglong speed, RateUnit &unit)
 
 void MonitorPlugin::openSystemMonitor()
 {
-    QProcess::startDetached("/usr/bin/deepin-system-monitor");
-
+    auto launchProcessByAM = [](){
+        QDBusMessage message = QDBusMessage::createMethodCall(
+                "org.desktopspec.ApplicationManager1",
+                "/org/desktopspec/ApplicationManager1/deepin_2dsystem_2dmonitor",
+                "org.desktopspec.ApplicationManager1.Application",
+                "Launch");
+
+        message << QString("") << QStringList() << QVariantMap();
+
+        QDBusMessage reply = QDBusConnection::sessionBus().call(message);
+        if (reply.type() != QDBusMessage::ReplyMessage) {
+            qCWarning(app) << "Launch deepin-system-monitor main process error:" << reply.errorMessage();
+            return;
+        }
+    };
+    launchProcessByAM();
     //QString cmd("qdbus com.deepin.SystemMonitorMain /com/deepin/SystemMonitorMain com.deepin.SystemMonitorMain.slotRaiseWindow");
     QString cmd("gdbus call -e -d  com.deepin.SystemMonitorMain -o /com/deepin/SystemMonitorMain -m com.deepin.SystemMonitorMain.slotRaiseWindow");
     QTimer::singleShot(200, this, [=]() { QProcess::startDetached(cmd); });

diff --git a/deepin-system-monitor-server/src/dbusserver.cpp b/deepin-system-monitor-server/src/dbusserver.cpp
@@ -46,8 +46,22 @@ void DBusServer::showMemoryAlarmNotify(const QString &argument)
 void DBusServer::showDeepinSystemMoniter()
 {
     // 显示系统监视器
-    QProcess::startDetached("/usr/bin/deepin-system-monitor");
+    auto launchProcessByAM = [](){
+        QDBusMessage message = QDBusMessage::createMethodCall(
+                "org.desktopspec.ApplicationManager1",
+                "/org/desktopspec/ApplicationManager1/deepin_2dsystem_2dmonitor",
+                "org.desktopspec.ApplicationManager1.Application",
+                "Launch");
 
+        message << QString("") << QStringList() << QVariantMap();
+
+        QDBusMessage reply = QDBusConnection::sessionBus().call(message);
+        if (reply.type() != QDBusMessage::ReplyMessage) {
+            qWarning() << "Launch deepin-system-monitor main process error:" << reply.errorMessage();
+            return;
+        }
+    };
+    launchProcessByAM();
     // QString cmd("qdbus com.deepin.SystemMonitorMain /com/deepin/SystemMonitorMain com.deepin.SystemMonitorMain.slotRaiseWindow");
     QString cmd("gdbus call -e -d  com.deepin.SystemMonitorMain -o /com/deepin/SystemMonitorMain -m com.deepin.SystemMonitorMain.slotRaiseWindow");
     QTimer::singleShot(100, this, [ = ]() {