Commit 4194dcc7 by NitefullWind

1. 修复重复扫码报错Bug。 2. 修复单元测试程序中网络响应处异常崩溃Bug。

parent dea23c24
...@@ -290,19 +290,16 @@ bool Control::HttpPost(QString url, QByteArray &outdata, const QByteArray &indat ...@@ -290,19 +290,16 @@ bool Control::HttpPost(QString url, QByteArray &outdata, const QByteArray &indat
QLOG_INFO() << "HttpPost url: " << url << " content: " << content << " accept: " << accept << " timeout: " << timeout; QLOG_INFO() << "HttpPost url: " << url << " content: " << content << " accept: " << accept << " timeout: " << timeout;
QNetworkReply* reply = manger.post(request, indata); QSharedPointer<QNetworkReply> reply = QSharedPointer<QNetworkReply>(manger.post(request, indata));
connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit); connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
connect(&manger, &QNetworkAccessManager::finished, &loop, &QEventLoop::quit); connect(&manger, &QNetworkAccessManager::finished, &loop, &QEventLoop::quit);
connect(_widget, &HostWidget::Interrupt, &loop, &QEventLoop::quit); connect(_widget, &HostWidget::Interrupt, &loop, &QEventLoop::quit);
connect(reply, static_cast<void (QNetworkReply::*)(QNetworkReply::NetworkError)>(&QNetworkReply::error), &loop, &QEventLoop::quit); connect(reply.data(), static_cast<void (QNetworkReply::*)(QNetworkReply::NetworkError)>(&QNetworkReply::error), &loop, &QEventLoop::quit);
timer.start(timeout*1000); timer.start(timeout*1000);
loop.exec(); loop.exec();
reply->deleteLater();
#ifdef FM_TEST #ifdef FM_TEST
QEventLoop test_loop; QEventLoop test_loop;
QTimer test_timer; QTimer test_timer;
......
...@@ -390,6 +390,7 @@ void HostWidget::ShowWithRequest(POSType posType, QJsonObject requestObj) ...@@ -390,6 +390,7 @@ void HostWidget::ShowWithRequest(POSType posType, QJsonObject requestObj)
} else { } else {
ui->btn_pay_exit->hide(); ui->btn_pay_exit->hide();
ui->label_pay_money->hide(); ui->label_pay_money->hide();
_runing = true; // 避免多次扫码
_label_pay_timer->start(60, QString::fromLocal8Bit("%1 秒")); _label_pay_timer->start(60, QString::fromLocal8Bit("%1 秒"));
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define VER_MINOR 2 #define VER_MINOR 2
#define VER_REVISION 5 #define VER_REVISION 5
#define VER_BUILD 0 #define VER_BUILD 1
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
......
...@@ -219,7 +219,7 @@ void TestSimphony::test_POSRequest_data() ...@@ -219,7 +219,7 @@ void TestSimphony::test_POSRequest_data()
"\"stationId\": \"1\", " "\"stationId\": \"1\", "
"\"storeId\": \"1713\", " "\"storeId\": \"1713\", "
"\"transAmount\": %3, " "\"transAmount\": %3, "
"\"transId\": 301439 " "\"transId\": 301439, "
"\"code\": \"12312\" " "\"code\": \"12312\" "
"}") "}")
.arg(QDate::currentDate().toString("yyyyMMdd")) .arg(QDate::currentDate().toString("yyyyMMdd"))
......
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