1. 修改流水查询中支付宝名称。 2. 修复倒计时结束后窗口未关闭Bug。 3. 增加delete指针。

sbkpay/hostwidget.cpp

@@ -162,6 +162,18 @@ HostWidget::~HostWidget()
         delete _label_pay_timer;
         _label_pay_timer = NULL;
     }
+    if(_label_wait_timer != NULL) {
+        delete _label_wait_timer;
+        _label_wait_timer = NULL;
+    }
+    if(_label_find_timer != NULL) {
+        delete _label_find_timer;
+        _label_find_timer = NULL;
+    }
+    if(_label_pay_movie  != NULL) {
+        delete _label_pay_movie;
+        _label_pay_movie = NULL;
+    }
 }
 
 void HostWidget::keyPressEvent(QKeyEvent *ke)
@@ -390,7 +402,7 @@ void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error)
 //                    ui->tableWidget->setItem(0, 4, item4);
 //                }
 
-                if(_posType != SPCC && (_currPayStr==QString::fromLocal8Bit("微信支付") || _currPayStr==QString::fromLocal8Bit("支付宝"))) {
+                if(_posType != SPCC && (_currPayStr==QString::fromLocal8Bit("微信支付") || _currPayStr==QString::fromLocal8Bit("支付宝支付"))) {
                     QWidget *pWdg = new QWidget(ui->tableWidget);
                     QHBoxLayout *hLayout = new QHBoxLayout(pWdg);
                     QPushButton * pBtn = new QPushButton(pWdg);
@@ -906,7 +918,7 @@ void HostWidget::SetTableWidgetHeader()
     if(_paymentMethodsMapThird.contains(_currPayStr)) {
         headerString<<QString::fromLocal8Bit("订单编号")<<QString::fromLocal8Bit("订单金额")<<QString::fromLocal8Bit("订单时间")<<QString::fromLocal8Bit("支付状态");
         // 只有微信支付和支付宝支付有操作列，且商户不是SPCC
-        if(_posType != SPCC && (_currPayStr==QString::fromLocal8Bit("支付宝")||_currPayStr==QString::fromLocal8Bit("微信支付"))) {
+        if(_posType != SPCC && (_currPayStr==QString::fromLocal8Bit("支付宝支付")||_currPayStr==QString::fromLocal8Bit("微信支付"))) {
             headerString << QString::fromLocal8Bit("操作");
         }
     } else {

sbkpay/labelstimer.cpp

@@ -33,6 +33,7 @@ void LabelsTimer::start()
     _timer->setInterval(1000);
     _timer->start();
     onTimeout();
+    emit started();
 }
 
 void LabelsTimer::start(int time, QString format)
@@ -46,17 +47,18 @@ void LabelsTimer::stop()
 {
     _tempTime = 0;
     _timer->stop();
+    emit finished();
 }
 
 void LabelsTimer::onTimeout()
 {
-    if(_time <= 1) {
-        _timer->stop();
+    if(_tempTime <= 1) {
+        stop();
         emit timeout();
 //        this->deleteLater();
     } else {
         _label->setText(_format.arg(_tempTime));
-        emit timeChanged(_time);
+        emit timeChanged(_tempTime);
         _tempTime = _tempTime - 1;
     }
 }

sbkpay/labelstimer.h

@@ -22,6 +22,12 @@ public:
 signals:
     void timeout();
     void timeChanged(int time);
+    void started();
+    /**
+     * @brief finished
+     * 调用stop()或定时超时后触发
+     */
+    void finished();
 
 public slots:
 

sbkpay/version.h

@@ -5,7 +5,7 @@
 #define VER_MINOR 2
 #define VER_REVISION 7
 
-#define VER_BUILD 0
+#define VER_BUILD 1
 
 //! Convert version numbers to string
 #define _STR(S)  #S
@@ -20,7 +20,7 @@
 #define  RES_STR_FILE_VER     MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
 #define  RES_STR_PRODUCT_VER  MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
 #define  RES_COMPANY_NAME     "上海非码网络科技有限公司\0"
-#define  RES_COPYRIGHT        "Freemud Ltd. Copyright (C) 2014-2017\0"
+#define  RES_COPYRIGHT        "Freemud Ltd. Copyright (C) 2014-2018\0"
 #define  RES_FILE_DESC        "sbkpay\0"
 #define  RES_INTER_NAME       "sbkpay\0"
 #define  RES_FILE_NAME        "sbkpay\0"