fix: start notification expire timer only after bubble is displayed

panels/notification/CMakeLists.txt

@@ -22,6 +22,8 @@ add_library(ds-notification-shared SHARED
     ${CMAKE_SOURCE_DIR}/panels/notification/common/dbaccessor.cpp
     ${CMAKE_SOURCE_DIR}/panels/notification/common/notifysetting.h
     ${CMAKE_SOURCE_DIR}/panels/notification/common/notifysetting.cpp
+    ${CMAKE_SOURCE_DIR}/panels/notification/common/expiretimer.h
+    ${CMAKE_SOURCE_DIR}/panels/notification/common/expiretimer.cpp
 )
 
 set_target_properties(ds-notification-shared PROPERTIES

panels/notification/bubble/bubbleitem.cpp

@@ -91,6 +91,11 @@ int BubbleItem::urgency() const
     return m_urgency;
 }
 
+int BubbleItem::timeout() const
+{
+    return m_entity.timeout();
+}
+
 QString BubbleItem::bodyImagePath() const
 {
     return m_entity.bodyIcon();

panels/notification/bubble/bubbleitem.h

@@ -32,6 +32,7 @@ class BubbleItem : public QObject
     uint replacesId() const;
     bool isReplace() const;
     int urgency() const;
+    int timeout() const;
     QString bodyImagePath() const;
     qint64 ctime() const;
 

panels/notification/bubble/bubblemodel.cpp

@@ -20,6 +20,8 @@
 
 namespace notification {
 
+static const int BlockItemTimeout = 1000;
+
 BubbleModel::BubbleModel(QObject *parent)
     : QAbstractListModel(parent)
     , m_updateTimeTipTimer(new QTimer(this))
@@ -41,6 +43,9 @@
             m_processPendingTimer->start();
         }
     });
+    connect(&m_expireTimer, &ExpireTimer::expired, this, [this](qint64 id, const QVariant &data) {
+        Q_EMIT bubbleExpired(id, data.toUInt());
+    });
 
     connect(NotifySetting::instance(), &NotifySetting::contentRowCountChanged, this, &BubbleModel::updateContentRowCount);
     connect(NotifySetting::instance(), &NotifySetting::bubbleCountChanged, this, &BubbleModel::updateBubbleCount);
@@ -82,6 +87,10 @@
     beginInsertRows(QModelIndex(), 0, 0);
     m_bubbles.prepend(bubble);
     endInsertRows();
+
+    // A non-positive interval (Critical urgency or expireTimeout 0) means the
+    // bubble never expires on its own.
+    m_expireTimer.start(bubble->id(), effectiveTimeout(bubble->urgency(), bubble->timeout()), bubble->bubbleId());
 }
 
 bool BubbleModel::isReplaceBubble(const BubbleItem *bubble) const
@@ -95,9 +104,17 @@
     const auto replaceIndex = replaceBubbleIndex(bubble);
     const auto oldBubble = m_bubbles[replaceIndex];
 
+    m_expireTimer.stop(oldBubble->id());
+
     m_bubbles.replace(replaceIndex, bubble);
     Q_EMIT dataChanged(index(replaceIndex), index(replaceIndex));
 
+    m_expireTimer.start(bubble->id(), effectiveTimeout(bubble->urgency(), bubble->timeout()), bubble->bubbleId());
+
+    // If the replaced bubble was the hovered one, keep blocking the new one.
+    if (m_blockedId == oldBubble->id())
+        m_expireTimer.pause(bubble->id());
+
     return oldBubble;
 }
 
@@ -109,6 +126,9 @@
     qDeleteAll(m_pendingBubbles);
     m_pendingBubbles.clear();
 
+    m_blockedId = NotifyEntity::InvalidId;
+    m_expireTimer.clear();
+
     if (m_bubbles.count() <= 0)
         return;
     beginResetModel();
@@ -129,11 +149,12 @@
     if (index < 0 || index >= m_bubbles.size())
         return;
 
-    beginRemoveRows(QModelIndex(), index, index);
     auto bubble = m_bubbles.takeAt(index);
+    m_expireTimer.stop(bubble->id());
+
+    beginRemoveRows(QModelIndex(), index, index);
     bubble->deleteLater();
     endRemoveRows();
