Merge branch 'XianFeng' of http://gitlab.freemud.com/shangshang.dai/FmTakeaway into XianFeng

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

fmPrinter/fmPrinter.cpp

@@ -105,7 +105,7 @@ FmPrinter::FmPrinter()
         }
         break;
     case SHANGMI:
-        m_UAN_lib.setFileName("pos_ad_UAN.dll");
+        m_UAN_lib.setFileName("pos_ad_dll.dll");
         if(m_UAN_lib.load())
         {
            m_printTextWithStyles    = (PrintTextWithStyles*)m_UAN_lib.resolve("PrintTextWithStyles");
@@ -456,7 +456,7 @@ bool FmPrinter::_PrintBodyForShangmiPrinter(OrderObject *pData)
     rlt = rlt && m_beginPrint(0) == HS_OK ? true : false;
 
     QString apppath     = QCoreApplication::applicationDirPath();
-    QString helloBmp    = apppath+"/Hello.bmp";
+    QString helloBmp    = apppath+"/Hello_Sm.bmp";
     m_printBitmapFile(helloBmp.toLocal8Bit().data(),0);
     rlt = rlt && m_beginPrint(7) == HS_OK ? true : false;
 
@@ -528,17 +528,22 @@ bool FmPrinter::_shangmiPrinter(OrderObject *pData)
     QString apppath     = QCoreApplication::applicationDirPath();
     QString titleBmp    = apppath+"/Kitty.bmp";
     QString bottomBmp   = apppath+"/Look.bmp";
+    QString qrBmp       = apppath+"/qr_high.bmp";
 
+    bool rlt = true;
     m_printBitmapFile(titleBmp.toLocal8Bit().data(),0);
-    int rlt1 = m_beginPrint(7);
+    rlt = rlt && (m_beginPrint(7) == HS_OK);
 
-    bool rlt2 = _PrintBodyForShangmiPrinter(pData);
+    rlt = rlt && _PrintBodyForShangmiPrinter(pData);
 
     m_printBitmapFile(bottomBmp.toLocal8Bit().data(),0);
-    int rlt3 = m_beginPrint(7);
+    rlt = rlt && (m_beginPrint(7) == HS_OK);
 
-    m_beginPrint(8);
-    return (rlt1 == HS_OK && rlt2 && rlt3 == HS_OK);
+    m_printBitmapFile(qrBmp.toLocal8Bit().data(),0);
+    rlt = rlt && (m_beginPrint(7) == HS_OK);
+
+    rlt = rlt && (m_beginPrint(8) == HS_OK);
+    return rlt;
 }
 
 bool FmPrinter::_shangmiPrinter(QString data)
@@ -594,6 +599,7 @@ bool FmPrinter::_fmPrintData(OrderObject* pData)
         QString titleBmp=apppath+"/Kitty.bmp";
         QString bottomBmp=apppath+"/Look.bmp";
         QString helloBmp=apppath+"/Hello.bmp";
+        QString qrBmp=apppath+"/qr_high.bmp";
 
         m_pPrintHex("\x1B\x61\x1",3);  //居中
         m_pPrintBitmapFile(titleBmp.toLocal8Bit().data(),0);
@@ -665,8 +671,11 @@ bool FmPrinter::_fmPrintData(OrderObject* pData)
         m_pPrintHex("\x1B\x61\x1",3);  //居中
         m_pBeginPrint(0);
         m_pPrintBitmapFile(bottomBmp.toLocal8Bit().data(),0);
+        m_pPrintBitmapFile(qrBmp.toLocal8Bit().data(),0);
         m_pPrintHex("\x0A",1);
         m_pPrintHex("\x0A",1);
+
+
         m_pBeginPrint(0);
         m_pCutPaper(0);
         m_pClosePrinter();