修改提示方式，提交测试

qMcdCode/errcodedialog.cpp

@@ -18,7 +18,7 @@ ErrCodeDialog::~ErrCodeDialog()
     delete ui;
 }
 
-void ErrCodeDialog::showForInvalid(const QString &coupon, QWidget *parent)
+void ErrCodeDialog::showForInvalid(const QString &coupon, const QString msg, QWidget *parent)
 {
     ErrCodeDialog v(parent);
     v.setGeometry( 0,0,350,470);
@@ -27,7 +27,9 @@ void ErrCodeDialog::showForInvalid(const QString &coupon, QWidget *parent)
 
     v.ui->labTime->setVisible( false);
     v.ui->labActName->setVisible( false);
-    v.ui->labCodeName->setVisible( false);
+
+    v.ui->labCodeName->setVisible( true);
+    v.ui->labCodeName->setText(msg);
     v.ui->labFolat->setVisible( false);
 
     v.ui->labCode->setText(coupon );
@@ -47,13 +49,13 @@ void ErrCodeDialog::showForExpird(const QString &act_name,
     v.ui->topInvalidWidget->setStyleSheet( v.ui->topInvalidWidget->styleSheet());
 
     v.ui->labTime->setVisible( true);
-    v.ui->labActName->setVisible( true);
+    v.ui->labActName->setVisible( false);
     v.ui->labCodeName->setVisible( true);
 
     v.ui->labCode->setText(coupon );
     v.ui->labTime->setText( time_name);
-    v.ui->labActName->setText( act_name);
-    v.ui->labCodeName->setText( code_name);
+    //v.ui->labActName->setText( act_name);
+    v.ui->labCodeName->setText( act_name);
 
     v.exec();
 }

qMcdCode/errcodedialog.h

@@ -22,7 +22,7 @@ public:
     explicit ErrCodeDialog(QWidget *parent = 0);
     ~ErrCodeDialog();
 
-    static void showForInvalid( const QString& coupon, QWidget *parent = 0);
+    static void showForInvalid(const QString& coupon, const QString msg, QWidget *parent = 0);
 
     static void showForExpird(const QString &act_name, const QString code_name,
                                const QString time_name, const QString coupon,

qMcdCode/errcodedialog.ui

@@ -224,7 +224,7 @@
          <property name="geometry">
           <rect>
            <x>0</x>
-           <y>190</y>
+           <y>210</y>
            <width>330</width>
            <height>37</height>
           </rect>
@@ -250,6 +250,12 @@
          <property name="alignment">
           <set>Qt::AlignCenter</set>
          </property>
+         <property name="margin">
+          <number>0</number>
+         </property>
+         <property name="indent">
+          <number>-1</number>
+         </property>
         </widget>
         <widget class="QLabel" name="labFolat">
          <property name="geometry">

qMcdCode/golbal.cpp

-#include "golbal.h"
+#include "golbal.h"
 #include <QFile>
 #include <QMessageBox>
 #include <QXmlStreamReader>
@@ -22,8 +22,9 @@ bool readStorid(QString &storid)
 
     if(!file.open(QFile::ReadOnly | QFile::Text))
     {
-       QMessageBox::information(NULL, QString("err"), "E:\\NewPos61\\PosData\\store-db.xml打开失败，请联系it人员!");
-       return false;
+        QString str = "E:\\NewPos61\\PosData\\store-db.xml打开失败，请联系it人员!";
+        QMessageBox::information(NULL, QString("err"), str);
+        return false;
     }
     QXmlStreamReader xml(&file);
     int flag = 0;

qMcdCode/qMcdCode.pro

@@ -14,6 +14,14 @@ TEMPLATE = app
 
 INCLUDEPATH += $$PWD/../qMcdCode/widget
 
+
+CONFIG(debug, debug|release){
+    DESTDIR = $$PWD/bin/debug
+}else
+{
+    DESTDIR = $$PWD/bin/release
+}
+
 SOURCES += main.cpp\
     widget/lc_my_dialog.cpp \
     errcodedialog.cpp \

qMcdCode/widget/lcmylabel.cpp

@@ -111,7 +111,8 @@ void LcMyLabel::paintEvent(QPaintEvent *event)
 
         int maxSize = getMaxSize( allStr, this->width());
 
-        if( allStr.length() <=maxSize){
+        if( allStr.length() <=maxSize)
+        {
 
 
             QFont _font(bigFontName);
@@ -133,14 +134,14 @@ void LcMyLabel::paintEvent(QPaintEvent *event)
             font.setPointSize(fontSize);
             font.setBold( true);
 
-            QString str1 = allStr.left(11);
+            QString str1 = allStr.left(allStr.length() /2 );
             QFontMetrics fm1(font);
             QRect fRect1 = fm1.boundingRect( str1);
             textWidth = fRect1.width();
             textY = fRect1.y()  - 2;
             pp.addText(rect().center().x() - textWidth / 2.0, 0 - textY  ,  font, str1);
 
-            QString str2 = allStr.right( allStr.length() - 11);
+            QString str2 = allStr.right( allStr.length() - str1.length());
             QFontMetrics fm2(font);
             QRect fRect2 = fm2.boundingRect( str2);
             textWidth = fRect2.width();
@@ -173,6 +174,10 @@ void LcMyLabel::paintEvent(QPaintEvent *event)
         int fontSize = 22;
         do{
             fontSize = fontSize -2;
+            if(fontSize < 1)
+            {
+                break;
+            }
             QFont _font(bigFontName);
             font = _font;
             font.setPointSize(fontSize);

qMcdCode/workwidget.cpp

@@ -303,21 +303,29 @@ void WorkWidget::error(int socketError, const QString message)
 
 void WorkWidget::queryCode11(const QJsonObject &json)
 {
-    ErrCodeDialog::showForInvalid( coupon, this);
+    QString statusMsg;
+    if(json.contains("msg"))
+        statusMsg = json["msg"].toString();
+    else
+        statusMsg = QString::number(json["statusCode"].toInt());
+    ErrCodeDialog::showForInvalid( coupon, statusMsg, this);
     exit(0);
 }
 
 void WorkWidget::queryCode12(const QJsonObject &json)
 {
     QJsonObject _codeInfo = json["codeInfo"].toObject();
-    QString _act_name = _codeInfo["act_name"].toString();
+
+    //QString _act_name = _codeInfo["act_name"].toString();
+    QString statusMsg = json["msg"].toString();
+
     QString _code_name = _codeInfo["promotion_type"].toString();
     QString _coupon = _codeInfo["code"].toString();
     QString vdata = _codeInfo["vdata"].toString();
     QString _time_name;
     _time_name.append("有效期:    ").append( vdata);
 
-    ErrCodeDialog::showForExpird(_act_name, _code_name, _time_name, _coupon, this);
+    ErrCodeDialog::showForExpird(statusMsg, _code_name, _time_name, _coupon, this);
     exit(0);
 }
 //{"redeemInfo":{"redeem_date":"2016-02-02 17:32","station_id":"403056","store_id":"99992","store_name":"麦当劳测试门店2"},"statusCode":14}
@@ -332,11 +340,14 @@ void WorkWidget::queryCode14(const QJsonObject &json)
     _time_name.append( _store_id).append("(").append(_station_id).append( ")").append("     ").append(_time);
 
     QJsonObject _codeInfo = json["codeInfo"].toObject();
-    QString _act_name = _codeInfo["act_name"].toString();
+
+    //QString _act_name = _codeInfo["act_name"].toString();
+    QString statusMsg = json["msg"].toString();
+
     QString _code_name = _codeInfo["promotion_type"].toString();
     QString _coupon = coupon;
 
-    ConsumptionDialog::ShowForHasConsum( _act_name, _code_name, _time_name, _coupon, this);
+    ConsumptionDialog::ShowForHasConsum( statusMsg, _code_name, _time_name, _coupon, this);
     exit(0);
 }
 
@@ -365,12 +376,13 @@ void WorkWidget::queryCode100(const QJsonObject &json)
 
 void WorkWidget::queryCodeErr(const QJsonObject &json)
 {
-    int statusCode = json["statusCode"].toInt();
-
-    QString _act_name = "err:";
-    _act_name.append( QString::number( statusCode));
+    QString statusMsg;
+    if(json.contains("msg"))
+        statusMsg = json["msg"].toString();
+    else
+        statusMsg = QString::number(json["statusCode"].toInt());
 
-    ErrCodeDialog::showForErr(  coupon,_act_name, this);
+    ErrCodeDialog::showForErr(coupon, statusMsg, this);
     exit(0);
 }