-
 }
 
 void BubbleModel::remove(const BubbleItem *bubble)
@@ -298,4 +319,19 @@
         Q_EMIT dataChanged(index(0), index(m_bubbles.size() - 1), {BubbleModel::ContentRowCount});
     }
 }
+
+void BubbleModel::setBlockedId(qint64 id)
+{
+    if (id == m_blockedId)
+        return;
+
+    if (m_blockedId != NotifyEntity::InvalidId)
+        m_expireTimer.resume(m_blockedId, BlockItemTimeout);
+
+    m_blockedId = id;
+
+    if (id != NotifyEntity::InvalidId)
+        m_expireTimer.pause(id);
 }
+
+} // notification

panels/notification/bubble/bubblemodel.h

@@ -4,11 +4,13 @@
 
 #pragma once
 
 #include "dsglobal.h"
 #include "notifyentity.h"
+#include "expiretimer.h"
 
 #include <QAbstractListModel>
+#include <QHash>
 #include <QQueue>
 
 class QTimer;
 
@@ -38,6 +40,10 @@
     explicit BubbleModel(QObject *parent = nullptr);
     ~BubbleModel() override;
 
+Q_SIGNALS:
+    // Emitted when a bubble reaches its expire timeout and should be closed.
+    void bubbleExpired(qint64 id, uint bubbleId);
+
 public:
     void push(BubbleItem *bubble);
 
@@ -51,6 +57,10 @@
     BubbleItem *removeById(qint64 id);
     void clear();
 
+    // Pause/resume the expire timer of the hovered bubble so hovering
+    // keeps the bubble on screen (0 clears the blocked bubble).
+    void setBlockedId(qint64 id);
+
     BubbleItem *bubbleItem(int bubbleIndex) const;
 
     int rowCount(const QModelIndex &parent) const override;
@@ -68,11 +78,12 @@
     void updateBubbleTimeTip();
     void updateContentRowCount(int rowCount);
 
-private:
     QTimer *m_updateTimeTipTimer = nullptr;
     QTimer *m_processPendingTimer = nullptr;
+    ExpireTimer m_expireTimer;
     QList<BubbleItem *> m_bubbles;
     QQueue<BubbleItem *> m_pendingBubbles;
+    qint64 m_blockedId = NotifyEntity::InvalidId;
     int m_maxKeep{5};
     int m_contentRowCount{6};
 };

panels/notification/bubble/bubblepanel.cpp

@@ -53,6 +53,14 @@ bool BubblePanel::init()
 
     connect(m_bubbles, &BubbleModel::rowsInserted, this, &BubblePanel::onBubbleCountChanged);
     connect(m_bubbles, &BubbleModel::rowsRemoved, this, &BubblePanel::onBubbleCountChanged);
+    // The bubble model runs one expire timer per shown bubble. When a bubble
+    // times out, close it and notify the server so it moves the notification
+    // from the in-memory store to the center database and emits the signals.
+    connect(m_bubbles, &BubbleModel::bubbleExpired, this, [this](qint64 id, uint bubbleId) {
+        closeBubble(id);
+        QMetaObject::invokeMethod(m_notificationServer, "notificationClosed", Qt::DirectConnection,
+                                  Q_ARG(qint64, id), Q_ARG(uint, bubbleId), Q_ARG(uint, NotifyEntity::Expired));
+    });
 
     return true;
 }
@@ -217,7 +225,7 @@ void BubblePanel::setEnabled(bool newEnabled)
 
 void BubblePanel::setHoveredId(qint64 id)
 {
-    QMetaObject::invokeMethod(m_notificationServer, "setBlockClosedId", Qt::DirectConnection, Q_ARG(qint64, id));
+    m_bubbles->setBlockedId(id);
 }
 }
 

panels/notification/center/notifystagingmodel.cpp

@@ -25,12 +25,18 @@ NotifyStagingModel::NotifyStagingModel(QObject *parent)
     connect(NotifyAccessor::instance(), &NotifyAccessor::stagingEntityReceived, this, &NotifyStagingModel::doEntityReceived);
     connect(NotifyAccessor::instance(), &NotifyAccessor::stagingEntityClosed, this, &NotifyStagingModel::onEntityClosed);
     connect(NotifySetting::instance(), &NotifySetting::contentRowCountChanged, this, &NotifyStagingModel::updateContentRowCount);
