Merge branch 'Plugin_update' of git.oschina.net:kong__mo/fmp_printer into Plugin_update

fmp_printer_def.h

@@ -12,17 +12,6 @@
 #define FMP_INIKEY_PRINTERNET       "Printer/ip"
 #define FMP_INIKEY_PRINTERLABEL     "Printer/PrintLabel"
 #define FMP_INIKEY_LOGDAYS          "Printer/LogDays"
-
-#define FMP_INIKEY_PRINTERNAME_TIME      "Printertime/Name"
-#define FMP_INIKEY_PRINTERTYPE_TIME      "Printertime/Mode"
-#define FMP_INIKEY_PRINTERTYPET_TIME     "Printertime/PrintType"
-#define FMP_INIKEY_PRINTERSIZE_TIME      "Printertime/PaperWidth"
-#define FMP_INIKEY_PRINTERLEVLEL_TIME    "Printertime/Levlel"
-#define FMP_INIKEY_PRINTERTYPE2_TIME     "Printertime/Type"
-#define FMP_INIKEY_PRINTERUSB_TIME       "Printertime/usb"
-#define FMP_INIKEY_PRINTERPARALL_TIME    "Printertime/parallel"
-#define FMP_INIKEY_PRINTERNET_TIME       "Printertime/ip"
-#define FMP_INIKEY_PRINTERLABEL_TIME     "Printertime/PrintLabel"
-#define FMP_INIKEY_LOGDAYS_TIME          "Printertime/LogDays"
+#define FMP_INIKEY_PRINTERTIME      "Printer/printerTime"
 
 #endif // FMP_PRINTER_DEF_H

fmp_printer_p.cpp

@@ -51,9 +51,11 @@ int FMPPrinterPrivate::Uninit()
 
 bool FMPPrinterPrivate::_DoPrint(QString data,QString strLabel="")
 {
+    for(int i=0;i<m_print.m_printerTime;i++)
+    {
         QLOG_INFO() <<"receive data is"<<data;
         char m_dataini[128]={0};
-    QByteArray tmpData = SendIniData().toLocal8Bit();
+        QByteArray tmpData = SendIniData(i).toLocal8Bit();
         strcpy(m_dataini,tmpData.data());
         if(FM_LoadAddress())
         {
@@ -76,6 +78,8 @@ bool FMPPrinterPrivate::_DoPrint(QString data,QString strLabel="")
         {
             if(!strLabel.compare("balance"))
             {
+                if(i==m_print.m_printerTime-1)
+                {
                     QLOG_INFO() <<"ready balance data 58 is"<<m_data;
                     QByteArray tmpData = data.toLocal8Bit();
                     strcpy(m_data,tmpData.data());
@@ -83,6 +87,9 @@ bool FMPPrinterPrivate::_DoPrint(QString data,QString strLabel="")
                     FM_unloaddll();
                     return 1;
                 }
+                QLOG_INFO() <<"one balance is  not";
+                continue;
+            }
             if(data.isEmpty())
             {
                 QLOG_INFO() <<"ready e data isEmpty ";
@@ -105,40 +112,18 @@ bool FMPPrinterPrivate::_DoPrint(QString data,QString strLabel="")
         {
             if(!strLabel.compare("balance"))
             {
+                if(i==m_print.m_printerTime-1)
+                {
                     QLOG_INFO() <<"ready balance data is"<<m_data;
                     QByteArray tmpData = data.toLocal8Bit();
                     strcpy(m_data,tmpData.data());
                     FM_printBalance(m_data);
                     FM_unloaddll();
-            //---1
-            char m_dataini[128]={0};
-            QByteArray tmpDatatime = SendIniDataTime().toLocal8Bit();
-            strcpy(m_dataini,tmpDatatime.data());
-            if(FM_LoadAddress())
-            {
-                QLOG_INFO() <<QString(GB2312ToUnicode("初始化接口函数成功"));
-            }
-            else{
-                return 0;
-            }
-            FM_Initconfigini(m_dataini);
-            QLOG_INFO() <<QString(GB2312ToUnicode("DLL 读取ini配置文件完成"));
-            if( FM_inItConfig()) {
-                QLOG_INFO() <<QString(GB2312ToUnicode("初始化打印机配置成功"));
-            }
-            else {
-                return false;
-            }
-            QLOG_INFO() <<"receive data is"<<data;
-
-            if(!strLabel.compare("balance"))
-            {
-                QLOG_INFO() <<"ready balance data is"<<m_data;
-                FM_printBalance(m_data);
-                FM_unloaddll();
-            }
                     return 1;
                 }
+                QLOG_INFO() <<"one balance is  not";
+                continue;
+            }
             if(data.isEmpty())
             {
                 QLOG_INFO() <<"ready e data isEmpty ";
@@ -148,7 +133,7 @@ bool FMPPrinterPrivate::_DoPrint(QString data,QString strLabel="")
             strcpy(m_data,tmpData.data());
             QLOG_INFO() <<"ready print data is"<<m_data;
             FM_PrintData(m_data);
-        if(!strLabel.isEmpty())
+            if(!strLabel.isEmpty() )
             {
                 QLOG_INFO() <<"ready strLabel data is"<<m_data;
                 QByteArray labelData = strLabel.toLocal8Bit();
@@ -156,11 +141,10 @@ bool FMPPrinterPrivate::_DoPrint(QString data,QString strLabel="")
                 FM_printTscData(m_label);
             }
             FM_unloaddll();
-        return 1;
-    }
-
-    return 0;
 
+        }
+    }
+    return 1;
 }
 
 QString FMPPrinterPrivate::_GetPrintName()
@@ -184,27 +168,32 @@ QString FMPPrinterPrivate::_GetPrintName()
     m_print.m_PrintSize = settings->value(FMP_INIKEY_PRINTERSIZE).toInt();
     m_print.m_level = settings->value(FMP_INIKEY_PRINTERLEVLEL).toString();
     m_print.m_parall = settings->value(FMP_INIKEY_PRINTERPARALL).toString();
-    m_print.type = settings->value(FMP_INIKEY_PRINTERTYPE2).toInt();
     m_print.m_Usb = settings->value(FMP_INIKEY_PRINTERUSB).toString();
-    m_print.m_Ip = settings->value(FMP_INIKEY_PRINTERNET).toString();
+    m_print.m_printerTime =  settings->value(FMP_INIKEY_PRINTERTIME).toInt();
+    qDebug()<<m_print.m_printerTime ;
+    for(int i=0;i<m_print.m_printerTime ; i++)
+    {
+        if(i==m_print.m_printerTime-1)
+        {
+            m_print.type[i] =settings->value(FMP_INIKEY_PRINTERTYPE2).toInt();
+        }
+        else
+        {
+            QStringList strip= settings->value(FMP_INIKEY_PRINTERNET).toString().split("|");
+            foreach (QString str, strip)
+            {
+                m_print.m_Ip[i] = str;
+                m_print.type[i] =3;
+            }
+        }
+    }
     m_print.m_printerLabel = settings->value(FMP_INIKEY_PRINTERLABEL).toString();
     m_print.m_nDays = settings->value(FMP_INIKEY_LOGDAYS).toInt();
-
-    m_print_time.printname = settings->value(FMP_INIKEY_PRINTERNAME_TIME).toString();
-    m_print_time.m_PrintType = settings->value(FMP_INIKEY_PRINTERTYPET_TIME).toInt();
-    m_print_time.m_PrintSize = settings->value(FMP_INIKEY_PRINTERSIZE_TIME).toInt();
-    m_print_time.m_level = settings->value(FMP_INIKEY_PRINTERLEVLEL_TIME).toString();
-    m_print_time.m_parall = settings->value(FMP_INIKEY_PRINTERPARALL_TIME).toString();
-    m_print_time.type = settings->value(FMP_INIKEY_PRINTERTYPE2_TIME).toInt();
-    m_print_time.m_Usb = settings->value(FMP_INIKEY_PRINTERUSB_TIME).toString();
-    m_print_time.m_Ip = settings->value(FMP_INIKEY_PRINTERNET_TIME).toString();
-    m_print_time.m_printerLabel = settings->value(FMP_INIKEY_PRINTERLABEL_TIME).toString();
-    m_print_time.m_nDays = settings->value(FMP_INIKEY_LOGDAYS_TIME).toInt();
     delete settings;
     return m_print.printname;
 }
 
-QString FMPPrinterPrivate::SendIniData()
+QString FMPPrinterPrivate::SendIniData(int times)
 {
     QString m_print_ini = "";
     m_print_ini=((m_print.printname=="")?("XP-80C"):(m_print.printname)).append("|")
@@ -212,32 +201,15 @@ QString FMPPrinterPrivate::SendIniData()
             .append(((QString::number(m_print.m_PrintSize,10)=="")?("56"):QString::number(m_print.m_PrintSize,10))).append("|")
             .append(m_print.m_level==""?("ALL"):m_print.m_level).append("|")
             .append(m_print.m_parall==""?("LPT1"):m_print.m_parall).append("|")
-                  .append(((QString::number(m_print.type,10)=="")?("4"):QString::number(m_print.type,10))).append("|")
+            .append(((QString::number(m_print.type[times],10)=="")?("4"):QString::number(m_print.type[times],10))).append("|")
             .append(m_print.m_Usb==""?"USB-0":m_print.m_Usb).append("|")
-                  .append(m_print.m_Ip==""?"127.0.0.1":m_print.m_Ip).append("|")
+            .append(m_print.m_Ip[times]==""?"127.0.0.1":m_print.m_Ip[times]).append("|")
             .append(m_print.m_printerLabel==""?"Gprinter 2120TF":m_print.m_printerLabel).append("|")
             .append((QString::number(m_print.m_nDays,10)=="")?("10"):QString::number(m_print.m_nDays,10)).append("|");
     FMP_INFO() << "m_print_ini is ok"<<m_print_ini;
     return m_print_ini;
 }
 
-QString FMPPrinterPrivate::SendIniDataTime()
-{
-      QString m_print_ini = "";
-      m_print_ini=((m_print_time.printname=="")?("XP-80C"):(m_print_time.printname)).append("|")
-                  .append(((QString::number(m_print_time.m_PrintType,10)=="")?("1"):QString::number(m_print_time.m_PrintType,10))).append("|")
-                  .append(((QString::number(m_print_time.m_PrintSize,10)=="")?("56"):QString::number(m_print_time.m_PrintSize,10))).append("|")
-                  .append(m_print_time.m_level==""?("ALL"):m_print_time.m_level).append("|")
-                  .append(m_print_time.m_parall==""?("LPT1"):m_print_time.m_parall).append("|")
-                  .append(((QString::number(m_print_time.type,10)=="")?("4"):QString::number(m_print_time.type,10))).append("|")
-                  .append(m_print_time.m_Usb==""?"USB-0":m_print_time.m_Usb).append("|")
-                  .append(m_print_time.m_Ip==""?"127.0.0.1":m_print_time.m_Ip).append("|")
-                  .append(m_print_time.m_printerLabel==""?"Gprinter 2120TF":m_print_time.m_printerLabel).append("|")
-                  .append((QString::number(m_print_time.m_nDays,10)=="")?("10"):QString::number(m_print_time.m_nDays,10)).append("|");
-    FMP_INFO() << "m_print_ini is ok"<<m_print_ini;
-    return m_print_ini;
-}
-
 bool FMPPrinterPrivate::GetInfo(QString &printername,QString data)
 {
     FMP_INFO() << "printname is ok"<<printername;

fmp_printer_p.h

@@ -12,13 +12,13 @@ typedef struct
     QString m_parall; //并口名字
     QString m_Usb;// usb的名字
     QString m_level; //日志的级别设定 默认
-    QString m_Ip ;
+    QString m_Ip[8] ;
     QString m_printerLabel;
     int m_PrintType;    //打印的某种样式
     int m_PrintSize;    //打印的纸张设定
-    int type;
+    int type[8];        //打印端口类型
     int m_nDays;          //删除日志的天数
-
+    int m_printerTime;    //几台设备打印
 
 } PrintClass,*pPrintclass;
 class FMPPrinterPrivate:public QObject
@@ -34,11 +34,11 @@ private:
     bool _DoPrint(QString data,QString strLabel);
     QString _GetPrintName();
     bool GetInfo(QString &printername,QString data);
-    QString SendIniData();
+    QString SendIniData(int times);
     QString SendIniDataTime();
 public:
     FMPPrinter         *q_ptr;
-    PrintClass        m_print,m_print_time;
+    PrintClass        m_print;
 
 private:
     FMPSettingsInterface*  settings;