fix: missing dismissed to close notify for notication

18202781743 · 18202781743 · commit f50737a4b717 · 2024-12-24T13:13:51.000+08:00
Dismissed notify doesn't move to notification center.
Disable dismissed of overlap notification for notification center.

pms: TASK-366403
diff --git a/panels/notification/bubble/bubblepanel.cpp b/panels/notification/bubble/bubblepanel.cpp
@@ -76,14 +76,14 @@ void BubblePanel::invokeAction(int bubbleIndex, const QString &actionId)
     onActionInvoked(bubble->id(), bubble->bubbleId(), actionId);
 }
 
-void BubblePanel::close(int bubbleIndex)
+void BubblePanel::close(int bubbleIndex, int reason)
 {
     auto bubble = bubbleItem(bubbleIndex);
     if (!bubble)
         return;
 
     m_bubbles->remove(bubbleIndex);
-    onBubbleClosed(bubble->id(), bubble->bubbleId(), NotifyEntity::Closed);
+    onBubbleClosed(bubble->id(), bubble->bubbleId(), reason);
 }
 
 void BubblePanel::delayProcess(int bubbleIndex)
diff --git a/panels/notification/bubble/bubblepanel.h b/panels/notification/bubble/bubblepanel.h
@@ -36,7 +36,7 @@ class BubblePanel : public DS_NAMESPACE::DPanel
 
 public Q_SLOTS:
     void invokeAction(int bubbleIndex, const QString &actionId);
-    void close(int bubbleIndex);
+    void close(int bubbleIndex, int reason);
     void delayProcess(int bubbleIndex);
     void setEnabled(bool newEnabled);
 
diff --git a/panels/notification/bubble/package/NormalBubble.qml b/panels/notification/bubble/package/NormalBubble.qml
@@ -18,41 +18,22 @@ NotifyItemContent {
     iconName: bubble.iconName
     date: bubble.timeTip
     actions: bubble.actions
+    defaultAction: bubble.defaultAction
     title: bubble.summary
     content: bubble.body
     strongInteractive: bubble.urgency === 2
     contentIcon: bubble.bodyImagePath
     contentRowCount: bubble.contentRowCount
     onRemove: function () {
         console.log("remove notify", bubble.appName)
-        Applet.close(bubble.index)
+        Applet.close(bubble.index, NotifyItem.Closed)
+    }
+    onDismiss: function () {
+        console.log("dismiss notify", bubble.appName)
+        Applet.close(bubble.index, NotifyItem.Dismissed)
     }
     onActionInvoked: function (actionId) {
         console.log("action notify", bubble.appName, actionId)
         Applet.invokeAction(bubble.index, actionId)
     }
-
-    MouseArea {
-        anchors.fill: parent
-        hoverEnabled: true
-        z: -1 // default action
-        onClicked: {
-            if (!bubble.defaultAction)
-                return
-
-            console.log("default action notify", bubble.appName, bubble.defaultAction)
-            Applet.invokeAction(bubble.index, bubble.defaultAction)
-        }
-        property bool longPressed
-        onPressAndHold: {
-            longPressed = true
-        }
-        onPositionChanged: {
-            if (longPressed) {
-                longPressed = false
-                console.log("delay process", bubble.index)
-                Applet.delayProcess(bubble.index)
-            }
-        }
-    }
 }
