修改核销插件中各个窗口的标题为中文

fmp_redeem/consumokdialog.cpp

-#include "consumokdialog.h"
+#include "consumokdialog.h"
 #include "ui_consumokdialog.h"
 
 ConsumOkDialog::ConsumOkDialog(QWidget * parent, Qt::WindowFlags f) :
@@ -6,6 +6,7 @@ ConsumOkDialog::ConsumOkDialog(QWidget * parent, Qt::WindowFlags f) :
     ui(new Ui::ConsumOkDialog)
 {
     ui->setupUi(this);
+    setWindowTitle(QString::fromLocal8Bit("非码卡券"));
     setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint);
     setAutoFillBackground(false);  //这个不设置的话就背景变黑  
     setAttribute(Qt::WA_TranslucentBackground,true); 

fmp_redeem/consumptiondialog.cpp

-#include "consumptiondialog.h"
+#include "consumptiondialog.h"
 #include "ui_consumptiondialog.h"
 
 
@@ -7,6 +7,7 @@ ConsumptionDialog::ConsumptionDialog(QWidget * parent, Qt::WindowFlags f) :
     ui(new Ui::ConsumptionDialog)
 {
     ui->setupUi(this);
+    setWindowTitle(QString::fromLocal8Bit("非码卡券"));
     setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint);
     setAutoFillBackground(false);  //这个不设置的话就背景变黑  
     setAttribute(Qt::WA_TranslucentBackground,true); 

fmp_redeem/errcodedialog.cpp

-#include "errcodedialog.h"
+#include "errcodedialog.h"
 #include "ui_errcodedialog.h"
 
 ErrCodeDialog::ErrCodeDialog(QWidget * parent, Qt::WindowFlags f) :
@@ -6,6 +6,7 @@ ErrCodeDialog::ErrCodeDialog(QWidget * parent, Qt::WindowFlags f) :
     ui(new Ui::ErrCodeDialog)
 {
     ui->setupUi(this);
+    setWindowTitle(QString::fromLocal8Bit("非码卡券"));
     setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint);
     setAutoFillBackground(false);  //这个不设置的话就背景变黑  
     setAttribute(Qt::WA_TranslucentBackground,true); 

fmp_redeem/fmp_redeem.cpp

@@ -100,7 +100,7 @@ QJsonValue FMPRedeem::SearchJsonArray(const QJsonArray& searchJson, const QStrin
     return value;
 }
 
-QJsonObject FMPRedeem::Redeem(const double needPay, const QJsonObject& requestInfo)
+QJsonObject FMPRedeem::Redeem(const double needPay, const QJsonObject& requestInfo, QWidget* parent)
 {    
     FMP_DEBUG() << "Recv redeem data: " << QJsonDocument(requestInfo).toJson(QJsonDocument::Compact);
     _products_info = SearchJsonObject(requestInfo, "products").toArray();
@@ -115,7 +115,7 @@ QJsonObject FMPRedeem::Redeem(const double needPay, const QJsonObject& requestIn
     _partner_id = settings.value(FMP_INIKEY_LOGINPARTNERID).toInt();
     
     //显示扫码界面获取券码
-    ScanningDialog scanningDialog;
+    ScanningDialog scanningDialog(parent);
     if(scanningDialog.exec() != QDialog::Accepted)
     {
         QJsonObject ret;

fmp_redeem/fmp_redeem.h

@@ -29,7 +29,7 @@ public:
     explicit            FMPRedeem(const FMPContext context);
     virtual             ~FMPRedeem();
     
-    QJsonObject         Redeem(const double needPay, const QJsonObject& requestInfo); //券码核销
+    QJsonObject         Redeem(const double needPay, const QJsonObject& requestInfo, QWidget* parent = 0); //券码核销
     
 protected:
     const FMPContext    GetContext() const { return _context; }

fmp_redeem/fmp_redeem_i.h

@@ -20,7 +20,7 @@ public:
         connect(this, &FMPRedeemInterface::TriggerUninit, this, &FMPRedeemInterface::OnTriggerUninit);
     }
     
-    virtual QJsonObject Redeem(const double needPay, const QJsonObject& requestInfo) = 0; //券码核销
+    virtual QJsonObject Redeem(const double needPay, const QJsonObject& requestInfo, QWidget* parent = 0) = 0; //券码核销
 signals:
     void                TriggerInit();
     void                TriggerUninit();

fmp_redeem/scanningdialog.cpp

-#include "scanningdialog.h"
+#include "scanningdialog.h"
 #include "ui_scanningdialog.h"
 #include "couponkeypad.h"
+#include "fmp_logger_i.h"
 #include <QDebug>
 #include <Windows.h>
 #include <QTimer>
@@ -10,8 +11,11 @@ ScanningDialog::ScanningDialog(QWidget * parent, Qt::WindowFlags f) :
     ui(new Ui::ScanningDialog)
 {
     ui->setupUi(this);
+    //setGeometry(0, 0, 350, 470);
+    setWindowTitle(QString::fromLocal8Bit("非码卡券"));
     setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint);
-    setAutoFillBackground(false);  //这个不设置的话就背景变黑  
+    //setWindowFlags(Qt::FramelessWindowHint);
+    //setAutoFillBackground(false);  //这个不设置的话就背景变黑  
     setAttribute(Qt::WA_TranslucentBackground,true); 
     setAttribute(Qt::WA_QuitOnClose, false);
     
@@ -76,6 +80,7 @@ void ScanningDialog::onClose()
 void ScanningDialog::timeOut()
 {
     qDebug() << "activateWindow";
+    FMP_DEBUG() << "activateWindow";
     HWND hForeWnd = ::GetForegroundWindow();
     DWORD dwForeID = ::GetWindowThreadProcessId(hForeWnd,NULL);
     DWORD dwCurID = ::GetCurrentThreadId();