1. 闪烁动画方式改为只对主按钮; 2. 闪烁线程卡死导致插件不能正常退出问题

fmp_flicker.cpp

+#include "fmp_flicker.h"
+#include <QVariantAnimation>
+#include <QPainter>
+#include <QDebug>
+#include <QStyleOption>
+
+FMPFlicker::FMPFlicker(const QString &pix, QWidget *parent)
+    : QPushButton(parent),
+      _normal(pix),
+      _opacity(1.0)
+{
+    connect(&_animation, SIGNAL(valueChanged(QVariant)), SLOT(onOpacityChanged(QVariant)));
+}
+
+void FMPFlicker::paintEvent(QPaintEvent *pe)
+{
+    Q_UNUSED(pe);
+    QStyleOption opt;
+    opt.init(this);
+    QPainter p(this);
+
+    int x = (_normal.width() - opt.rect.width()) / 2;
+    int y = (_normal.height() - opt.rect.height()) / 2;
+    p.translate(-x, -y);
+    p.setOpacity(1 - _opacity);
+    p.drawPixmap(0, 0, _notify);
+
+    p.setOpacity(_opacity);
+    p.drawPixmap(0, 0, _normal);
+}
+
+void FMPFlicker::start(const QString &pix_path)
+{
+    if (!pix_path.isEmpty()) {
+        setNotifyPixmap(pix_path);
+    }
+
+    _animation.setStartValue(1.0);
+    _animation.setKeyValueAt(0.1, 1.0);
+    _animation.setKeyValueAt(0.3, 0.0);
+    _animation.setKeyValueAt(0.7, 0.0);
+    _animation.setEndValue(1.0);
+
+    _animation.setLoopCount(-1);
+    _animation.setDuration(1200);
+    _animation.start();
+}
+
+void FMPFlicker::stop()
+{
+    _animation.stop();
+    _opacity = _animation.endValue().toReal();
+    update();
+}
+
+bool FMPFlicker::setNormalPixmap(const QString &pix)
+{
+    QPixmap pixmap;
+    if (pixmap.load(pix)) {
+        return _normal.load(pix);
+    }
+
+    return false;
+}
+
+bool FMPFlicker::setNotifyPixmap(const QString &pix)
+{
+    QPixmap pixmap;
+    if (pixmap.load(pix)) {
+        return _notify.load(pix);
+    }
+
+    return false;
+}
+
+void FMPFlicker::onOpacityChanged(const QVariant &v)
+{
+    _opacity = v.toReal();
+    update(_notify.rect());
+}
+

fmp_flicker.h

+#ifndef FMPFLICKER_H
+#define FMPFLICKER_H
+
+class QPaintEvent;
+
+#include <QPushButton>
+#include <QVariantAnimation>
+
+
+class FMPFlicker : public QPushButton
+{
+    Q_OBJECT
+public:
+    explicit    FMPFlicker(const QString &pix, QWidget *parent = 0);
+
+    void        paintEvent(QPaintEvent *pe);
+
+    bool        setNormalPixmap(const QString &pix);
+    bool        setNotifyPixmap(const QString &pix);
+
+public slots:
+    void        start(const QString &pix_path);
+    void        start() { start(QString()); }
+    void        stop();
+
+private slots:
+    void        onOpacityChanged(const QVariant &v);
+
+private:
+    QPixmap             _normal;
+    QPixmap             _notify;
+    qreal               _opacity;
+    QVariantAnimation   _animation;
+
+};
+
+#endif // FMPFLICKER_H

fmp_home.pro

@@ -22,7 +22,8 @@ SOURCES +=\
     fmnetwork.cpp \
     fmp_he_handlers.cpp \
     fmnumpad.cpp \
-    fmp_home_settings.cpp
+    fmp_home_settings.cpp \
+    fmp_flicker.cpp
 
 HEADERS  += fmp_home.h \
     fmp_home_plugin_p.h \
@@ -35,7 +36,8 @@ HEADERS  += fmp_home.h \
     fmnetwork.h \
     fmp_he_handlers.h \
     fmnumpad.h \
-    fmp_home_settings.h
+    fmp_home_settings.h \
+    fmp_flicker.h
 
 FORMS    += \
     fmp_home_navwindow.ui \

fmp_home_navwindow.cpp

