1.重新包装答打印函数;2.调整打印机池,调整档口池;3.打印测试对接并测试完成;4.修复部分界面展示异常;

takeout/base/Print/newprintlib.h

+#ifndef NEWPRINTLIB_H
+#define NEWPRINTLIB_H
+
+#include "Model/productObject.h"
+#include "Model/orderObject.h"
+#include "printdocument.h"
+
+typedef void (*Unloaddll)();
+
+typedef bool (*LoadAddress)();
+
+typedef int (*LabPrtOpen)(char data[]);
+
+typedef int (*LabPrtLine)(int x, int y, int line, const char *data);
+
+typedef int (*LabPrtClose)();
+
+typedef int (*PrtOpen)(char data[]);
+
+typedef int (*PrtClose)();
+
+typedef void (*FreeLine)();
+
+typedef bool (*PrintDataLine)(char data[], int fontType, int fontStyle, int width, int height);
+
+typedef bool (*PrintBarCode)(char data[], int type, int leftMargin, int fontType, int width, int height, int position);
+
+typedef bool (*PrintQRCode)(char data[], int type,  int leftMargin, int width);
+
+class NewPrintLib
+{
+public:
+    NewPrintLib();
+
+    ~NewPrintLib();
+
+    static NewPrintLib& GetInstance();
+
+    /*!
+     * \brief DoPrint   小票打印
+     * \param connect   打印模板上下文
+     * \param config    打印配置
+     * \param order     订单对象
+     * \return          true:成功 false:失败
+     */
+    bool DoPrint(const QString &config, const QString &context, OrderObject *order);
+    /*!
+     * \brief DoBackPrint   后厨打印
+     * \param page_depart   每种商品打印一页
+     * \param connect       后厨打印模板上下文
+     * \param prod_depart   每个商品打印一行
+     * \param config        后厨打印机配置
+     * \param stallsprods   档口对应商品编号列表
+     * \param prod          商品列表
+     * \return              true:成功 false:失败
+     */
+    bool DoBackPrint(int page_depart, int prod_depart, int page_num,
+                     const QStringList &stallsprods, const QString &config,
+                     const QString &context, OrderObject *order);
+
+    /*!
+     * \brief DoLabelPrint  杯贴机打印
+     * \param config        杯贴打印机配置
+     * \param prod          商品
+     * \return              true:成功 false:失败
+     */
+    bool DoLabelPrint(const QString &config, OrderObject *order);
+
+private:
+    bool LoadFunction();
+
+    bool PrintLineNode(const PrintDocument &doc, OrderObject *_order);
+
+    void PrintLine(const LineNode &line, ProductObject *dish, OrderObject *_order);
+
+    void PrintProcudt(const QList<LineNode *> &list, const QList<int> &protlist, OrderObject *_order);
+
+    bool GetObjList(int page_depart, int prod_depart, QStringList prodlist, QList<OrderObject> &orderlist, OrderObject *order);
+
+    bool GetProdObject(int prod_depart, QList<OrderObject> &orderlist, OrderObject *order);
+
+    bool GetProdList(const QStringList &stallsprods, OrderObject *order, QStringList &prodlist);
+
+    bool PrintLabel(const QString &config, OrderObject *order);
+private:
+    Unloaddll f_unloaddll;
+
+    LoadAddress f_loadaddress;
+
+    LabPrtOpen f_labprtiopen;
+
+    LabPrtLine f_labprtline;
+
+    LabPrtClose f_labprtclose;
+
+    PrtOpen f_prtopen;
+
+    PrtClose f_prtclose;
+
+    FreeLine f_freeline;
+
+    PrintDataLine f_printdataline;
+
+    PrintBarCode f_printBarcode;
+
+    PrintQRCode f_printqrcode;
+
+    bool _load_flag;
+};
+
+#endif // NEWPRINTLIB_H

takeout/base/Print/printlib.cpp

