fix: app hang a few seconds when launch app for the first time

修复启动器首次启动应用时,可能导致界面卡死几秒的问题.

Log:

Author: BLumia

src/ddeintegration/appmgr.cpp

@@ -155,37 +155,21 @@ AppMgr::AppMgr(QObject *parent)
                 watchingAppItemRemoved(key);
             });
 
-    DConfig *config = DConfig::create("org.deepin.dde.application-manager", "org.deepin.dde.am", "", this);
-    if (!config->isValid()) {
-        qCWarning(logDdeIntegration) << "DConfig is invalid when getting launched times.";
-    } else {
-        static const QString AppsLaunchedTimes(u8"appsLaunchedTimes");
-        const auto &value = config->value(AppsLaunchedTimes).toMap();
-        updateAppsLaunchedTimes(value);
-        QObject::connect(config, &DConfig::valueChanged, this, [this, config](const QString &key) {
-            if (key != AppsLaunchedTimes) {
-                qCDebug(logDdeIntegration) << "Ignoring non-appsLaunchedTimes key:" << key;
-                return;
-            }
-
-            qCInfo(logDdeIntegration) << "appsLaunchedTimes of DConfig changed, updating";
-            const auto &value = config->value(AppsLaunchedTimes).toMap();
-            updateAppsLaunchedTimes(value);
-        });
-    }
-
     if (isValid()) {
+        qCInfo(logDdeIntegration) << "AppManager1 service already ready, fetching app items right away";
         fetchAppItems();
-    }
-
-    m_serviceWatcher = new QDBusServiceWatcher(QStringLiteral("org.desktopspec.ApplicationManager1"),
+        loadAppsLaunchedTimes();
+    } else {
+        auto serviceWatcher = new QDBusServiceWatcher(QStringLiteral("org.desktopspec.ApplicationManager1"),
                                                QDBusConnection::sessionBus(),
                                                QDBusServiceWatcher::WatchForRegistration,
                                                this);
-    connect(m_serviceWatcher, &QDBusServiceWatcher::serviceRegistered, this, [this]() {
-        qCInfo(logDdeIntegration) << "AppManager1 service registered on bus, fetching app items";
-        fetchAppItems();
-    });
+        connect(serviceWatcher, &QDBusServiceWatcher::serviceRegistered, this, [this]() {
+            qCInfo(logDdeIntegration) << "AppManager1 service registered on bus, fetching app items";
+            fetchAppItems();
+            loadAppsLaunchedTimes();
+        });
+    }
 }
 
 AppMgr::~AppMgr()
@@ -466,21 +450,46 @@ void AppMgr::watchingAppItemPropertyChanged(const QString &key, AppMgr::AppItem
 
 void AppMgr::updateAppsLaunchedTimes(const QVariantMap &appsLaunchedTimes)
 {
-    // need to update times for removed and updated.
+    bool anyChanged = false;
     const auto &appItems = m_appItems.values();
     for (const auto item : std::as_const(appItems)) {
         auto iter = appsLaunchedTimes.find(item->appId);
         qint64 times = 0;
         if (iter != appsLaunchedTimes.cend())
             times = iter->toLongLong();
 
-        // including reset and increase times.
         if (item->launchedTimes != times) {
             qCDebug(logDdeIntegration) << "LaunchedTimesChanged by DConfig, desktopId" << item->id << "from" << item->launchedTimes << "to" << times;
             item->launchedTimes = times;
-            Q_EMIT itemDataChanged(item->id);
+            anyChanged = true;
         }
     }
+
+    if (anyChanged) {
+        Q_EMIT changed();
+    }
+}
+
+void AppMgr::loadAppsLaunchedTimes()
+{
+    DConfig *config = DConfig::create("org.deepin.dde.application-manager", "org.deepin.dde.am", "", this);
+    if (!config->isValid()) {
+        qCWarning(logDdeIntegration) << "DConfig is invalid when getting launched times.";
+    } else {
+        static const QString AppsLaunchedTimes(u8"appsLaunchedTimes");
+        const auto &value = config->value(AppsLaunchedTimes).toMap();
+        updateAppsLaunchedTimes(value);
+        QObject::connect(config, &DConfig::valueChanged, this, [this, config](const QString &key) {
+            if (key != AppsLaunchedTimes) {
+                qCDebug(logDdeIntegration) << "Ignoring non-appsLaunchedTimes key:" << key;
+                return;
+            }
+
+            qCInfo(logDdeIntegration) << "appsLaunchedTimes of DConfig changed, updating";
+            const auto &value = config->value(AppsLaunchedTimes).toMap();
+            updateAppsLaunchedTimes(value);
+        });
+    }
 }
 
 void AppMgr::fetchAppItems()

src/ddeintegration/appmgr.h

@@ -64,6 +64,7 @@ private slots:
 
 private:
     void fetchAppItems();
+    void loadAppsLaunchedTimes();
     void watchingAppItemAdded(const QString &key, AppMgr::AppItem *appItem);
     void watchingAppItemRemoved(const QString &key);
     void watchingAppItemPropertyChanged(const QString &key, AppMgr::AppItem *appItem);
@@ -72,7 +73,6 @@ private slots:
 
 private:
     __AppManager1ApplicationObjectManager *m_objectManager;
-    QDBusServiceWatcher *m_serviceWatcher = nullptr;
     QMap<QString, AppMgr::AppItem *> m_appItems;
     QMap<QString, AppMgr::AppItem *> m_pendingAppItems;
     QTimer *m_checkTimer;