1. 修复按Alt+F4关闭窗口后卡死问题。 2. 按Ecs可关闭窗口。

fmp_epay_p.h

@@ -4,7 +4,9 @@
 #include "fmp_epay.h"
 #include <QObject>
 #include <QFuture>
+#include <QFutureWatcher>
 #include <QJsonObject>
+#include <QEventLoop>
 
 class FMPPayDialog;
 class FMPSettingsInterface;
@@ -59,7 +61,6 @@ private:
     void                clearorder();
 signals:
     void                apiError();
-    void                apiFinish();
     void                error(QString errormsg);
 
     void                finished(QJsonObject json);
@@ -74,8 +75,6 @@ public:
 
     FMPSettingsInterface *_setting;
 
-    FMPNetworkInterface *_network;
-
 private:
     QJsonObject         _origin_request;
     QJsonObject         _docked_request;
@@ -83,6 +82,7 @@ private:
     QJsonObject         _docked_response;
 
     bool                _is_api;
+    bool                _api_abort;
     bool                _reverse_flag;
 
     static unsigned int s_ClientReqCount;

fmp_epayview_dialog.cpp

@@ -92,7 +92,6 @@ FMPPayDialog::FMPPayDialog(FMPePayPrivate *control, QVariantHash basicinfo, QWid
     connect(_control, &FMPePayPrivate::error, this, &FMPPayDialog::showErrorMsg);
     connect(_control, &FMPePayPrivate::finished, this, &FMPPayDialog::showSuccessMsg);
 
-
     ui->lineedit_num->setFocus();
     _current_LineEdit = ui->lineedit_num;
 
@@ -314,7 +313,7 @@ void FMPPayDialog::onSelectionChanged(QModelIndex idx)
 
 void FMPPayDialog::keyPressEvent(QKeyEvent *e)
 {
-
+    return QDialog::keyPressEvent(e);
 }
 
 void FMPPayDialog::mousePressEvent(QMouseEvent *event)
@@ -570,6 +569,7 @@ void FMPPayDialog::onBtnConfirmClicked()
     {
         _wait = new FMPPayWait(this);
         _wait->setModal(true);
+        _wait->setFocus();
     }
 
 
@@ -587,6 +587,7 @@ void FMPPayDialog::onBtnConfirmClicked()
         ui->lineedit_code_refund->clear();
         _wait->SetContent(FMPPayWait::ERRORS, QString::fromLocal8Bit("金额或条码错误\n请重新输入"));
         _wait->show();
+        _current_LineEdit->setFocus();
         return;
     }
 
@@ -607,6 +608,7 @@ void FMPPayDialog::onBtnConfirmClicked()
     }
 
     _wait->show();
+    _current_LineEdit->setFocus();
 }
 
 
@@ -622,6 +624,10 @@ void FMPPayDialog::on_btn_clear_clicked()
     }
 }
 
+void FMPPayDialog::reject()
+{
+    on_btn_close_clicked();
+}
 
 void FMPPayDialog::on_btn_close_clicked()
 {

fmp_epayview_dialog.h

@@ -50,6 +50,7 @@ public slots:
     void setBasicInfo(QVariantHash basicinfo);
 
 protected:
+
     void keyPressEvent(QKeyEvent *);
 
     void mousePressEvent(QMouseEvent *);
@@ -83,6 +84,7 @@ private slots:
 
     void on_lineEdit_textChanged(const QString &arg1);
 
+    void reject();
 public:
     void setPayView();
 

fmp_epayview_dialog.ui

@@ -2841,9 +2841,9 @@ QHeaderView::section {
              </layout>
             </widget>
             <zorder>wdg_success_main</zorder>
-            <zorder>wdg_pay_main</zorder>
             <zorder>wdg_refund_main</zorder>
             <zorder>wdg_query_main</zorder>
+            <zorder>wdg_pay_main</zorder>
            </widget>
           </item>
           <item>

fmp_epayview_wait.cpp

@@ -13,7 +13,7 @@ FMPPayWait::FMPPayWait(QWidget *parent) : QDialog(parent), ui(new Ui::FMPPayWait
     ui->widget->setWindowOpacity(1);
     setGeometry(parent->geometry());
     this->move(parent->pos());
-    setWindowFlags(Qt::FramelessWindowHint| Qt::Tool );
+    setWindowFlags(windowFlags() | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
 
     connect(ui->btn_confirm, &QPushButton::clicked, this, &FMPPayWait::accept);