@@ -127,8 +127,6 @@ void PrintLib::_PrintLab( OrderObject* order)
 
             qDebug() << "input9:" << prodname;
 
-            //prodname= "dklahsdkjadhaksjdhkasjdhkajsd11231222222222222222312312312312";
-
             f_TSCWinPrintln(0,0,22,0,2,0,0,QString("\xE5\xAE\x8B\xE4\xBD\x93").toLocal8Bit().data(),tmptitle.toLocal8Bit().data(),0);
             f_TSCWinPrintln(0,0,22,0,2,0,0,QString("\xE5\xAE\x8B\xE4\xBD\x93").toLocal8Bit().data(),"-----------------------------------",0.0266666);
             f_TSCWinPrintln(10,0,24,0,2,0,0,QString("\xE5\xAE\x8B\xE4\xBD\x93").toLocal8Bit().data(), prodname.
@@ -151,13 +149,8 @@ void PrintLib::_PrintLab( OrderObject* order)
             property_tags.remove(property_tags.length()-1,1);
             f_TSCWinPrintln(10,0,24,0,2,2,0,QString("\xE5\xAE\x8B\xE4\xBD\x93").toLocal8Bit().data(),property_tags.toLocal8Bit().data(),0.0666665);
 
-            //预约送达
-            //QString sendtimes = QString("\xE9\xA2\x84\xE7\xBA\xA6\xE9\x80\x81\xE8\xBE\xBE\x3A");
-
             QString sendtimes = QString("");
 
-            //QLOG_DEBUG() << "tmpdelitime : " << tmpdelitime << order->srcdlv_time;
-
             if(tmpdelitime != 0 /*&& (order->order_type == 1 || order->order_type == 2)*/)
             {
                 sendtimes.append(QDateTime::fromTime_t(order->delivery_time).toString("yyyy-MM-dd hh:mm:ss"));
@@ -166,13 +159,10 @@ void PrintLib::_PrintLab( OrderObject* order)
 
             f_TSCWinPrintln(10,180,26,0,2,0,0,QString("\xE5\xAE\x8B\xE4\xBD\x93").toLocal8Bit().data(),order->store_name.toLocal8Bit().data(),0.0666665);
 
-            //qDebug() << "up f_TSCWinPrintPage";
-
             f_TSCWinPrintPage("1","1");
 
             -- num;
         }
-        //qDebug() << "down f_TSCWinPrintPage";
     }
 }
 

takeout/base/Print/printlib.pri

 INCLUDEPATH += $$PWD
 
 SOURCES += $$PWD/printlib.cpp \
-    $$PWD/printDocument.cpp
+    $$PWD/printDocument.cpp \
+    $$PWD/newprintlib.cpp
 
 HEADERS += $$PWD/printlib.h \
     $$PWD/calculator.h \
-    $$PWD/printDocument.h
+    $$PWD/printDocument.h \
+    $$PWD/newprintlib.h

takeout/control/prtlocalizework.cpp

@@ -74,7 +74,7 @@ void PrtLocalizeWork::deletePrt(QString prtid)
     }
     else
     {
-        bool flag = db.dlt(DEFAULT_DBFORM, QString(DB_KEY_PRTID).append("='%1'").arg(prtid));
+        bool flag = db.dlt(DEFAULT_PRTFORM, QString(DB_KEY_PRTID).append("='%1'").arg(prtid));
         QLOG_DEBUG() << "delete prt : " << prtid << "(" << flag << ")";
     }
 }

takeout/control/stallsgetwork.cpp

