1. 实现stop某个插件的所有闪烁。 2. 修改外卖图片名。

fmp_home.cpp

@@ -66,6 +66,12 @@ bool FMPHome::stopBlink(int blinkId)
     return d->stopBlink(blinkId);
 }
 
+bool FMPHome::stopBlink(FMPluginInterface *ctkPlugin)
+{
+    Q_D(FMPHome);
+    return d->stopBlink(ctkPlugin);
+}
+
 void FMPHome::notification(const QString &msg, const QString &title,
                              QSystemTrayIcon::MessageIcon icon, int mecs)
 {

fmp_home.h

@@ -27,6 +27,7 @@ public:
 
     int                 blink(FMPluginInterface *plugin, const QString &image);
     bool                stopBlink(int blinkId);
+    bool                stopBlink(FMPluginInterface *ctkPlugin);
     void                notification(const QString &msg, const QString &title = QString::fromLocal8Bit(FMP_APPNAME),
                                  QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information, int mecs = 1000);
 

fmp_home_i.h

@@ -47,6 +47,7 @@ public:
      * @return bool 如果参数blinkId标识的闪烁不存在或已结束则返回false, 否则返回true
      */
     virtual bool        stopBlink(int blinkId) = 0;
+    virtual bool        stopBlink(FMPluginInterface *ctkPlugin) = 0;
 
     /**
      * @brief notification

fmp_home_navwindow.cpp

@@ -259,6 +259,18 @@ bool NavWindow::removeBlink(int blinkId)
 
     return isOk;
 }
+
+bool NavWindow::removeBlink(FMPluginInterface *plugin)
+{
+    bool isOk = true;
+    for(int i=0; i<_blinkObjQueue.size(); ++i) {
+        if (_blinkObjQueue.at(i).plugin == plugin) {
+            isOk &= removeBlink(_blinkObjQueue.at(i).id);
+        }
+    }
+    return isOk;
+}
+
 void NavWindow::blink()
 {
     _blinkFuture = QtConcurrent::run([this](){

fmp_home_navwindow.h

@@ -72,6 +72,7 @@ public slots:
      * @return          是否成功
      */
     bool removeBlink(int blinkId);
+    bool removeBlink(FMPluginInterface* plugin);
 	
 	/**
      * @brief showMessage

fmp_home_navwindow.ui

@@ -46,10 +46,10 @@ QPushButton:hover {
 	border-image: url(:vip_onclick);
 }
 #takeout {
-	border-image: url(:takeaway);
+	border-image: url(:takeout);
 }
 #takeout:pressed {
-	border-image: url(:takeaway_onclick);
+	border-image: url(:takeout_onclick);
 }
 #coupons {
 	border-image: url(:coupons);

fmp_home_p.cpp

@@ -99,6 +99,11 @@ bool FMPHomePrivate::stopBlink(int blinkId)
     return _navWindow->removeBlink(blinkId);
 }
 
+bool FMPHomePrivate::stopBlink(FMPluginInterface *ctkPlugin)
+{
+    return _navWindow->removeBlink(ctkPlugin);
+}
+
 void FMPHomePrivate::notification(const QString &msg, const QString &title,
                              QSystemTrayIcon::MessageIcon icon, int mecs)
 {

fmp_home_p.h

@@ -24,6 +24,7 @@ public:
 
     int             blink(FMPluginInterface *plugin, const QString &image);
     bool            stopBlink(int blinkId);
+    bool            stopBlink(FMPluginInterface *ctkPlugin);
 
     void            notification(const QString &msg, const QString &title = QString::fromLocal8Bit(FMP_APPNAME),
                                  QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information, int mecs = 1000);

res/img.qrc

@@ -10,8 +10,8 @@
         <file alias="fm-icon_tray">img/fm-icon_tray.png</file>
         <file alias="vip">img/fm-icon_member02.png</file>
         <file alias="vip_onclick">img/fm-icon_member02_2.png</file>
-        <file alias="takeaway">img/fm-icon_book.png</file>
-        <file alias="takeaway_onclick">img/fm-icon_book_02.png</file>
+        <file alias="takeout">img/fm-icon_book.png</file>
+        <file alias="takeout_onclick">img/fm-icon_book_02.png</file>
         <file alias="coupons">img/fm-icon_coupons.png</file>
         <file alias="coupons_onclick">img/fm-icon_coupons_02.png</file>
         <file>img/fm-icon_close_02.png</file>