+
+    connect(&m_expireTimer, &ExpireTimer::expired, this, [this](qint64 id, const QVariant &) {
+        closeNotify(id, NotifyEntity::Expired);
+    });
 }
 
 void NotifyStagingModel::close()
 {
     qDebug(notifyLog) << "close";
 
+    m_expireTimer.clear();
+
     beginResetModel();
     qDeleteAll(m_appNotifies);
     m_appNotifies.clear();
@@ -63,6 +69,10 @@ void NotifyStagingModel::push(const NotifyEntity &entity)
         updateOverlapCount(count);
     }
 
+    // A non-positive interval (Critical urgency or expireTimeout 0) means the
+    // notification never expires on its own.
+    m_expireTimer.start(entity.id(), effectiveTimeout(entity.urgency(), entity.timeout()));
+
     if (m_refreshTimer < 0) {
         m_refreshTimer = startTimer(std::chrono::milliseconds(1000));
     }
@@ -90,6 +100,8 @@ void NotifyStagingModel::remove(qint64 id)
 {
     qDebug(notifyLog) << "Remove notify by id" << id;
 
+    m_expireTimer.stop(id);
+
     int row = -1;
     for (int i = 0; i < m_appNotifies.size(); i++) {
         auto item = m_appNotifies[i];
@@ -146,6 +158,7 @@ void NotifyStagingModel::remove(qint64 id)
             auto notify = new AppNotifyItem(newEntity);
             m_appNotifies.insert(insertedIndex, notify);
             endInsertRows();
+            m_expireTimer.start(newEntity.id(), effectiveTimeout(newEntity.urgency(), newEntity.timeout()));
         }
     }
     updateOverlapCount(entities.size());
@@ -155,6 +168,8 @@ void NotifyStagingModel::open()
 {
     qDebug(notifyLog) << "Open staging model";
 
+    m_expireTimer.clear();
+
     auto entities = m_accessor->fetchEntities(DataAccessor::AllApp(), NotifyEntity::NotProcessed, BubbleMaxCount + OverlayMaxCount);
 
     qDebug(notifyLog) << "Fetched staging size" << entities.size();
@@ -172,6 +187,9 @@ void NotifyStagingModel::open()
         auto notify = new AppNotifyItem(entities.at(i));
         m_appNotifies << notify;
     }
+    for (const auto &entity : entities) {
+        m_expireTimer.start(entity.id(), effectiveTimeout(entity.urgency(), entity.timeout()));
+    }
     updateOverlapCount(entities.size());
 
     endResetModel();
@@ -251,7 +269,9 @@ void NotifyStagingModel::replace(const NotifyEntity &entity)
     for (int i = 0; i < m_appNotifies.size(); i++) {
         auto item = m_appNotifies[i];
         if (item->id() == entity.bubbleId()) {
+            m_expireTimer.stop(entity.bubbleId());
             item->setEntity(entity);
+            m_expireTimer.start(entity.id(), effectiveTimeout(entity.urgency(), entity.timeout()));
             const auto index = this->index(i, 0, {});
             dataChanged(index, index);
             break;
@@ -333,9 +353,9 @@ void NotifyStagingModel::updateContentRowCount(int rowCount)
         return;
 
     m_contentRowCount = rowCount;
-
     if (!m_appNotifies.isEmpty()) {
         dataChanged(index(0), index(m_appNotifies.size() - 1), {NotifyRole::NotifyContentRowCount});
     }
 }
+
 }

panels/notification/center/notifystagingmodel.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2024-2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -9,7 +9,8 @@
 #include <QtQml/qqml.h>
 
 #include "notifyitem.h"
 #include "dataaccessor.h"
+#include "expiretimer.h"
 
 namespace notifycenter {
 /**
@@ -73,5 +74,9 @@
     DataAccessor *m_accessor = nullptr;
     int m_overlapCount = 0;
     int m_contentRowCount = 6;
+    // Notifications shown in the staging area (notification center) need their
+    // own expire timeout because the bubble panel is disabled while the center
+    // window is open, so the bubble-side timers are not running.
+    ExpireTimer m_expireTimer;
 };
 }