@@ -72,44 +72,17 @@ void StallsGetWork::workstart()
 
     while(!_stopflag)
     {
-        //获取档口信息
-        QJsonObject json, recvjson;
-        QString realurl;
-        QString error;
 
-        if(!GetStallsDataProcess::getStallsOptRequest(json, _storeinfo[JSON_KEY_PARTNERID].toString()))
+        if(!GetStalls())
         {
-            QLOG_ERROR() << "getStallsOptRequest failed";
-            return;
-        }
-
-        QLOG_INFO() << "getStallsOptRequest request json : " << json;
-
-        if(!GetStallsDataProcess::getRealUrl(ADVANCEORDER, json, _url, realurl))
-        {
-            QLOG_ERROR() << "getStallsOptRequest getRealUrl failed";
-            return;
-        }
-
-        QLOG_INFO() << "getStallsOptRequest request url :" << realurl;
-
-        if(!this->S_Request(json, recvjson, realurl, error))
-        {
-            QLOG_ERROR() << "getStallsOptRequest failed : " << error;
-            return;
-        }
-
-        QLOG_INFO() << "getStallsOptRequest return json : " << recvjson;
-
-        //判断recvjson，如果返回失败和一种，则不推送这个消息
-        QJsonObject tmpjson;
-        QJsonArray tmparray;
-        if(recvjson.contains(EVENT_KEY_RESULT) && recvjson[EVENT_KEY_RESULT].toObject().contains(EVENT_KEY_FILEPRODUCTLIST)) {
-            tmpjson = recvjson[EVENT_KEY_RESULT].toObject();
-            tmparray = tmpjson[EVENT_KEY_FILEPRODUCTLIST].toArray();
-            if(recvjson[JSON_KEY_CODE].toString() != "100" || tmparray.size() == 0) {
-                POSTEVENTTYPE(PosEvent::s_change_stalls, recvjson, QJsonObject);
-            }
+            QLOG_WARN() << "StallsGetWork::GetStalls failed wait " << DEFAULT_STALLS_TIMEOUT;
+            QTimer timer;
+            QEventLoop loop;
+            connect(this, &StallsGetWork::quit, &loop, &QEventLoop::quit);
+            connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
+            timer.start(DEFAULT_STALLS_TIMEOUT);
+            loop.exec();
+            continue;
         }
 
         //获取档口信息完成后检擦是否退出表示
@@ -123,3 +96,63 @@ void StallsGetWork::workstart()
     _stoped = true;
 }
 
+bool StallsGetWork::GetStalls()
+{
+    //获取档口信息
+    QJsonObject json, recvjson;
+    QString realurl;
+    QString error;
+
+    if(!GetStallsDataProcess::getStallsOptRequest(json, _storeinfo[JSON_KEY_PARTNERID].toString()))
+    {
+        QLOG_ERROR() << "getStallsOptRequest failed";
+        return false;
+    }
+
+    QLOG_INFO() << "getStallsOptRequest request json : " << json;
+
+    if(!GetStallsDataProcess::getRealUrl(ADVANCEORDER, json, _url, realurl))
+    {
+        QLOG_ERROR() << "getStallsOptRequest getRealUrl failed";
+        return false;
+    }
+
+    QLOG_INFO() << "getStallsOptRequest request url :" << realurl;
+
+    if(!this->S_Request(json, recvjson, realurl, error))
+    {
+        QLOG_ERROR() << "getStallsOptRequest failed : " << error;
+        return false;
+    }
+
+    QLOG_INFO() << "getStallsOptRequest return json : " << recvjson;
+
+    return CheckStallsInfo(recvjson);
+
+}
+
+bool StallsGetWork::CheckStallsInfo(QJsonObject &json)
+{
+    if(!json.contains(JSON_KEY_CODE) || QString("ok").compare(json[JSON_KEY_CODE].toString(), Qt::CaseInsensitive) != 0)
+    {
+        QLOG_ERROR() << "StallsGetWork::CheckStallsInfo failed";
+        return false;
+    }
+
+    if(json.contains(STALLS_KEY_RESULT) && json[STALLS_KEY_RESULT].isObject() &&
+            json[STALLS_KEY_RESULT].toObject().contains(STALLS_KEY_FILEPRODUCTLIST) &&
+            json[STALLS_KEY_RESULT].toObject()[STALLS_KEY_FILEPRODUCTLIST].isArray())
+    {
+        QLOG_DEBUG() << "StallsGetWork::CheckStallsInfo file_list";
+
+        QJsonArray array = json[STALLS_KEY_RESULT].toObject()[STALLS_KEY_FILEPRODUCTLIST].toArray();
+
+        if(array.size() > 0)
+            POSTEVENTTYPE(PosEvent::s_change_stalls, array, QJsonArray);
+        else
+            QLOG_WARN() << "file_list is empty";
+    }
+
+    return true;
+}
+