diff --git a/panels/notification/center/NormalNotify.qml b/panels/notification/center/NormalNotify.qml
@@ -12,6 +12,8 @@ import org.deepin.ds.notificationcenter
 NotifyItem {
     id: root
 
+    property var removedCallback
+
     states: [
         State {
             name: "removing"
@@ -26,8 +28,9 @@ NotifyItem {
             NumberAnimation { properties: "opacity"; duration: 300; easing.type: Easing.Linear }
         }
         onRunningChanged: {
-            if (!running) {
-                root.remove()
+            if (!running && root.removedCallback) {
+                root.removedCallback()
+                root.removedCallback = undefined
             }
         }
     }
@@ -40,12 +43,22 @@ NotifyItem {
         title: root.title
         date: root.date
         actions: root.actions
+        defaultAction: root.defaultAction
         closeVisible: root.hovered || root.activeFocus
         strongInteractive: root.strongInteractive
         contentIcon: root.contentIcon
         contentRowCount: root.contentRowCount
 
         onRemove: function () {
+            root.removedCallback = function () {
+                root.remove()
+            }
+            root.state = "removing"
+        }
+        onDismiss: function () {
+            root.removedCallback = function () {
+                root.dismiss()
+            }
             root.state = "removing"
         }
         onActionInvoked: function (actionId) {
diff --git a/panels/notification/center/NotifyStaging.qml b/panels/notification/center/NotifyStaging.qml
@@ -40,6 +40,7 @@ FocusScope {
             iconName: model.iconName
             date: model.time
             actions: model.actions
+            defaultAction: model.defaultAction
             title: model.title
             content: model.content
             strongInteractive: model.strongInteractive
@@ -48,7 +49,11 @@ FocusScope {
 
             onRemove: function () {
                 console.log("remove overlap", model.id)
-                notifyModel.closeNotify(model.id)
+                notifyModel.closeNotify(model.id, NotifyItem.Closed)
+            }
+            onDismiss: function () {
+                console.log("dismiss overlap", model.id)
+                notifyModel.closeNotify(model.id, NotifyItem.Dismissed)
             }
             onActionInvoked: function (actionId) {
                 console.log("action overlap", model.id, actionId)
diff --git a/panels/notification/center/NotifyViewDelegate.qml b/panels/notification/center/NotifyViewDelegate.qml
@@ -73,12 +73,7 @@ DelegateChooser {
             strongInteractive: model.strongInteractive
             contentIcon: model.contentIcon
             contentRowCount: model.contentRowCount
-            property string defaultAction: model.defaultAction
-
-            function invokeAction(actionId) {
-                console.log("action normal", model.id, actionId)
-                notifyModel.invokeAction(model.id, actionId)
-            }
+            defaultAction: model.defaultAction
 
             Loader {
                 anchors.fill: parent
@@ -98,13 +93,6 @@ DelegateChooser {
                 }
             }
 
-            // default action
-            TapHandler {
-                enabled: model.defaultAction !== ""
-                acceptedButtons: Qt.LeftButton
-                onTapped: invokeAction(model.defaultAction)
-            }
-
             onSetting: function (pos) {
                 let tmp = mapToItem(root.view, pos)
                 root.setting(tmp, {
@@ -116,8 +104,13 @@ DelegateChooser {
                 console.log("remove normal", model.id)
                 notifyModel.remove(model.id)
             }
+            onDismiss: function () {
+                console.log("dismiss normal", model.id)
+                notifyModel.remove(model.id)
+            }
             onActionInvoked: function (actionId) {
-                invokeAction(actionId)
+                console.log("action normal", model.id, actionId)
+                notifyModel.invokeAction(model.id, actionId)
             }
         }
     }
@@ -141,6 +134,7 @@ DelegateChooser {
             strongInteractive: model.strongInteractive
             contentIcon: model.contentIcon
             contentRowCount: model.contentRowCount
+            enableDismissed: false
 
             Loader {
                 anchors.fill: parent
diff --git a/panels/notification/center/OverlapNotify.qml b/panels/notification/center/OverlapNotify.qml
@@ -14,6 +14,8 @@ NotifyItem {
 
     property int count: 1
     readonly property int overlapItemRadius: 12
+    property bool enableDismissed: true
+    property var removedCallback
 
     signal expand()
 
@@ -31,8 +33,9 @@ NotifyItem {
             NumberAnimation { properties: "opacity"; duration: 300; easing.type: Easing.Linear }
         }
         onRunningChanged: {
-            if (!running) {
-                root.remove()
+            if (!running && root.removedCallback) {
+                root.removedCallback()
+                root.removedCallback = undefined
             }
         }
     }
@@ -49,12 +52,23 @@ NotifyItem {
             title: root.title
             date: root.date
             actions: root.actions
+            defaultAction: root.defaultAction
             closeVisible: root.hovered || root.activeFocus
             strongInteractive: root.strongInteractive
             contentIcon: root.contentIcon
             contentRowCount: root.contentRowCount
+            enableDismissed: root.enableDismissed
 
             onRemove: function () {
+                root.removedCallback = function () {
+                    root.remove()
+                }
+                root.state = "removing"
+            }
+            onDismiss: function () {
+                root.removedCallback = function () {
+                    root.dismiss()
+                }
                 root.state = "removing"
             }
             onActionInvoked: function (actionId) {
@@ -78,6 +92,7 @@ NotifyItem {
 
     // expand
     TapHandler {
+        enabled: !root.enableDismissed
         acceptedButtons: Qt.LeftButton
         onTapped: root.expand()
     }
diff --git a/panels/notification/center/notifyaccessor.cpp b/panels/notification/center/notifyaccessor.cpp
@@ -170,14 +170,13 @@ void NotifyAccessor::clear()
     }
 }
 
-void NotifyAccessor::closeNotify(const NotifyEntity &entity)
+void NotifyAccessor::closeNotify(const NotifyEntity &entity, NotifyEntity::ClosedReason reason)
 {
     if (!m_dataUpdater)
         return;
     const auto id = entity.id();
     const auto bubbleId = entity.bubbleId();
-    QMetaObject::invokeMethod(m_dataUpdater, "notificationClosed", Qt::DirectConnection,
-                              Q_ARG(qint64, id), Q_ARG(uint, bubbleId), Q_ARG(uint, NotifyEntity::Closed));
+    QMetaObject::invokeMethod(m_dataUpdater, "notificationClosed", Qt::DirectConnection, Q_ARG(qint64, id), Q_ARG(uint, bubbleId), Q_ARG(uint, reason));
 }
 
 void NotifyAccessor::invokeNotify(const NotifyEntity &entity, const QString &actionId)
diff --git a/panels/notification/center/notifyaccessor.h b/panels/notification/center/notifyaccessor.h
@@ -52,7 +52,7 @@ class NotifyAccessor : public QObject
     void removeEntityByApp(const QString &appName);
     void clear();
 
-    void closeNotify(const NotifyEntity &entity);
+    void closeNotify(const NotifyEntity &entity, NotifyEntity::ClosedReason reason);
     void invokeNotify(const NotifyEntity &entity, const QString &actionId);
 
 signals:
diff --git a/panels/notification/center/notifystagingmodel.cpp b/panels/notification/center/notifystagingmodel.cpp
@@ -68,11 +68,11 @@ void NotifyStagingModel::push(const NotifyEntity &entity)
     }
 }
 
-void NotifyStagingModel::closeNotify(qint64 id)
+void NotifyStagingModel::closeNotify(qint64 id, int reason)
 {
     auto entity = m_accessor->fetchEntity(id);
     if (entity.isValid()) {
-        NotifyAccessor::instance()->closeNotify(entity);
+        NotifyAccessor::instance()->closeNotify(entity, static_cast<NotifyEntity::ClosedReason>(reason));
     }
     remove(id);
 }
diff --git a/panels/notification/center/notifystagingmodel.h b/panels/notification/center/notifystagingmodel.h
@@ -39,7 +39,7 @@ class NotifyStagingModel : public QAbstractListModel
     };
     NotifyStagingModel(QObject *parent = nullptr);
 
-    Q_INVOKABLE void closeNotify(qint64 id);
+    Q_INVOKABLE void closeNotify(qint64 id, int reason);
     Q_INVOKABLE void invokeNotify(qint64 id, const QString &actionId);
     Q_INVOKABLE void open();
     Q_INVOKABLE void close();
diff --git a/panels/notification/plugin/NotifyItem.qml b/panels/notification/plugin/NotifyItem.qml
@@ -11,6 +11,13 @@ import org.deepin.ds.notification
 Control {
     id: root
 
+    enum CloseReason {
+        Expired = 1,
+        Dismissed = 2,
+        Closed = 3,
+        Unknown = 4
+    }
+
     property string appName: "deepin-editor"
     property string iconName: "deepin-editor"
     property string content: "content"
@@ -21,11 +28,13 @@ Control {
         {text: "close", id: "close"},
         {text: "exec", id: "exec"}
     ]
+    property string defaultAction
     property bool strongInteractive: false
     property string contentIcon: "deepin-editor"
     property int contentRowCount: 6
 
     signal remove()
+    signal dismiss()
     signal setting(var pos)
     signal actionInvoked(var actionId)
     signal linkActivated(var link)
diff --git a/panels/notification/plugin/NotifyItemContent.qml b/panels/notification/plugin/NotifyItemContent.qml
@@ -14,6 +14,32 @@ NotifyItem {
 
     property bool closeVisible: root.hovered || root.activeFocus
     property int miniContentHeight: NotifyStyle.contentItem.miniHeight
+    property bool enableDismissed: true
+
+    Item {
+        anchors.fill: parent
+        z: -1
+        enabled: root.enableDismissed
+        TapHandler {
+            property bool isLongPressed
+            gesturePolicy: TapHandler.ReleaseWithinBounds
+            onCanceled: function () {
+                if (isLongPressed) {
+                    console.log("Dissmiss notify", root.appName, isLongPressed)
+                    root.dismiss()
+                }
+                isLongPressed = false
+            }
+            onLongPressed: isLongPressed = true
+            onTapped: function () {
+                if (!root.defaultAction)
+                    return
+
+                console.log("Click default action notify", root.appName, root.defaultAction)
+                root.actionInvoked(root.defaultAction)
+            }
+        }
+    }
 
     // placeHolder to receive MouseEvent
     Control {
diff --git a/panels/notification/server/notificationmanager.cpp b/panels/notification/server/notificationmanager.cpp
@@ -194,10 +194,9 @@ uint NotificationManager::Notify(const QString &appName, uint replacesId, const
         return 0;
     }
 
-    QString tsAppName{appName};
-    auto appNameValue = m_setting->appValue(appId, NotificationSetting::AppName);
-    if (!appNameValue.isNull()) {
-        tsAppName = appNameValue.toString();
+    auto tsAppName = m_setting->appValue(appId, NotificationSetting::AppName).toString();
+    if (tsAppName.isEmpty()) {
+        tsAppName = appName;
     }
 
     QString strBody = body;
@@ -428,7 +427,7 @@ void NotificationManager::updateEntityProcessed(qint64 id, uint reason)
 {
     auto entity = m_persistence->fetchEntity(id);
     if (entity.isValid()) {
-        if (reason == NotifyEntity::Closed && entity.processedType() == NotifyEntity::NotProcessed) {
+        if ((reason == NotifyEntity::Closed || reason == NotifyEntity::Dismissed) && entity.processedType() == NotifyEntity::NotProcessed) {
             entity.setProcessedType(NotifyEntity::Removed);
         } else {
             entity.setProcessedType(NotifyEntity::Processed);

Original file line number	Diff line number	Diff line change
`@@ -76,14 +76,14 @@ void BubblePanel::invokeAction(int bubbleIndex, const QString &actionId)`
`76`	`76`	`onActionInvoked(bubble->id(), bubble->bubbleId(), actionId);`
`77`	`77`	`}`
`78`	`78`
`79`		`-void BubblePanel::close(int bubbleIndex)`
	`79`	`+void BubblePanel::close(int bubbleIndex, int reason)`
`80`	`80`	`{`
`81`	`81`	`auto bubble = bubbleItem(bubbleIndex);`
`82`	`82`	`if (!bubble)`
`83`	`83`	`return;`
`84`	`84`
`85`	`85`	`m_bubbles->remove(bubbleIndex);`
`86`		`- onBubbleClosed(bubble->id(), bubble->bubbleId(), NotifyEntity::Closed);`
	`86`	`+ onBubbleClosed(bubble->id(), bubble->bubbleId(), reason);`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`void BubblePanel::delayProcess(int bubbleIndex)`
Original file line number	Diff line number	Diff line change
`@@ -170,14 +170,13 @@ void NotifyAccessor::clear()`
`170`	`170`	`}`
`171`	`171`	`}`
`172`	`172`
`173`		`-void NotifyAccessor::closeNotify(const NotifyEntity &entity)`
	`173`	`+void NotifyAccessor::closeNotify(const NotifyEntity &entity, NotifyEntity::ClosedReason reason)`
`174`	`174`	`{`
`175`	`175`	`if (!m_dataUpdater)`
`176`	`176`	`return;`
`177`	`177`	`const auto id = entity.id();`
`178`	`178`	`const auto bubbleId = entity.bubbleId();`
`179`		`- QMetaObject::invokeMethod(m_dataUpdater, "notificationClosed", Qt::DirectConnection,`
`180`		`- Q_ARG(qint64, id), Q_ARG(uint, bubbleId), Q_ARG(uint, NotifyEntity::Closed));`
	`179`	`+ QMetaObject::invokeMethod(m_dataUpdater, "notificationClosed", Qt::DirectConnection, Q_ARG(qint64, id), Q_ARG(uint, bubbleId), Q_ARG(uint, reason));`
`181`	`180`	`}`
`182`	`181`
`183`	`182`	`void NotifyAccessor::invokeNotify(const NotifyEntity &entity, const QString &actionId)`
Original file line number	Diff line number	Diff line change
`@@ -68,11 +68,11 @@ void NotifyStagingModel::push(const NotifyEntity &entity)`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`71`		`-void NotifyStagingModel::closeNotify(qint64 id)`
	`71`	`+void NotifyStagingModel::closeNotify(qint64 id, int reason)`
`72`	`72`	`{`
`73`	`73`	`auto entity = m_accessor->fetchEntity(id);`
`74`	`74`	`if (entity.isValid()) {`
`75`		`- NotifyAccessor::instance()->closeNotify(entity);`
	`75`	`+ NotifyAccessor::instance()->closeNotify(entity, static_cast<NotifyEntity::ClosedReason>(reason));`
`76`	`76`	`}`
`77`	`77`	`remove(id);`
`78`	`78`	`}`