1. 实现登录功能。 2. 修复菜单按钮展开时的小bug.

fmp_home/fmnetwork.cpp

@@ -20,12 +20,12 @@ FMNetwork::~FMNetwork()
     delete _req;
 }
 
-bool FMNetwork::post(const QString *url, const QByteArray *reqData, QByteArray *rspData)
+bool FMNetwork::post(const QString &url, const QByteArray *reqData, QByteArray *rspData)
 {
-    qDebug() << "Post Url: " << *url;
+    qDebug() << "Post Url: " << url;
     qDebug() << "Post Data: " << *reqData;
 
-    _req->setUrl(*url);
+    _req->setUrl(url);
 
     // 设置请求头
     _req->setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
@@ -47,7 +47,7 @@ bool FMNetwork::post(const QString *url, const QByteArray *reqData, QByteArray *
         timer.stop();
         if (reply->error() == QNetworkReply::NoError) {
             *rspData = reply->readAll();
-            qDebug() << tr("Recv data: %1") << *rspData;
+            qDebug() << tr("Recv data: ") << QString::fromUtf8(*rspData);
         } else {
             _errorString = reply->errorString();
             qDebug() << tr("Network error: %1").arg(_errorString);

fmp_home/fmnetwork.h

@@ -20,7 +20,7 @@ public:
      * @param rspData   返回数据
      * @return          是否有错误
      */
-    bool        post(const QString *url, const QByteArray *reqData, QByteArray *rspData);
+    bool        post(const QString &url, const QByteArray *reqData, QByteArray *rspData);
 
     QString     errorString() const { return _errorString;}
 private:

fmp_home/fmp_home.cpp

@@ -29,3 +29,21 @@ int FMPHome::Uninit()
     Q_D(FMPHome);
     return d->Uninit();
 }
+
+int FMPHome::login()
+{
+    Q_D(FMPHome);
+    return d->login();
+}
+
+bool FMPHome::isLogined()
+{
+    Q_D(FMPHome);
+    return d->_isLogined;
+}
+
+QString FMPHome::userName()
+{
+    Q_D(FMPHome);
+    return d->_userName;
+}

fmp_home/fmp_home.h

@@ -21,12 +21,13 @@ public:
     int                 Uninit();
     int                 Upgrade() {return 0;}
     int                 Downgrade() {return 0;}
+
+    int                 login();
+    bool                isLogined();
+    QString             userName();
 public slots:
     void                OnUpgraded() {}
 
-public:
-    int                 Login() {return 0;}
-
 private:
     FMPHomePrivate      *d_ptr;
     bool                 _inited;

fmp_home/fmp_home_i.h

@@ -2,11 +2,14 @@
 #define FMP_HOME_I_H
 
 #include <fmp_base_i.h>
+#include <QString>
 
 class FMPHomeInterface : public FMPluginInterface
 {
 public:
-    virtual int Login() = 0;
+    virtual int login() = 0;
+    virtual bool isLogined() = 0;
+    virtual QString userName() = 0;
 };
 
 Q_DECLARE_INTERFACE(FMPHomeInterface, "fmp.home")

fmp_home/fmp_home_navwindow.cpp

@@ -21,6 +21,7 @@ NavWindow::NavWindow(QWidget *parent) :
     MenuUiProp.distance = 100;
     MenuUiProp.beginAngle = -(PI*0.45);
     MenuUiProp.endAngle = (PI*0.45);
+    isUseAnimation = true;
 
     setNavStatus(Default);
 
@@ -29,6 +30,11 @@ NavWindow::NavWindow(QWidget *parent) :
 
     connect(_btn_group, SIGNAL(buttonClicked(QAbstractButton*)), this, SLOT(onMenuBtnClicked(QAbstractButton*)));
     initMenu();
+
+    connect(this, SIGNAL(statusChanged(NavStatus)), this, SLOT(onStatusChanged(NavStatus)));
+    connect(_animationShow, &QParallelAnimationGroup::finished, this, [=](){
+        ui->navMainBtn->lower();
+    });
 }
 
 NavWindow::~NavWindow()
@@ -41,22 +47,7 @@ NavWindow::~NavWindow()
 void NavWindow::setNavStatus(const NavStatus status)
 {
     this->_status = status;
-    switch (status) {
-    case Default:
-        spreadMenus(false);
-        ui->navMainBtn->setStyleSheet("#navMainBtn{ border-image: url(:fm-icon_01)}");
-        break;
-    case Spread:
-        spreadMenus(true);
-        ui->navMainBtn->setStyleSheet("#navMainBtn{ border-image: url(:fm-icon_02)}");
-        break;
-    case Message:
-        ui->navMainBtn->setStyleSheet("#navMainBtn{ border-image: url(:xiaoxi)}");
-        break;
-    default:
-        ui->navMainBtn->setStyleSheet("#navMainBtn{ border-image: url(:fm-icon_01)}");
-        break;
-    }
+    emit statusChanged(status);
 }
 
 void NavWindow::on_navMainBtn_clicked()
@@ -68,11 +59,14 @@ void NavWindow::on_navMainBtn_clicked()
 
 void NavWindow::spreadMenus(const bool isSpread)
 {
-    if(isSpread) {
+    //! Start animation.
+    if(isSpread && isUseAnimation) {
+        ui->navMainBtn->raise();
         _animationShow->start();
     }
+    //! Set the menu btns are visible.
     foreach (QAbstractButton *b , _btn_group->buttons()) {
-        QPushButton *btn = qobject_cast<QPushButton*>(b);
+        auto btn = qobject_cast<QPushButton*>(b);
         btn->setVisible(isSpread);
     }
 }
@@ -109,7 +103,6 @@ void NavWindow::initMenu()
         animation->setEndValue(btn->geometry());
         _animationShow->addAnimation(animation);
     }
-    ui->navMainBtn->raise();
 }
 
 void NavWindow::onMenuBtnClicked(QAbstractButton *btn)