takeout/control/stallsgetwork.h

@@ -28,6 +28,12 @@ signals:
 
 public slots:
     void workstart();
+
+private:
+    bool GetStalls();
+
+    bool CheckStallsInfo(QJsonObject &json);
+
 private:
     QVariantMap _storeinfo;
 
@@ -113,12 +119,6 @@ private:
         complatejson.insert(JSON_KEY_VER, ver);
     }
 
-//    static bool getPickUpOrderOptRequest(QJsonObject &data, QString orderid, int opt)
-//    {
-//        data.insert(JSON_KEY_PIVKUP_ORDERID, orderid);
-//        data.insert(JSON_KEY_PIVKUP_OPT, opt);
-//        return true;
-//    }
     static bool getStallsOptRequest(QJsonObject &data, QString partnerid)
     {
         data.insert(JSON_KEY_PARTNERID, partnerid);

takeout/event/posevent.cpp

@@ -27,6 +27,7 @@ QEvent::Type PosEvent::s_change_prt = static_cast<QEvent::Type>(QEvent::register
 QEvent::Type PosEvent::s_delete_prt = static_cast<QEvent::Type>(QEvent::registerEventType());
 
 QEvent::Type PosEvent::s_change_stalls = static_cast<QEvent::Type>(QEvent::registerEventType());
+QEvent::Type PosEvent::s_show_stalls = static_cast<QEvent::Type>(QEvent::registerEventType());
 
 PosEvent::PosEvent(Type e):QEvent(e)
 {

takeout/event/posevent.h

@@ -110,6 +110,9 @@ public:
     //---------------------档口相关------------------------
     //添加档口信息
     static Type s_change_stalls;
+
+    //档口信息展示
+    static Type s_show_stalls;
 private:
     //事件携带的信息,该内存你应当在堆中分配
     void *_info;

takeout/model/posstallspool.cpp

@@ -5,27 +5,20 @@
 #include "event/posevent.h"
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QJsonArray>
+
+QMap<QString, QStringList> PosStallsPool::_stallsid_prodids_map;
+QMap<QString, QStringList> PosStallsPool::_stallsid_prodnames_map;
+QVariantMap PosStallsPool::_stallsid_stallsname_map;
+QVariantMap PosStallsPool::_stalls_pagenum_map;
+QVariantMap PosStallsPool::_stalls_pagedepart_map;
+QVariantMap PosStallsPool::_stalls_proddepart_map;
 
 PosStallsPool::PosStallsPool(QObject *parent) : QObject(parent)
 {
     FMApplication::subscibeEvent(this,PosEvent::s_change_stalls);
 }
 
-//QStringList PosStallsPool::stallslist()
-//{
-//    return _stallList;
-//}
-
-//QVariantMap PosStallsPool::getStallsIdNameMap()
-//{
-//    return _stallsIdNameMap;
-//}
-
-//QVariantMap PosStallsPool::getStallsNamePrdMap()
-//{
-//    return _stallsNamePrdMap;
-//}
-
 void PosStallsPool::InitPosStallsPool()
 {
     static PosStallsPool stallspool;
@@ -37,26 +30,138 @@ bool PosStallsPool::event(QEvent *e)
     {
         QLOG_DEBUG() << "PosEvent::s_change_stalls : " << QThread::currentThreadId();
 
-        QJsonObject info;
+        QJsonArray list;
 
-        GETEVENTINFO(info,e,QJsonObject);
+        GETEVENTINFO(list,e,QJsonArray);
 
-        QLOG_DEBUG() << "info : " << info;
+        QLOG_DEBUG() << "PosStallsPoollist : " << list;
 
         //解析档口信息
-        praseGetStallsInfo(info);
+        praseGetStallsInfo(list);
 
         return true;
     }
 }
 
-void PosStallsPool::praseGetStallsInfo(QJsonObject json)
+bool PosStallsPool::GetProdNameList(QString stallsid, QStringList &prodnames)
 {
-//    QStringList stallsList = map.value(EVENT_KEY_STALLSLIST).toStringList();
-//    for(int i = 0; i < stallsList.size(); i++) {
-//        _stallList.append(stallsList.at(i)["file_name"]);
-//        stallsIdNameMap.insert(stallsList.at(i)["file_id"], stallsList.at(i)["file_name"]);
-//        stallsNamePrdMap.insert(stallsList.at(i)["file_name"], stallsList.at(i)["product_list"]);
-//    }
+    if(_stallsid_prodnames_map.contains(stallsid))
+    {
+        prodnames = _stallsid_prodnames_map[stallsid];
+        return true;
+    }
+    return false;
+}
+
+bool PosStallsPool::GetProdIDList(QString stallsid, QStringList &prodids)
+{
+    if(_stallsid_prodids_map.contains(stallsid))
+    {
+        prodids = _stallsid_prodids_map[stallsid];
+        return true;
+    }
+    return false;
+}
+
+bool PosStallsPool::GetStallsName(QString stallsid, QString &stallsname)
+{
+    if(_stallsid_stallsname_map.contains(stallsid))
+    {
+        stallsname = _stallsid_stallsname_map[stallsid].toString();
+        return true;
+    }
+    return false;
+}
+
+bool PosStallsPool::GetStallsArgv(QString stallsid, int &pagedepart, int &proddepart, int &pagenum)
+{
+    if(_stalls_pagedepart_map.contains(stallsid) &&
+            _stalls_pagenum_map.contains(stallsid) &&
+            _stalls_proddepart_map.contains(stallsid))
+    {
+        pagedepart = _stalls_pagedepart_map[stallsid].toInt();
+        proddepart = _stalls_proddepart_map[stallsid].toInt();
+        pagenum = _stalls_pagenum_map[stallsid].toInt();
+        return true;
+    }
+    return false;
+}
+
+void PosStallsPool::praseGetStallsInfo(QJsonArray array)
+{
+    _stallsid_prodids_map.clear();
+    _stallsid_prodnames_map.clear();
+    _stallsid_stallsname_map.clear();
+    _stalls_pagenum_map.clear();
+    _stalls_pagedepart_map.clear();
+    _stalls_proddepart_map.clear();
+
+    //QLOG_DEBUG() << "PosStallsPool::praseGetStallsInfo" << array;
+
+    foreach (auto v, array)
+    {
+        QJsonObject obj = v.toObject();
+
+        QString stallsid, stallsname;
+        int pagedepart = 0, pagenum = 0, proddepart = 0;
+        QStringList prodids, prodnames;
+
+        //QLOG_DEBUG() << "---obj---" << obj;
+
+        if(obj.contains(STALLS_KEY_FILEID) && obj.contains(STALLS_KEY_FILENAME) && obj.contains(STALLS_KEY_PRODUCTLIST))
+        {
+
+            //QLOG_DEBUG() << "---obj" << obj;
+
+            stallsid = QString::number(obj[STALLS_KEY_FILEID].toInt());
+            stallsname = obj[STALLS_KEY_FILENAME].toString();
+            QJsonArray prodarray = obj[STALLS_KEY_PRODUCTLIST].toArray();
+            praseGetProdInfo(prodarray, prodids, prodnames);
+
+            if(!prodids.empty() && !prodnames.isEmpty())
+            {
+                if(obj.contains(STALLS_KEY_PAGEDEPART) && obj.contains(STALLS_KEY_PORDDEPART) && obj.contains(STALLS_KEY_PAGENUM))
+                {
+                    pagedepart = obj[STALLS_KEY_PAGEDEPART].toInt();
+                    proddepart = obj[STALLS_KEY_PORDDEPART].toInt();
+                    pagenum = obj[STALLS_KEY_PAGENUM].toInt();
+
+                    pagenum = (pagenum == 0 ? 1 : pagenum);
+
+                    _stalls_pagenum_map.insert(stallsid, pagenum);
+                    _stalls_pagedepart_map.insert(stallsid, pagedepart);
+                    _stalls_proddepart_map.insert(stallsid, proddepart);
+                }
+
+                _stallsid_prodids_map.insert(stallsid, prodids);
+                _stallsid_prodnames_map.insert(stallsid, prodnames);
+                _stallsid_stallsname_map.insert(stallsid, stallsname);
+            }
+        }
+    }
+
+    QLOG_DEBUG() << "_stallsid_prodid_map:" << _stallsid_prodids_map;
+    QLOG_DEBUG() << "_stallsid_prodnames_map:" << _stallsid_prodnames_map;
+    QLOG_DEBUG() << "_stallsid_stallsname_map:" << _stallsid_stallsname_map;
+    QLOG_DEBUG() << "_stalls_pagenum_map:" << _stalls_pagenum_map;
+    QLOG_DEBUG() << "_stalls_pagedepart_map:" << _stalls_pagedepart_map;
+    QLOG_DEBUG() << "_stalls_proddepart_map:" << _stalls_proddepart_map;
+
+    if(!_stallsid_stallsname_map.empty())
+        POSTEVENTTYPE(PosEvent::s_show_stalls, _stallsid_stallsname_map, QVariantMap);
+}
+
+void PosStallsPool::praseGetProdInfo(QJsonArray array, QStringList &prodids, QStringList &prodnames)
+{
+    foreach (auto v, array)
+    {
+        QJsonObject obj = v.toObject();
+
+        if(obj.contains(STALLS_KEY_FILEPRODUCT) && obj.contains(STALLS_KEY_FILEPRODUCTID))
+        {
+            prodids.append(obj[STALLS_KEY_FILEPRODUCTID].toString());
+            prodnames.append(obj[STALLS_KEY_FILEPRODUCT].toString());
+        }
+    }
 }
 

takeout/model/posstallspool.h

@@ -12,25 +12,45 @@ private:
     explicit PosStallsPool(QObject *parent = 0);
 
 public:
-//    static QStringList stallslist();
-//    static QVariantMap getStallsIdNameMap();
-//    static QVariantMap getStallsNamePrdMap();
     static void InitPosStallsPool();
 
     bool event(QEvent *e);
+
+    static bool GetProdNameList(QString stallsid, QStringList &prodnames);
+
+    static bool GetProdIDList(QString stallsid, QStringList &prodids);
+
+    static bool GetStallsName(QString stallsid, QString &stallsname);
+
+    static bool GetStallsArgv(QString stallsid, int &pagedepart, int &proddepart, int &pagenum);
 signals:
 
 public slots:
 
 private:
     //解析订阅档口改变事件中拿到的档口信息
-    void praseGetStallsInfo(QJsonObject json);
+    static void praseGetStallsInfo(QJsonArray array);
+    //获取商品列表
+    static void praseGetProdInfo(QJsonArray array, QStringList &prodidlist, QStringList &prodnames);
+
+private:
+    //档口id对应的商品id列表
+    static QMap<QString, QStringList> _stallsid_prodids_map;
+
+    //档口id对应的商品名称集合
+    static QMap<QString, QStringList> _stallsid_prodnames_map;
+
+    //档口ID对应的档口名称
+    static QVariantMap _stallsid_stallsname_map;
+
+    //档口对应打印页数
+    static QVariantMap _stalls_pagenum_map;
 
-    //档口名称列表
-    static QStringList _stallList;
+    //档口对应打印商品页是否独立
+    static QVariantMap _stalls_pagedepart_map;
 
-    static QMap<QString, QString> _stallsIdNameMap;
-    static QMap<QString, QStringList> _stallsNamePrdMap;
+    //档口对应商品是否独占一行
+    static QVariantMap _stalls_proddepart_map;
 };
 
 #endif // POSSTALLSPOOL_H

takeout/preDefine.h

@@ -208,13 +208,18 @@
 #define DEVENT_KEY_PRTSTALLS         "prt_stalls"
 
 //档口信息
-#define EVENT_KEY_STALLSLIST         "file_list"
-#define EVENT_KEY_RESULT             "result"
-#define EVENT_KEY_FILEPRODUCTLIST    "fileProductList"
-#define EVENT_KEY_FILEID             "file_id"
-#define EVENT_KEY_FILENAME           "file_name"
-#define EVENT_KEY_PRODUCTLIST        "productList"
-#define EVENT_KEY_FILEPRODUCT        "file_product"
+#define STALLS_KEY_STALLSLIST         "file_list"
+#define STALLS_KEY_RESULT             "result"
+#define STALLS_KEY_FILEPRODUCTLIST    "fileProductList"
+#define STALLS_KEY_FILEID             "file_id"
+#define STALLS_KEY_FILENAME           "file_name"
+#define STALLS_KEY_PRODUCTLIST        "productList"
+#define STALLS_KEY_FILEPRODUCT        "file_product"
+#define STALLS_KEY_FILEPRODUCTID      "file_product_id"
+#define STALLS_KEY_FILEDEPART         "is_file_depart"
+#define STALLS_KEY_PAGEDEPART         "is_file_depart"
+#define STALLS_KEY_PORDDEPART         "is_product_departl"
+#define STALLS_KEY_PAGENUM            "print_number"
 
 #define EVENT_KEY_SEASIONCODE        "reason_code"
 #define EVENT_KEY_SEASION            "reason"
@@ -326,5 +331,9 @@
 #define PRT_CONF_HIGH           "high"
 #define PRT_CONF_WIGTH          "wigth"
 
+#define DEFAULT_STALLS_TIMEOUT  (60*1000)
+
+#define DEFAULT_PAGE_SIZE       4096
+#define DEFAULT_CONFIG_SIZE     1024
 
 #endif // PREDEFINE_H

takeout/view/newmainform.h

@@ -111,6 +111,8 @@ private slots:
 
     void on_newmainbtn_findclean_clicked();
 
+    void on_newmainbtn_prttest_clicked();
+
 private:
     Ui::NewMainForm *ui;
     //
@@ -186,7 +188,9 @@ private:
     void DoGetPrtSetting(QString curr);
 
     //更新界面的档口选择
-    void onSetStalls(QJsonObject json);
+    void onSetStalls(QVariantMap &map);
+    void GetStallsText(QString stallsid, QString stallsname, QString &text);
+    bool GetContext(QString &context);
 };
 
 class NewMainFormDataProcess
@@ -237,26 +241,6 @@ private:
 
     }
 
-    static void GetPrintIniWithInde(int index, QMap<QString, QString> &map)
-    {
-        QString section = "Printer";
-        QString comsection = "COMDEF";
-
-        if(index == 2)
-        {
-             section = "OtherPrinter";
-             comsection = "OTHERCOMDEF";
-        }
-
-        if(index > 2)
-        {
-            section = QString("OtherPrinter") + QString::number(index - 2 + 1);
-            comsection = QString("OTHERCOMDEF") + QString::number(index - 2 + 1);
-        }
-
-        GetPrintIni(section, comsection, map);
-    }
-
     static void SetPrintIni(QString section, QString comsection, QMap<QString, QString> &map)
     {  
         QString path = QString("%1/printer.ini").arg(qApp->applicationDirPath());
@@ -271,65 +255,6 @@ private:
             config.setValue(QString(section) + "/" + it.key(), it.value());
         }
     }
-
-    static void GetPrintIni(QString section, QString comsection, QMap<QString, QString> &map)
-    {
-        QString path = QString("%1/printer.ini").arg(qApp->applicationDirPath());
-        QSettings config(path, QSettings::IniFormat);
-
-        if(!config.value(section+"/Name").toString().isEmpty())
-            map.insert("Name",config.value(section+"/Name").toString());
-        if(!config.value(section+"/printType").toString().isEmpty())
-            map.insert("printType",config.value(section+"/printType").toString());
-        if(!config.value(section+"/PaperWidth").toString().isEmpty())
-            map.insert("PaperWidth",config.value(section+"/PaperWidth").toString());
-//        if(!config.value(section+"/levlel").toString().isEmpty())
-//            map.insert(section+"/levlel",config.value(section+"/levlel").toString());
-        if(!config.value(section+"/parallel").toString().isEmpty())
-            map.insert("parallel",config.value(section+"/parallel").toString());
-        if(!config.value(section+"/type").toString().isEmpty())
-            map.insert("type",config.value(section+"/type").toString());
-        if(!config.value(section+"/usb").toString().isEmpty())
-            map.insert("usb",config.value(section+"/usb").toString());
-        if(!config.value(section+"/IP").toString().isEmpty())
-            map.insert("IP",config.value(section+"/IP").toString());
-        if(!config.value(section+"/Printlabel").toString().isEmpty())
-            map.insert("Printlabel",config.value(section+"/Printlabel").toString());
-//        if(!config.value(section+"/LogDays").toString().isEmpty())
-//            map.insert(section+"/LogDays",config.value(section+"/LogDays").toString());
-        if(!config.value(section+"/wigth").toString().isEmpty())
-            map.insert("wigth",config.value(section+"/wigth").toString());
-        if(!config.value(section+"/high").toString().isEmpty())
-            map.insert("high",config.value(section+"/high").toString());
-//        if(!config.value(section+"/speed").toString().isEmpty())
-//            map.insert(section+"/speed",config.value(section+"/speed").toString());
-//        if(!config.value(section+"/crow").toString().isEmpty())
-//            map.insert(section+"/crow",config.value(section+"/crow").toString());
-        if(!config.value(section+"/labeltype").toString().isEmpty())
-            map.insert("labeltype",config.value(section+"/labeltype").toString());
-        if(!config.value(section+"/labelparall").toString().isEmpty())
-            map.insert("labelparall",config.value(section+"/labelparall").toString());
-        if(!config.value(section+"/labelusb").toString().isEmpty())
-            map.insert("labelusb",config.value(section+"/labelusb").toString());
-        if(!config.value(section+"/labelip").toString().isEmpty())
-            map.insert("labelip",config.value(section+"/labelip").toString());
-        if(!config.value(section+"/labelprttype").toString().isEmpty())
-            map.insert("labelprttype",config.value(section+"/labelprttype").toString());
-
-        //-----------------------------------------------------------------------------------
-        if(!config.value(comsection+"/com").toString().isEmpty())
-            map.insert("com", config.value(comsection+"/com").toString());
-        if(!config.value(comsection+"/Baudrate").toString().isEmpty())
-            map.insert("Baudrate", config.value(comsection+"/Baudrate").toString());
-        if(!config.value(comsection+"/DataBits").toString().isEmpty())
-            map.insert("DataBits",config.value(comsection+"/DataBits").toString());
-        if(!config.value(comsection+"/StopBits").toString().isEmpty())
-            map.insert("StopBits",config.value(comsection+"/StopBits").toString());
-        if(!config.value(comsection+"/Parity").toString().isEmpty())
-            map.insert("Parity",config.value(comsection+"/Parity").toString());
-        if(!config.value(comsection+"/FlowControl").toString().isEmpty())
-            map.insert("FlowControl",config.value(comsection+"/FlowControl").toString());
-    }
 };
 
 #endif // NEWMAINFORM_H