@@ -25,10 +25,12 @@ NavWindow::NavWindow(QWidget *parent) :
 {
     ui->setupUi(this);
     ui->navMainBtn->setMovedItem(this);
+    connect(this, SIGNAL(startBlink()), ui->navMainBtn, SLOT(start()));
+    connect(this, SIGNAL(stopBlink()), ui->navMainBtn, SLOT(stop()));
 
     btns.push_back(std::make_pair("payment", QString::fromLocal8Bit("非码支付")));
     btns.push_back(std::make_pair("vip", QString::fromLocal8Bit("非码会员")));
-    btns.push_back(std::make_pair("takeaway", QString::fromLocal8Bit("非码外卖")));
+    btns.push_back(std::make_pair("takeout", QString::fromLocal8Bit("非码外卖")));
 //    btns.push_back(std::make_pair("coupons", QString::fromLocal8Bit("码多多")));
     btns.push_back(std::make_pair("tool", QString::fromLocal8Bit("设置")));
 
@@ -54,6 +56,14 @@ NavWindow::NavWindow(QWidget *parent) :
 NavWindow::~NavWindow()
 {
     FMP_DEBUG() << __FUNCTION__ << "****";
+
+    //! 解决闪烁时退出卡死
+    _semaphore.release(_blinkObjQueue.count());
+    _blinkObjQueue.clear();
+    _blinkObjIdSet.clear();
+
+    _blinkFuture.waitForFinished();
+
     delete _btn_group;
     for(int i=0; i<actions.size(); ++i) {
         delete actions.at(i);
@@ -102,7 +112,7 @@ void NavWindow::initMenu()
     stateDefault->addTransition(ui->navMainBtn, &QPushButton::clicked, stateSpread);
     stateSpread->assignProperty(this, "navImage", ":fm-icon_02");
     stateSpread->addTransition(ui->navMainBtn, &QPushButton::clicked, stateDefault);
-    stateGroup->setInitialState(stateDefault);
+    stateGroup->setInitialState(stateSpread);
     QHistoryState *stateGroupHistory = new QHistoryState(stateGroup);
     stateGroupHistory->setDefaultState(stateDefault);
     _stateMachine->addState(stateGroup);
@@ -112,7 +122,8 @@ void NavWindow::initMenu()
     stateBlink->addTransition(ui->navMainBtn, &QPushButton::clicked, stateGroupHistory);
     stateBlink->addTransition(this, &NavWindow::stopBlink, stateGroupHistory);
     connect(stateBlink, &QState::exited, this, [=](){
-        _isStateBlink = false;
+        ui->navMainBtn->stop();
+        _semaphore.release();
     });
     _stateMachine->addState(stateBlink);
 
@@ -235,7 +246,7 @@ bool NavWindow::removeBlink(int blinkId)
             if (_blinkObjQueue.at(i).id == blinkId) {
                 _blinkObjQueue.removeAt(i);
                 _blinkObjIdSet.remove(blinkId);
-                if(i==0 && _isStateBlink) {
+                if(i==0 && _semaphore.available() == 0) {
                     emit stopBlink();
                 }
                 isOk = true;
@@ -255,39 +266,12 @@ void NavWindow::blink()
         while(!_blinkObjQueue.isEmpty()) {
             BlinkObject blinkObject = _blinkObjQueue.first();
             // 发送startBlink信号使状态机进入stateBlink
+            ui->navMainBtn->setNotifyPixmap(blinkObject.image);
             emit startBlink();
-            _isStateBlink = true;
-            QPropertyAnimation m_animation;
-            m_animation.setTargetObject(this);
-            m_animation.setPropertyName("windowOpacity");
-            m_animation.setDuration(200);
-            m_animation.setEasingCurve(QEasingCurve::InOutSine);
-            QEventLoop loop;
-            connect(&m_animation, &QPropertyAnimation::finished, &loop, &QEventLoop::quit);
 
             //! 状态机在stateBlink时持续闪烁
             //! 前面刚发送了startBlink信号，状态机可能还没切换到stateBlink状态，所以不能用stateBlink->active()方法.
-            while(_isStateBlink) {
-                m_animation.setStartValue(1);
-                m_animation.setEndValue(0);
-                m_animation.start();
-                loop.exec();
-                QString oldImage = _navImage;
-                setNavImage(blinkObject.image);
-                m_animation.setStartValue(0);
-                m_animation.setEndValue(1);
-                m_animation.start();
-                loop.exec();
-                m_animation.setStartValue(1);
-                m_animation.setEndValue(0);
-                m_animation.start();
-                loop.exec();
-                setNavImage(oldImage);
-                m_animation.setStartValue(0);
-                m_animation.setEndValue(1);
-                m_animation.start();
-                loop.exec();
-            }
+            _semaphore.acquire();
             if(_blinkObjIdSet.contains(blinkObject.id)) {
                 FMP_DEBUG() << "Active blink plugin: " << blinkObject.id;
                 // 如果blinkObject.id还在set中，说明没有调用该闪烁的stop方法，可以发送激活插件信号
@@ -317,6 +301,12 @@ void NavWindow::onNavImageChanged()
                                       "background: url(%1) center no-repeat;"
                                       "border: none;}"
                                       ).arg(_navImage));
+    if (stateSpread->active()) {
+        ui->navMainBtn->setNotifyPixmap(_navImage);
+    }
+    else {
+        ui->navMainBtn->setNormalPixmap(_navImage);
+    }
 }
 void NavWindow::showMessage(const QString &title, const QString &msg, QSystemTrayIcon::MessageIcon icon, int mecs)
 {

fmp_home_navwindow.h

@@ -7,6 +7,7 @@
 #include <QSet>
 #include <QString>
 #include <QFuture>
+#include <QSemaphore>
 #include <QSystemTrayIcon>
 
 namespace Ui {
@@ -124,7 +125,7 @@ private:
 
     //! 标识状态机是否在stateBlink状态
     //! 之所以没用bool QState::active()方法是因为多进程同步问题
-    bool                    _isStateBlink;
+    QSemaphore              _semaphore;
     //! 闪烁队列、闪烁id的set及执行闪烁的进程future
     QQueue<BlinkObject>     _blinkObjQueue;
     QSet<int>               _blinkObjIdSet;

fmp_home_navwindow.ui

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

fmp_home_p.cpp

@@ -7,6 +7,7 @@
 #include <fmp_epay_i.h>
 #include <fmp_vip_i.h>
 #include <fmp_settings_i.h>
+#include <fmp_takeout_i.h>
 #include <QApplication>
 #include "fmp_login.h"
 #include "fmp_he_handlers.h"
@@ -127,30 +128,25 @@ void FMPHomePrivate::onMenuBtnClicked(QString btnName)
         }
     }
 
+    FMPBaseInterface *svc = 0;
     if(btnName == "payment") {
-        FMPePayInterface *e = q->GetService<FMPePayInterface>(q->_ctx);
-        if (e) {
-            e->StartService();
-        }
-        else {
-            FMP_WARN() << "Pay service not available";
-        }
+        svc = q->GetService<FMPePayInterface>(q->_ctx);
     } else if(btnName == "vip") {
-        FMPVipInterface *e = q->GetService<FMPVipInterface>(q->_ctx);
-        if (e) {
-//            e->StartService();
-            e->TriggerInit();
-        }
-        else {
-            FMP_WARN() << "Vip service not available";
-        }
+        svc = q->GetService<FMPVipInterface>(q->_ctx);
+        q->blink((FMPluginInterface*)svc, "C:/Users/Amor/Documents/QProjects/fmPos/fmp_home/res/img/fm_neworder.png");
     } else if(btnName == "takeout") {
-//        FMPTakeoutInterface *e = q->GetService<FMPTakeoutInterface>(q->_ctx);
-//        e->StartService();
+        svc = q->GetService<FMPTakeoutInterface>(q->_ctx);
     } else if(btnName == "coupons") {
 //        FMPVipInterface *e = q->GetService<FMPVipInterface>(q->_ctx);
 //        e->StartService();
     } else if(btnName == "tool") {
-        FMP_DEBUG() << "tool menu";
+        svc = q->GetService<FMPSettingsInterface>(q->_ctx);
+    }
+
+    if (svc) {
+        svc->StartService();
+    }
+    else {
+        FMP_WARN() << "service not available" ;
     }
 }

menubutton.cpp

@@ -2,7 +2,7 @@
 #include <QDebug>
 
 MenuButton::MenuButton(QWidget *parent)
-    : QPushButton(parent),
+    : FMPFlicker("", parent),
       _mouseMove(false),
       _mousePress(false),
       _canMove(false),

menubutton.h

 #ifndef MENUBUTTON_H
 #define MENUBUTTON_H
-#include <QPushButton>
+#include <fmp_flicker.h>
 #include <QMouseEvent>
 
-class MenuButton : public QPushButton
+class MenuButton : public FMPFlicker
 {
     Q_OBJECT
 public:

res/img.qrc

 <RCC>
     <qresource prefix="/">
-        <file alias="xiaoxi">img/消息.png</file>
         <file>img/num_del.png</file>
         <file alias="fm-icon_01">img/fm-icon_01.png</file>
         <file alias="payment">img/fm-icon_payment.png</file>

version.h

@@ -5,7 +5,7 @@
 #define VER_MINOR 1
 #define VER_REVISION 0
 
-#define VER_BUILD 8
+#define VER_BUILD 9
 
 //! Convert version numbers to string
 #define _STR(S)  #S