@@ -117,3 +110,23 @@ void NavWindow::onMenuBtnClicked(QAbstractButton *btn)
     QString btnName = btn->objectName();
     emit menuBtnClicked(btnName);
 }
+
+void NavWindow::onStatusChanged(NavStatus status)
+{
+    switch (status) {
+    case Default:
+        spreadMenus(false);
+        ui->navMainBtn->setStyleSheet("#navMainBtn{ border-image: url(:fm-icon_01)}");
+        break;
+    case Spread:
+        spreadMenus(true);
+        ui->navMainBtn->setStyleSheet("#navMainBtn{ border-image: url(:fm-icon_02)}");
+        break;
+    case Message:
+        ui->navMainBtn->setStyleSheet("#navMainBtn{ border-image: url(:xiaoxi)}");
+        break;
+    default:
+        ui->navMainBtn->setStyleSheet("#navMainBtn{ border-image: url(:fm-icon_01)}");
+        break;
+    }
+}

fmp_home/fmp_home_navwindow.h

@@ -50,10 +50,12 @@ public slots:
 
 signals:
     void menuBtnClicked(QString btnName);
+    void statusChanged(NavStatus status);
 
 private slots:
     void on_navMainBtn_clicked();
     void onMenuBtnClicked(QAbstractButton*);
+    void onStatusChanged(NavStatus status);
 
 private:
     Ui::NavWindow *ui;
@@ -74,6 +76,7 @@ private:
         double endAngle;
     };
     MenuUiProps MenuUiProp;
+    bool isUseAnimation;
 };
 
 #endif // NAVWINDOW_H

fmp_home/fmp_home_p.cpp

@@ -8,7 +8,10 @@
 
 FMPHomePrivate::FMPHomePrivate(FMPHome *q)
     : q_ptr(q),
-      _navWindow(new NavWindow)
+      _navWindow(new NavWindow),
+      _isLogined(false),
+      _userName(""),
+      _errorMsg("")
 {
 }
 
