Commit 6456ea36 by guanghui.cui

代码合并及异步处理

parent 68b29731
#include "fmp_cashconfirm_dialog.h"
#include "ui_fmp_cashconfirm_dialog.h"
FMPCashConfirmDialog::FMPCashConfirmDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::FMPCashConfirmDialog)
{
ui->setupUi(this);
setWindowFlags(Qt::FramelessWindowHint | windowFlags());
this->setAttribute(Qt::WA_DeleteOnClose);
connect(ui->pushButton_cancel, SIGNAL(clicked()), parent, SLOT(on_cash_cancel()));
connect(ui->pushButton_ok, SIGNAL(clicked()), parent, SLOT(on_cash_pay()));
}
FMPCashConfirmDialog::~FMPCashConfirmDialog()
{
delete ui;
}
void FMPCashConfirmDialog::on_pushButton_cancel_clicked()
{
this->close();
}
void FMPCashConfirmDialog::SetContent(const QString& money)
{
ui->label_money->setText(QString("%1").arg(money));
}
#ifndef FMP_CASHCONFIRM_DIALOG_H
#define FMP_CASHCONFIRM_DIALOG_H
#include <QDialog>
namespace Ui {
class FMPCashConfirmDialog;
}
class FMPCashConfirmDialog : public QDialog
{
Q_OBJECT
public:
explicit FMPCashConfirmDialog(QWidget *parent = 0);
~FMPCashConfirmDialog();
void SetContent(const QString& money);
private slots:
void on_pushButton_cancel_clicked();
private:
Ui::FMPCashConfirmDialog *ui;
};
#endif // FMP_CASHCONFIRM_DIALOG_H
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>FMPCashConfirmDialog</class>
<widget class="QDialog" name="FMPCashConfirmDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>251</width>
<height>205</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<property name="styleSheet">
<string notr="true">QWidget {
color: rgb(100, 100, 100);
font: normal 22px &quot;微软雅黑&quot;;
}
#FMPCashConfirmDialog
{
background-color: rgb(255, 255, 255);
}</string>
</property>
<widget class="QLabel" name="label_warn">
<property name="geometry">
<rect>
<x>30</x>
<y>20</y>
<width>181</width>
<height>31</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">font: normal 22px &quot;Microsoft YaHei&quot;;</string>
</property>
<property name="text">
<string>请确认已收现金:</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="QLabel" name="label_money">
<property name="geometry">
<rect>
<x>80</x>
<y>70</y>
<width>81</width>
<height>30</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">font: bold 24px &quot;Microsoft YaHei&quot;;
color: red;</string>
</property>
<property name="text">
<string>123</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="QPushButton" name="pushButton_cancel">
<property name="geometry">
<rect>
<x>150</x>
<y>120</y>
<width>75</width>
<height>41</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">#pushButton_cancel
{
font: normal 22px &quot;微软雅黑&quot;;
border-radius: 8px;
background-color: rgb(93, 144, 236);
color: rgb(255, 255, 255);
}</string>
</property>
<property name="text">
<string>取消</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_ok">
<property name="geometry">
<rect>
<x>20</x>
<y>120</y>
<width>75</width>
<height>41</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">#pushButton_ok
{
font: normal 22px &quot;微软雅黑&quot;;
border-radius: 8px;
background-color: rgb(93, 144, 236);
color: rgb(255, 255, 255);
}</string>
</property>
<property name="text">
<string>确定</string>
</property>
</widget>
</widget>
<resources/>
<connections/>
</ui>
...@@ -19,7 +19,10 @@ SOURCES += \ ...@@ -19,7 +19,10 @@ SOURCES += \
fmp_epayview_wait.cpp \ fmp_epayview_wait.cpp \
fmp_database.cpp \ fmp_database.cpp \
fmp_pe_handlers.cpp \ fmp_pe_handlers.cpp \
fmnumpad.cpp fmnumpad.cpp \
fmp_cashconfirm_dialog.cpp \
fmp_forceclose_dialog.cpp \
fmp_payfailed_dialog.cpp
HEADERS +=\ HEADERS +=\
fmp_epay.h \ fmp_epay.h \
...@@ -33,7 +36,10 @@ HEADERS +=\ ...@@ -33,7 +36,10 @@ HEADERS +=\
fmp_database.h \ fmp_database.h \
fmp_epay_checkmodel.h \ fmp_epay_checkmodel.h \
fmp_pe_handlers.h \ fmp_pe_handlers.h \
fmnumpad.h fmnumpad.h \
fmp_cashconfirm_dialog.h \
fmp_forceclose_dialog.h \
fmp_payfailed_dialog.h
unix { unix {
target.path = /usr/lib target.path = /usr/lib
...@@ -81,4 +87,7 @@ else { ...@@ -81,4 +87,7 @@ else {
FORMS += \ FORMS += \
fmp_epayview_dialog.ui \ fmp_epayview_dialog.ui \
fmp_epayview_wait.ui \ fmp_epayview_wait.ui \
fmnumpad.ui fmnumpad.ui \
fmp_cashconfirm_dialog.ui \
fmp_forceclose_dialog.ui \
fmp_payfailed_dialog.ui
...@@ -75,15 +75,15 @@ void FMPePayPrivate::Uninit() ...@@ -75,15 +75,15 @@ void FMPePayPrivate::Uninit()
QJsonDocument d = QJsonDocument::fromJson(json, &err); QJsonDocument d = QJsonDocument::fromJson(json, &err);
_origin_response = d.object(); _origin_response = d.object();
emit apiError(); emit apiError();
QEventLoop evt; // QEventLoop evt;
connect(this, SIGNAL(apiFinish()), &evt, SLOT(quit())); // connect(this, SIGNAL(apiFinish()), &evt, SLOT(quit()));
evt.exec(); // evt.exec();
} }
else if (_is_api) { else if (_is_api) {
emit apiError(); emit apiError();
QEventLoop evt; // QEventLoop evt;
connect(this, SIGNAL(apiFinish()), &evt, SLOT(quit())); // connect(this, SIGNAL(apiFinish()), &evt, SLOT(quit()));
evt.exec(); // evt.exec();
} }
Q_Q(FMPePay); Q_Q(FMPePay);
...@@ -271,6 +271,7 @@ QByteArray FMPePayPrivate::DockPayRespond() ...@@ -271,6 +271,7 @@ QByteArray FMPePayPrivate::DockPayRespond()
_docked_response = QJsonObject(); _docked_response = QJsonObject();
_docked_response[FMP_EPAY_STATUSCODE] = _origin_response[FMP_EPAY_STATUSCODE]; _docked_response[FMP_EPAY_STATUSCODE] = _origin_response[FMP_EPAY_STATUSCODE];
_docked_response[FMP_EPAY_ERRORMSG] = _origin_response.contains("msg") ? _origin_response[FMP_EPAY_ERRORMSG] : QJsonValue(""); _docked_response[FMP_EPAY_ERRORMSG] = _origin_response.contains("msg") ? _origin_response[FMP_EPAY_ERRORMSG] : QJsonValue("");
_docked_response[FMP_EPAY_TRANSID] = _origin_request.contains(FMP_EPAY_TRANSID)?_origin_request[FMP_EPAY_TRANSID] : QJsonValue("");
_docked_response["prompt"] = 0; _docked_response["prompt"] = 0;
if (_origin_response["statusCode"].toInt() == 100) { if (_origin_response["statusCode"].toInt() == 100) {
_docked_response["fm_transId"] = _origin_response["pay_transId"]; _docked_response["fm_transId"] = _origin_response["pay_transId"];
...@@ -372,6 +373,10 @@ void FMPePayPrivate::ControlPayJson(QString sum, QString code) ...@@ -372,6 +373,10 @@ void FMPePayPrivate::ControlPayJson(QString sum, QString code)
_origin_response = outjson; _origin_response = outjson;
} }
emit finished(outjson); emit finished(outjson);
// if(_is_api){
// //返回支付结果json
// SendToMonitor(QJsonDocument(outjson).toJson());
// }
} }
}); });
} }
...@@ -667,6 +672,7 @@ bool FMPePayPrivate::GetPayJson(const QString& sum, const QString& code) ...@@ -667,6 +672,7 @@ bool FMPePayPrivate::GetPayJson(const QString& sum, const QString& code)
_docked_request.insert( FMP_EPAY_VER, ver); _docked_request.insert( FMP_EPAY_VER, ver);
_docked_request.insert( FMP_EPAY_REQUESTTYPE, 72); _docked_request.insert( FMP_EPAY_REQUESTTYPE, 72);
_docked_request.insert( FMP_EPAY_PARTNERID, q->_partner_id.toInt()); _docked_request.insert( FMP_EPAY_PARTNERID, q->_partner_id.toInt());
_docked_request.insert( FMP_EPAY_CLIENTREQCOUNT, (int)((++s_ClientReqCount)%=10000000)); _docked_request.insert( FMP_EPAY_CLIENTREQCOUNT, (int)((++s_ClientReqCount)%=10000000));
...@@ -739,3 +745,20 @@ void FMPePayPrivate::GetReverseJson() ...@@ -739,3 +745,20 @@ void FMPePayPrivate::GetReverseJson()
{ {
_docked_request[FMP_EPAY_REQUESTTYPE] = 3; _docked_request[FMP_EPAY_REQUESTTYPE] = 3;
} }
void FMPePayPrivate::ClosePayWindow(int type)
{
Q_Q(FMPePay);
//返回支付结果json;发送给socket
//状态码:101 现金支付
//状态码:102 socket异常关闭(这个在监控端处理)
//状态码:103 程序强制关闭
if(type==DIALOG_CASH_CLOSE){
_origin_response[FMP_EPAY_STATUSCODE]=101;
_origin_response[FMP_EPAY_ERRORMSG]="非码转现金支付";
}
else if(type==DIALOG_FORCE_CLOSE){
_origin_response[FMP_EPAY_STATUSCODE]=103;
_origin_response[FMP_EPAY_ERRORMSG]="程序强制关闭";
}
}
...@@ -33,6 +33,7 @@ public: ...@@ -33,6 +33,7 @@ public:
void GetMode(); void GetMode();
void ClosePayWindow(int type);
QSqlTableModel *model() const; QSqlTableModel *model() const;
void DockPayRequest(const QByteArray &json); void DockPayRequest(const QByteArray &json);
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "fmp_epay_p.h" #include "fmp_epay_p.h"
#include "fmp_epay_checkmodel.h" #include "fmp_epay_checkmodel.h"
#include "fmp_epay_plugin_p.h" #include "fmp_epay_plugin_p.h"
#include "fmp_forceclose_dialog.h"
#include <QDebug> #include <QDebug>
#include <fmp_settings_i.h> #include <fmp_settings_i.h>
...@@ -172,8 +173,13 @@ FMPPayDialog::FMPPayDialog(FMPePayPrivate *control, QVariantHash basicinfo, QWid ...@@ -172,8 +173,13 @@ FMPPayDialog::FMPPayDialog(FMPePayPrivate *control, QVariantHash basicinfo, QWid
void FMPPayDialog::show() void FMPPayDialog::show()
{ {
_api_force_close=false;
showNormal(); showNormal();
HWND hForeWnd = ::GetForegroundWindow();
DWORD dwForeID = ::GetWindowThreadProcessId(hForeWnd,NULL);
DWORD dwCurID = ::GetCurrentThreadId();
::AttachThreadInput(dwCurID,dwForeID,TRUE);
::SetForegroundWindow((HWND)effectiveWinId()); ::SetForegroundWindow((HWND)effectiveWinId());
::SetWindowPos( (HWND)effectiveWinId(), HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); ::SetWindowPos( (HWND)effectiveWinId(), HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
...@@ -181,7 +187,7 @@ void FMPPayDialog::show() ...@@ -181,7 +187,7 @@ void FMPPayDialog::show()
showNormal(); showNormal();
::SetForegroundWindow((HWND)effectiveWinId()); ::SetForegroundWindow((HWND)effectiveWinId());
::AttachThreadInput(dwCurID,dwForeID,FALSE);
QDesktopWidget w; QDesktopWidget w;
QRect rc = w.availableGeometry(); QRect rc = w.availableGeometry();
setGeometry((rc.width() - width()) / 2, (rc.height() - height()) / 2, width(), height()); setGeometry((rc.width() - width()) / 2, (rc.height() - height()) / 2, width(), height());
...@@ -258,10 +264,22 @@ void FMPPayDialog::showErrorMsg(QString errormsg) ...@@ -258,10 +264,22 @@ void FMPPayDialog::showErrorMsg(QString errormsg)
if(errormsg == "") if(errormsg == "")
errormsg = QString(""); errormsg = QString("");
_wait->SetContent(FMPPayWait::ERRORS, errormsg); if(_is_api){
if(_wait)
_wait->hide();
FMPPayFailedDialog *_pay_failed=new FMPPayFailedDialog(this);
_pay_failed->setModal(true);
_pay_failed->show();
_pay_failed->SetContent(errormsg,ui->lineedit_num->text());
}
else{
_wait->SetContent(FMPPayWait::ERRORS, errormsg);
if(_wait->isHidden())
_wait->show();
}
if(_wait->isHidden())
_wait->show();
} }
void FMPPayDialog::showSuccessMsg(QJsonObject json) void FMPPayDialog::showSuccessMsg(QJsonObject json)
...@@ -625,8 +643,17 @@ void FMPPayDialog::on_btn_clear_clicked() ...@@ -625,8 +643,17 @@ void FMPPayDialog::on_btn_clear_clicked()
void FMPPayDialog::on_btn_close_clicked() void FMPPayDialog::on_btn_close_clicked()
{ {
this->hide(); if(_success_flag){
_control->Uninit(); this->close();
_control->Uninit();
}
else{
if(_is_api&&!_success_flag){
fmp_forceClose_dialog *_force_close=new fmp_forceClose_dialog(this);
_force_close->setModal(true);
_force_close->show();
}
}
} }
void FMPPayDialog::onLineeditCodeGetFocus() void FMPPayDialog::onLineeditCodeGetFocus()
...@@ -657,6 +684,7 @@ void FMPPayDialog::on_btn_success_confirm_clicked() ...@@ -657,6 +684,7 @@ void FMPPayDialog::on_btn_success_confirm_clicked()
if(_curt_btn->property("index").toInt() == 0) if(_curt_btn->property("index").toInt() == 0)
setPayView(); setPayView();
if(_curt_btn->property("index").toInt() == 1) if(_curt_btn->property("index").toInt() == 1)
setRefundView(); setRefundView();
...@@ -715,3 +743,24 @@ void FMPPayDialog::on_lineEdit_textChanged(const QString &arg1) ...@@ -715,3 +743,24 @@ void FMPPayDialog::on_lineEdit_textChanged(const QString &arg1)
_control->GetCheckMode(arg1); _control->GetCheckMode(arg1);
ui->pushButton_2->setEnabled(false); ui->pushButton_2->setEnabled(false);
} }
void FMPPayDialog::on_cash_pay()
{
_api_force_close=true;
_control->ClosePayWindow(DIALOG_CASH_CLOSE);
this->close();
_control->Uninit();
}
void FMPPayDialog::on_force_close()
{
_api_force_close=true;
_control->ClosePayWindow(DIALOG_FORCE_CLOSE);
this->close();
_control->Uninit();
}
void FMPPayDialog::closeEvent(QCloseEvent * event)
{
if(_is_api&&!_api_force_close)
event->ignore();
else
QDialog::closeEvent(event);
}
...@@ -13,6 +13,10 @@ ...@@ -13,6 +13,10 @@
#include <QLineEdit> #include <QLineEdit>
#include "fmp_epayview_wait.h" #include "fmp_epayview_wait.h"
#include "fmp_epayview_focuslineedit.h" #include "fmp_epayview_focuslineedit.h"
#include "fmp_payfailed_dialog.h"
#define DIALOG_FORCE_CLOSE 1 //窗口强制关闭
#define DIALOG_CASH_CLOSE 2 //转现金支付
class FMPePayPrivate; class FMPePayPrivate;
class FMPLoggerInterface; class FMPLoggerInterface;
...@@ -49,6 +53,8 @@ public slots: ...@@ -49,6 +53,8 @@ public slots:
void setBasicInfo(QVariantHash basicinfo); void setBasicInfo(QVariantHash basicinfo);
void on_cash_pay();
void on_force_close();
protected: protected:
void keyPressEvent(QKeyEvent *); void keyPressEvent(QKeyEvent *);
...@@ -103,6 +109,8 @@ private: ...@@ -103,6 +109,8 @@ private:
//----------- //-----------
void PlayAnimation(QWidget* target0, QWidget* target1, Movemode movemode); void PlayAnimation(QWidget* target0, QWidget* target1, Movemode movemode);
void closeEvent(QCloseEvent * event);
private: private:
Ui::FMPPayDialog *ui; Ui::FMPPayDialog *ui;
...@@ -120,6 +128,7 @@ private: ...@@ -120,6 +128,7 @@ private:
bool _needanimation; bool _needanimation;
bool _b_mouse_pressed; bool _b_mouse_pressed;
bool _is_api; bool _is_api;
bool _api_force_close;
QPoint _mMovePosition; QPoint _mMovePosition;
}; };
......
#include "fmp_forceclose_dialog.h"
#include "ui_fmp_forceclose_dialog.h"
fmp_forceClose_dialog::fmp_forceClose_dialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::fmp_forceClose_dialog)
{
ui->setupUi(this);
setWindowFlags(Qt::FramelessWindowHint | windowFlags());
this->setAttribute(Qt::WA_DeleteOnClose);
connect(ui->pushButton_ok, SIGNAL(clicked()), parent, SLOT(on_force_close()));
}
fmp_forceClose_dialog::~fmp_forceClose_dialog()
{
delete ui;
}
void fmp_forceClose_dialog::on_pushButton_ok_clicked()
{
this->close();
}
void fmp_forceClose_dialog::on_pushButton_cancel_clicked()
{
this->close();
}
#ifndef FMP_FORCECLOSE_DIALOG_H
#define FMP_FORCECLOSE_DIALOG_H
#include <QDialog>
namespace Ui {
class fmp_forceClose_dialog;
}
class fmp_forceClose_dialog : public QDialog
{
Q_OBJECT
public:
explicit fmp_forceClose_dialog(QWidget *parent = 0);
~fmp_forceClose_dialog();
private slots:
void on_pushButton_ok_clicked();
void on_pushButton_cancel_clicked();
private:
Ui::fmp_forceClose_dialog *ui;
};
#endif // FMP_FORCECLOSE_DIALOG_H
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>fmp_forceClose_dialog</class>
<widget class="QDialog" name="fmp_forceClose_dialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>212</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<property name="styleSheet">
<string notr="true">QWidget {
color: rgb(100, 100, 100);
font: normal 22px &quot;微软雅黑&quot;;
}
#fmp_forceClose_dialog
{
background-color: rgb(255, 255, 255);
}</string>
</property>
<widget class="QLabel" name="label_warn">
<property name="geometry">
<rect>
<x>40</x>
<y>40</y>
<width>321</width>
<height>31</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>收银尚未完成,确定要关闭吗?</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_ok">
<property name="geometry">
<rect>
<x>60</x>
<y>110</y>
<width>91</width>
<height>41</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">#pushButton_ok
{
font: normal 22px &quot;微软雅黑&quot;;
border-radius: 8px;
background-color: rgb(93, 144, 236);
color: rgb(255, 255, 255);
}</string>
</property>
<property name="text">
<string>确定</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_cancel">
<property name="geometry">
<rect>
<x>220</x>
<y>110</y>
<width>91</width>
<height>41</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">#pushButton_cancel
{
font: normal 22px &quot;微软雅黑&quot;;
border-radius: 8px;
background-color: rgb(93, 144, 236);
color: rgb(255, 255, 255);
}</string>
</property>
<property name="text">
<string>取消</string>
</property>
</widget>
</widget>
<resources/>
<connections/>
</ui>
#include "fmp_payfailed_dialog.h"
#include "ui_fmp_payfailed_dialog.h"
FMPPayFailedDialog::FMPPayFailedDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::FMPPayFailedDialog)
{
ui->setupUi(this);
setWindowFlags(Qt::FramelessWindowHint | windowFlags());
this->setAttribute(Qt::WA_DeleteOnClose);
connect(this, SIGNAL(cash_pay()), parent, SLOT(on_cash_pay()));
}
FMPPayFailedDialog::~FMPPayFailedDialog()
{
delete ui;
}
void FMPPayFailedDialog::on_pushButton_retry_clicked()
{
close();
}
void FMPPayFailedDialog::on_pushButton_cash_clicked()
{
FMPCashConfirmDialog *_CashConfirm=new FMPCashConfirmDialog(this);
_CashConfirm->setModal(true);
_CashConfirm->show();
_CashConfirm->SetContent(_money);
}
void FMPPayFailedDialog::on_cash_cancel()
{
this->close();
}
void FMPPayFailedDialog::on_cash_pay()
{
emit cash_pay();
}
void FMPPayFailedDialog::SetContent(const QString& msg,const QString& money)
{
_money=money;
ui->label_warn->setText(QString("本次支付没有成功[%1]").arg(msg));
}
#ifndef FMP_PAYFAILED_DIALOG_H
#define FMP_PAYFAILED_DIALOG_H
#include <QDialog>
#include "fmp_cashconfirm_dialog.h"
namespace Ui {
class FMPPayFailedDialog;
}
class FMPPayFailedDialog : public QDialog
{
Q_OBJECT
public:
explicit FMPPayFailedDialog(QWidget *parent = 0);
~FMPPayFailedDialog();
void SetContent(const QString& msg,const QString& money);
public slots:
void on_cash_cancel();
void on_cash_pay();
private slots:
void on_pushButton_retry_clicked();
void on_pushButton_cash_clicked();
signals:
void cash_pay();
private:
QString _money;
private:
Ui::FMPPayFailedDialog *ui;
};
#endif // FMP_PAYFAILED_DIALOG_H
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>FMPPayFailedDialog</class>
<widget class="QDialog" name="FMPPayFailedDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>431</width>
<height>198</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<property name="styleSheet">
<string notr="true">#FMPPayFailedDialog
{
background-color: rgb(255, 255, 255);
}</string>
</property>
<widget class="QPushButton" name="pushButton_cash">
<property name="geometry">
<rect>
<x>250</x>
<y>120</y>
<width>121</width>
<height>51</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">#pushButton_cash
{
font: normal 22px &quot;微软雅黑&quot;;
border-radius: 8px;
background-color: rgb(93, 144, 236);
color: rgb(255, 255, 255);
}</string>
</property>
<property name="text">
<string>现金埋单</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_retry">
<property name="geometry">
<rect>
<x>50</x>
<y>120</y>
<width>121</width>
<height>51</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">#pushButton_retry
{
font: normal 22px &quot;微软雅黑&quot;;
border-radius: 8px;
background-color: rgb(93, 144, 236);
color: rgb(255, 255, 255);
}</string>
</property>
<property name="text">
<string>重新扫码</string>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="label_warn">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>401</width>
<height>61</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(100, 100, 100);
font: 22px &quot;微软雅黑&quot;;
</string>
</property>
<property name="text">
<string>本次支付没有成功(错误:%1)</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>10</x>
<y>80</y>
<width>401</width>
<height>31</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(100, 100, 100);
font: 22px &quot;微软雅黑&quot;;</string>
</property>
<property name="text">
<string>请重新扫码</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</widget>
<resources/>
<connections/>
</ui>
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define VER_MINOR 1 #define VER_MINOR 1
#define VER_REVISION 0 #define VER_REVISION 0
#define VER_BUILD 12 #define VER_BUILD 13
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment