Merge branch 'dev'

fmp_home.cpp

@@ -63,3 +63,10 @@ bool FMPHome::stopBlink(int blinkId)
     Q_D(FMPHome);
     return d->stopBlink(blinkId);
 }
+
+void FMPHome::notification(const QString &msg, const QString &title,
+                             QSystemTrayIcon::MessageIcon icon, int mecs)
+{
+    Q_D(FMPHome);
+    return d->notification(msg, title, icon, mecs);
+}

fmp_home.h

@@ -2,6 +2,7 @@
 #define FMP_HOME_H
 
 #include <QObject>
+#include <QSystemTrayIcon>
 
 #include "fmp_home_i.h"
 
@@ -30,6 +31,8 @@ public:
 
     int                 blink(FMPluginInterface *plugin, const QString &image);
     bool                stopBlink(int blinkId);
+    void                notification(const QString &msg, const QString &title = QString::fromLocal8Bit(FMP_APPNAME),
+                                 QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information, int mecs = 1000);
 
 private:
     FMPHomePrivate      *d_ptr;

fmp_home_i.h

@@ -2,6 +2,7 @@
 #define FMP_HOME_I_H
 
 #include <fmp_plugin_i.h>
+#include <QSystemTrayIcon>
 
 class FMPHomeInterface : public FMPluginInterface
 {
@@ -26,6 +27,18 @@ public:
      * @return bool 如果参数blinkId标识的闪烁不存在或已结束则返回false, 否则返回true
      */
     virtual bool stopBlink(int blinkId) = 0;
+
+    /**
+     * @brief notification
+     * 弹出一个Toast通知
+     * @param msg
+     * @param title
+     * @param icon
+     * @param mecs
+     */
+    virtual void notification(const QString &msg, const QString &title = QString::fromLocal8Bit(FMP_APPNAME),
+                                 QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information, int mecs = 1000) = 0;
+
 };
 
 Q_DECLARE_INTERFACE(FMPHomeInterface, "com.fmp.home")

fmp_home_navwindow.cpp

@@ -316,7 +316,7 @@ void NavWindow::onNavImageChanged()
                                       "border: none;}"
                                       ).arg(_navImage));
 }
-void NavWindow::showMessage(const QString &message)
+void NavWindow::showMessage(const QString &title, const QString &msg, QSystemTrayIcon::MessageIcon icon, int mecs)
 {
-    _systemTrayIcon->showMessage(QString::fromLocal8Bit(FMP_APPNAME), message);
+    _systemTrayIcon->showMessage(title, msg, icon, mecs);
 }

fmp_home_navwindow.h

@@ -7,6 +7,7 @@
 #include <QSet>
 #include <QString>
 #include <QFuture>
+#include <QSystemTrayIcon>
 
 namespace Ui {
 class NavWindow;
@@ -19,7 +20,6 @@ class QSequentialAnimationGroup;
 class FMPSettingsInterface;
 class QStateMachine;
 class QState;
-class QSystemTrayIcon;
 class FMPluginInterface;
 
 /**
@@ -76,7 +76,9 @@ public slots:
      * @brief showMessage
      * @param message
      */
-    void showMessage(const QString &message);
+    void showMessage(const QString &title, const QString &msg,
+                     QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information, int mecs = 1000);
+
 signals:
     void menuBtnClicked(QString btnName);
 

fmp_home_p.cpp

@@ -103,6 +103,12 @@ bool FMPHomePrivate::stopBlink(int blinkId)
     return _navWindow->removeBlink(blinkId);
 }
 
+void FMPHomePrivate::notification(const QString &msg, const QString &title,
+                             QSystemTrayIcon::MessageIcon icon, int mecs)
+{
+    _navWindow->showMessage(title, msg, icon, mecs);
+}
+
 void FMPHomePrivate::onPluginActived(FMPBaseInterface *plugin)
 {
     if(plugin != nullptr) {
@@ -132,11 +138,9 @@ void FMPHomePrivate::onMenuBtnClicked(QString btnName)
         e->StartService();
     } else if(btnName == "vip") {
         FMPVipInterface *e = q->GetService<FMPVipInterface>(q->_ctx);
-        if(e->StartService() == FMP_SUCCESS) {
-            _navWindow->showMessage(QString::fromLocal8Bit("[非码会员]已启动"));
-        }
-    } else if(btnName == "takeaway") {
-//        FMPTakeawayInterface *e = q->GetService<FMPTakeawayInterface>(q->_ctx);
+        e->StartService();
+    } else if(btnName == "takeout") {
+//        FMPTakeoutInterface *e = q->GetService<FMPTakeoutInterface>(q->_ctx);
 //        e->StartService();
     } else if(btnName == "coupons") {
 //        FMPVipInterface *e = q->GetService<FMPVipInterface>(q->_ctx);

fmp_home_p.h

 #ifndef FMP_HOME_P_H
 #define FMP_HOME_P_H
 
+#include <QSystemTrayIcon>
+
 #include "fmp_home.h"
 
 class NavWindow;
@@ -23,6 +25,9 @@ public:
     int             blink(FMPluginInterface *plugin, const QString &image);
     bool            stopBlink(int blinkId);
 
+    void            notification(const QString &msg, const QString &title = QString::fromLocal8Bit(FMP_APPNAME),
+                                 QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information, int mecs = 1000);
+
 public slots:
     void            onMenuBtnClicked(QString btnName);
     void            onPluginActived(FMPBaseInterface* plugin);