@@ -19,11 +22,7 @@ FMPHomePrivate::~FMPHomePrivate()
 
 int FMPHomePrivate::Init()
 {
-    loginWnd = new FMPLogin;
-    int ret = loginWnd->exec();
-    delete loginWnd;
-    loginWnd = nullptr;
-    if(ret == FMP_FAILURE) {
+    if(login() != FMP_SUCCESS) {
         return FMP_FAILURE;
     }
     _navWindow->show();
@@ -49,6 +48,20 @@ int FMPHomePrivate::Uninit()
     return FMP_SUCCESS;
 }
 
+int FMPHomePrivate::login()
+{
+    FMPLogin loginWnd;
+    loginWnd.exec();
+    if(loginWnd.isLogined()) {
+        _isLogined = true;
+        _userName = loginWnd.userName();
+        return FMP_SUCCESS;
+    } else {
+        _isLogined = false;
+        return FMP_FAILURE;
+    }
+}
+
 void FMPHomePrivate::onMenuBtnClicked(QString btnName)
 {
     qDebug() << "====" << __FUNCTION__ << btnName;

fmp_home/fmp_home_p.h

@@ -16,15 +16,20 @@ public:
     int             Init();
     int             Uninit();
 
+    int             login();
+
 public slots:
     void            onMenuBtnClicked(QString btnName);
 
 public:
     FMPHome         *q_ptr;
 
+    bool            _isLogined;
+    QString         _userName;
+    QString         _errorMsg;
+
 private:
     NavWindow       *_navWindow;
-    FMPLogin        *loginWnd;
 };
 
 #endif // FMP_HOME_P_H

fmp_home/fmp_login.cpp

@@ -2,6 +2,9 @@
 #include "ui_fmp_login.h"
 #include <QMessageBox>
 #include <QDesktopWidget>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonParseError>
 #include "fmp_num_pad.h"
 #include "fmnetwork.h"
 #include <QDebug>
@@ -9,7 +12,9 @@
 FMPLogin::FMPLogin(QDialog *parent) :
     FMPWnd(parent),
     ui(new Ui::FMPLogin),
-    _numPad(new FMNumPad)
+    _numPad(new FMNumPad),
+    _userName(""),
+    _errorMsg("")
 {
     ui->setupUi(this);
     connect(_numPad, SIGNAL(digit_confirm()), this, SLOT(on_login_btn_clicked()));
@@ -28,16 +33,46 @@ FMPLogin::~FMPLogin()
 void FMPLogin::on_login_btn_clicked()
 {
     _numPad->close();
-    QString url = "http://115.159.142.32:30001/api/user/login";
-    QByteArray reqData = "{\"StoreId\": \"123\",\"PartnerId\": \"123\",\"UserId\": \"123\",\"Pwd\": \"123\",\"ClassNo\": \"123\",\"DeviceId\": \"\"}";
+    this->setEnabled(false);
+
+    if(login(ui->user_edit->text(), ui->pwd_edit->text())) {
+        this->close();
+    } else {
+        QMessageBox::critical(this, "Login Failed", _errorMsg);
+        this->setEnabled(true);
+        ui->pwd_edit->clear();
+        ui->pwd_edit->setFocus();
+    }
+}
+
+bool FMPLogin::login(QString userName, QString password)
+{
+    _userName = "";
+    QString url = "http://115.159.226.87:20001/api/user/login";
+    QByteArray reqData = tr("{\"StoreId\": \"%1\",\"PartnerId\": \"%2\",\"UserId\": \"%3\",\"Pwd\": \"%4\"}")
+            .arg("fm99999")
+            .arg("1371")
+            .arg(userName)
+            .arg(password).toLatin1();
     QByteArray rspData;
     FMNetwork net;
-    if(net.post(&url, &reqData, &rspData)) {
-        QMessageBox::information(this, "Login", QString(rspData));
-    } else {
-        QMessageBox::critical(this, "Login", net.errorString());
+    if(net.post(url, &reqData, &rspData)) {
+        // 解析返回的数据
+        QJsonParseError error;
+        QJsonDocument json = QJsonDocument::fromJson(rspData, &error);
+        if(error.error == QJsonParseError::NoError) {
+            QJsonObject job = json.object();
+
+            if(job["Code"] == 1000) {
+                _userName = job["Data"].toObject()["UserId"].toString();
+            } else{
+                _errorMsg = job["Msg"].toString();
+            }
+        } else {
+            _errorMsg = error.errorString();
+        }
     }
-    this->close();
+    return isLogined();
 }
 
 void FMPLogin::on_key_btn_clicked()

fmp_home/fmp_login.h

@@ -17,6 +17,17 @@ public:
     explicit FMPLogin(QDialog *parent = 0);
     ~FMPLogin();
 
+    /**
+     * @brief login
+     * @param userName
+     * @param password
+     * @return
+     */
+    bool            login(QString userName, QString password);
+    bool            isLogined() {return _userName != "";}
+    QString         userName() {return _userName;}
+    QString         errorMsg() {return _errorMsg;}
+
 private slots:
     void on_login_btn_clicked();
 
@@ -28,6 +39,8 @@ private:
     Ui::FMPLogin *ui;
 
     FMNumPad*       _numPad;
+    QString         _userName;
+    QString         _errorMsg;
 };
 
 #endif // FMP_LOGIN_H

fmp_home/fmp_login.ui

@@ -355,7 +355,11 @@ QLineEdit {
   </layout>
  </widget>
  <tabstops>
+  <tabstop>user_edit</tabstop>
+  <tabstop>pwd_edit</tabstop>
   <tabstop>login_btn</tabstop>
+  <tabstop>key_btn</tabstop>
+  <tabstop>key_btn_2</tabstop>
   <tabstop>close_btn</tabstop>
  </tabstops>
  <resources/>