Skip to content

F
fmtakeout
Commit 74f20383 by 李定达
Options

1.token修改为正式环境;2.小票打印配置支持串口并口usb口打印

parent d54fb0d1
Showing with 68 additions and 19 deletions
takeout/preDefine.h
......@@ -14,12 +14,12 @@
#define DEFAULT_DBNAME "order.db"
#define DEFAULT_DBFORM "orderlist"
#define SHA256RSA_PRIVATEKEY "MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKbFeAqipCea1OXTR6wmz2D7XKUJ6ffRl/VRgF23kbxhhUseJ1jWJW9n7bJ1DyJsMzNgLzpi5jwCasZlvMAS+TdRYQtlvdHV8EDH8JKVaCn1O+emoN/Tbp+ngZLkZNqu3bWTQ6fBgbun4gyeFC1cXb87kn0dnBdkjnGZ/MuDu9oPAgMBAAECgYEAip3t1iEzgnvOY60GkM+9ZWXoroEcCNEcllqE8OCo8MS6LyLEH7H3ca8XwlJMHxeCQzy6ZLRZnB2CNJ/RkHD01S12JH3NPoeuY04/zhpl1BRq5Zm9iuIMkg5LP1cNjRnB5v8/ENZdLTXYEcrz4d3UDXZXvD2ywqoNNGqMqqp/U1ECQQDma32C2t3LV3lS9QeLejGXwDTeksJ53NzsUoGUOIQNkIC7f66tQfYG6wVWBfGoZTpxcLWweC+jPQ+75knWdmLHAkEAuUkYGKtzIeNmKJ0siew/dY31+Rb/pVHYj7TnZDx3dIYly0mwigQGCU7uVzkADXqyEqU+AQWU+RagQWwmjlWGeQJBALdYiMJ6zUlkDVIJTzuYu6V4d5kzRjQZnmEdNaZvYgQ5G3YWnzOV7OKMV+6fRC8ufVaOzMPinmVRzRdCozZXdTkCQQCapPo6pOasMyqx3TUuTINOr1TMOLjYl65Diz7Rt3IQTGLBAFkbaG5NWJavMADuPyjfTRGqMql7GLpawFSR2aopAkEAmKme0TgKB4EpdxS7xV4/XEm+MuZXE/dAfnN5fNOVueWw+23gDYvLXZAoAZNdpdaWw/CZl66XL6M1RMiDYllNvw=="
#define DEFAULT_ACCESS_TOKEN "1a3bd3e3-02b4-44ac-ab13-65069e85938b"
//#define SHA256RSA_PRIVATEKEY "MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKbFeAqipCea1OXTR6wmz2D7XKUJ6ffRl/VRgF23kbxhhUseJ1jWJW9n7bJ1DyJsMzNgLzpi5jwCasZlvMAS+TdRYQtlvdHV8EDH8JKVaCn1O+emoN/Tbp+ngZLkZNqu3bWTQ6fBgbun4gyeFC1cXb87kn0dnBdkjnGZ/MuDu9oPAgMBAAECgYEAip3t1iEzgnvOY60GkM+9ZWXoroEcCNEcllqE8OCo8MS6LyLEH7H3ca8XwlJMHxeCQzy6ZLRZnB2CNJ/RkHD01S12JH3NPoeuY04/zhpl1BRq5Zm9iuIMkg5LP1cNjRnB5v8/ENZdLTXYEcrz4d3UDXZXvD2ywqoNNGqMqqp/U1ECQQDma32C2t3LV3lS9QeLejGXwDTeksJ53NzsUoGUOIQNkIC7f66tQfYG6wVWBfGoZTpxcLWweC+jPQ+75knWdmLHAkEAuUkYGKtzIeNmKJ0siew/dY31+Rb/pVHYj7TnZDx3dIYly0mwigQGCU7uVzkADXqyEqU+AQWU+RagQWwmjlWGeQJBALdYiMJ6zUlkDVIJTzuYu6V4d5kzRjQZnmEdNaZvYgQ5G3YWnzOV7OKMV+6fRC8ufVaOzMPinmVRzRdCozZXdTkCQQCapPo6pOasMyqx3TUuTINOr1TMOLjYl65Diz7Rt3IQTGLBAFkbaG5NWJavMADuPyjfTRGqMql7GLpawFSR2aopAkEAmKme0TgKB4EpdxS7xV4/XEm+MuZXE/dAfnN5fNOVueWw+23gDYvLXZAoAZNdpdaWw/CZl66XL6M1RMiDYllNvw=="
//#define DEFAULT_ACCESS_TOKEN "1a3bd3e3-02b4-44ac-ab13-65069e85938b"
//正式环境
//#define SHA256RSA_PRIVATEKEY "MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKbFeAqipCea1OXTR6wmz2D7XKUJ6ffRl/VRgF23kbxhhUseJ1jWJW9n7bJ1DyJsMzNgLzpi5jwCasZlvMAS+TdRYQtlvdHV8EDH8JKVaCn1O+emoN/Tbp+ngZLkZNqu3bWTQ6fBgbun4gyeFC1cXb87kn0dnBdkjnGZ/MuDu9oPAgMBAAECgYEAip3t1iEzgnvOY60GkM+9ZWXoroEcCNEcllqE8OCo8MS6LyLEH7H3ca8XwlJMHxeCQzy6ZLRZnB2CNJ/RkHD01S12JH3NPoeuY04/zhpl1BRq5Zm9iuIMkg5LP1cNjRnB5v8/ENZdLTXYEcrz4d3UDXZXvD2ywqoNNGqMqqp/U1ECQQDma32C2t3LV3lS9QeLejGXwDTeksJ53NzsUoGUOIQNkIC7f66tQfYG6wVWBfGoZTpxcLWweC+jPQ+75knWdmLHAkEAuUkYGKtzIeNmKJ0siew/dY31+Rb/pVHYj7TnZDx3dIYly0mwigQGCU7uVzkADXqyEqU+AQWU+RagQWwmjlWGeQJBALdYiMJ6zUlkDVIJTzuYu6V4d5kzRjQZnmEdNaZvYgQ5G3YWnzOV7OKMV+6fRC8ufVaOzMPinmVRzRdCozZXdTkCQQCapPo6pOasMyqx3TUuTINOr1TMOLjYl65Diz7Rt3IQTGLBAFkbaG5NWJavMADuPyjfTRGqMql7GLpawFSR2aopAkEAmKme0TgKB4EpdxS7xV4/XEm+MuZXE/dAfnN5fNOVueWw+23gDYvLXZAoAZNdpdaWw/CZl66XL6M1RMiDYllNvw=="
//#define DEFAULT_ACCESS_TOKEN "5c1bf782-a117-4aed-8ddc-66a415820d34"
#define SHA256RSA_PRIVATEKEY "MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKbFeAqipCea1OXTR6wmz2D7XKUJ6ffRl/VRgF23kbxhhUseJ1jWJW9n7bJ1DyJsMzNgLzpi5jwCasZlvMAS+TdRYQtlvdHV8EDH8JKVaCn1O+emoN/Tbp+ngZLkZNqu3bWTQ6fBgbun4gyeFC1cXb87kn0dnBdkjnGZ/MuDu9oPAgMBAAECgYEAip3t1iEzgnvOY60GkM+9ZWXoroEcCNEcllqE8OCo8MS6LyLEH7H3ca8XwlJMHxeCQzy6ZLRZnB2CNJ/RkHD01S12JH3NPoeuY04/zhpl1BRq5Zm9iuIMkg5LP1cNjRnB5v8/ENZdLTXYEcrz4d3UDXZXvD2ywqoNNGqMqqp/U1ECQQDma32C2t3LV3lS9QeLejGXwDTeksJ53NzsUoGUOIQNkIC7f66tQfYG6wVWBfGoZTpxcLWweC+jPQ+75knWdmLHAkEAuUkYGKtzIeNmKJ0siew/dY31+Rb/pVHYj7TnZDx3dIYly0mwigQGCU7uVzkADXqyEqU+AQWU+RagQWwmjlWGeQJBALdYiMJ6zUlkDVIJTzuYu6V4d5kzRjQZnmEdNaZvYgQ5G3YWnzOV7OKMV+6fRC8ufVaOzMPinmVRzRdCozZXdTkCQQCapPo6pOasMyqx3TUuTINOr1TMOLjYl65Diz7Rt3IQTGLBAFkbaG5NWJavMADuPyjfTRGqMql7GLpawFSR2aopAkEAmKme0TgKB4EpdxS7xV4/XEm+MuZXE/dAfnN5fNOVueWw+23gDYvLXZAoAZNdpdaWw/CZl66XL6M1RMiDYllNvw=="
#define DEFAULT_ACCESS_TOKEN "5c1bf782-a117-4aed-8ddc-66a415820d34"
#define TIMEOUT_TRY_LOGING 20000
......@@ -255,4 +255,6 @@
#define DEFAULT_PRINTF_MAIN_SESSION "Printer"
#define DEFAULT_PRINTF_OTHER_SESSION "OtherPrinter"
#define DEFAULT_SESSION_COMDEF "COMDEF"
#endif // PREDEFINE_H
takeout/takeout.rc
......@@ -4,8 +4,8 @@
#include <winver.h>
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,0,0,4
PRODUCTVERSION 2,0,0,4
FILEVERSION 2,0,0,5
PRODUCTVERSION 2,0,0,5
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
......@@ -22,12 +22,12 @@ VS_VERSION_INFO VERSIONINFO
BEGIN
VALUE "CompanyName", "ShangHai Freemud Co., Ltd."
VALUE "FileDescription", "FREEMUD Manager System"
VALUE "FileVersion", "2.0.0.4"
VALUE "FileVersion", "2.0.0.5"
VALUE "InternalName", "FREEMUD"
VALUE "LegalCopyright", "Copyright (C)2017-2020"
VALUE "OriginalFilename", "fmTakeout.exe"
VALUE "ProductName", "fmTakeout"
VALUE "ProductVersion", "2.0.0.4"
VALUE "ProductVersion", "2.0.0.5"
END
END
BLOCK "VarFileInfo"
......
takeout/view/prtsettingform.cpp
......@@ -35,7 +35,7 @@ PrtSettingForm::PrtSettingForm(QWidget *parent) :
* labe_high 标签纸高
* label_type 标签打印类型
****************/
void PrtSettingForm::GetData(char *data, QString type, QString ip, QString name, QString label_name, QString label_wigth, QString labe_high, QString label_type)
void PrtSettingForm::GetData(char *data, QString type, QString lptname, QString usbname, QString ip, QString name, QString label_name, QString label_wigth, QString labe_high, QString label_type)
{
std::string ini;
//ini.append(config.value("Printer/Name").toString());
......@@ -63,7 +63,11 @@ void PrtSettingForm::GetData(char *data, QString type, QString ip, QString name,
ini.append("All");
ini.append("|");
//ini.append(config.value("Printer/parallel").toString());
ini.append("3");
if(!lptname.isEmpty())
ini.append(lptname.toUtf8().data());
else
ini.append("LPT1");
//ini.append("3");
ini.append("|");
//ini.append(config.value("Printer/type").toString());
if(!type.isEmpty())
......@@ -75,7 +79,11 @@ void PrtSettingForm::GetData(char *data, QString type, QString ip, QString name,
//ini.append("4");
ini.append("|");
//ini.append(config.value("Printer/usb").toString());
ini.append("BYUSB3");
if(!usbname.isEmpty())
ini.append(usbname.toUtf8().data());
else
ini.append("BYUSB-0");
//ini.append("BYUSB3");
ini.append("|");
//ini.append(config.value("Printer/IP").toString());
if(label_name.isEmpty())
......@@ -206,9 +214,31 @@ void PrtSettingForm::on_pushButton_test_clicked()
if(ui->radioButton_dev->isChecked())
type = "4";
else if(ui->radioButton_com->isChecked())
type = "0";
else if(ui->radioButton_lpt->isChecked())
type = "1";
else if(ui->radioButton_usb->isChecked())
type = "2";
else
type = "3";
QString session = DEFAULT_SESSION_COMDEF;
QString filename = qApp->applicationDirPath() + "/" + PREINTER_CONSS;
QLOG_DEBUG() << "printf file name : " << filename;
if(QString("0").compare(type) == 0)
{
QSettings(filename, QSettings::IniFormat).setValue(session + "/" + "Baudrate", ui->comboBox_com_btl->currentText());
QSettings(filename, QSettings::IniFormat).setValue(session + "/" + "com", ui->lineEdit_com->text());
QSettings(filename, QSettings::IniFormat).setValue(session + "/" + "DataBits", ui->comboBox_com_suw->currentText());
QSettings(filename, QSettings::IniFormat).setValue(session + "/" + "StopBits", ui->comboBox_com_stop->currentText());
QSettings(filename, QSettings::IniFormat).setValue(session + "/" + "Parity", ui->comboBox_com_jy->currentText());
QSettings(filename, QSettings::IniFormat).setValue(session + "/" + "FlowControl", ui->comboBox_com_control->currentText());
}
QString labtype;
if(ui->comboBox_zlj->currentIndex() == 1)
......@@ -218,7 +248,7 @@ void PrtSettingForm::on_pushButton_test_clicked()
QLOG_INFO() << type;
GetData(arr, type, ui->lineEdit_ip->text(), name, ui->lineEdit_lab_name->text(), ui->lineEdit_lab_widgh->text(),
GetData(arr, type, ui->lineEdit_lpt->text(), ui->lineEdit_usb->text(), ui->lineEdit_ip->text(), name, ui->lineEdit_lab_name->text(), ui->lineEdit_lab_widgh->text(),
ui->lineEdit_lab_high->text(), labtype);
QLOG_INFO() << "prt info" << arr;
......@@ -271,7 +301,7 @@ void PrtSettingForm::on_btn_lab_test_clicked()
labtype = "1";
GetData(arr, type, ui->lineEdit_ip->text(), name, labelname, ui->lineEdit_lab_widgh->text(),
GetData(arr, type, ui->lineEdit_lpt->text(), ui->lineEdit_usb->text(),ui->lineEdit_ip->text(), name, labelname, ui->lineEdit_lab_widgh->text(),
ui->lineEdit_lab_high->text(), labtype);
QLOG_INFO() << "prt info" << arr;
......@@ -305,9 +335,27 @@ void PrtSettingForm::on_pushButton_save_clicked()
QString type = "4";
if(ui->radioButton_dev->isChecked())
type = "3";
else
type = "4";
else if(ui->radioButton_com->isChecked())
type = "0";
else if(ui->radioButton_lpt->isChecked())
type = "1";
else if(ui->radioButton_usb->isChecked())
type = "2";
else
type = "3";
QString filename = qApp->applicationDirPath() + "/" + PREINTER_CONSS;
if(QString("0").compare(type) == 0)
{
QSettings(filename, QSettings::IniFormat).setValue(QString(DEFAULT_SESSION_COMDEF) + "/" + "Baudrate", ui->comboBox_com_btl->currentText());
QSettings(filename, QSettings::IniFormat).setValue(QString(DEFAULT_SESSION_COMDEF) + "/" + "com", ui->lineEdit_com->text());
QSettings(filename, QSettings::IniFormat).setValue(QString(DEFAULT_SESSION_COMDEF) + "/" + "DataBits", ui->comboBox_com_suw->currentText());
QSettings(filename, QSettings::IniFormat).setValue(QString(DEFAULT_SESSION_COMDEF) + "/" + "StopBits", ui->comboBox_com_stop->currentText());
QSettings(filename, QSettings::IniFormat).setValue(QString(DEFAULT_SESSION_COMDEF) + "/" + "Parity", ui->comboBox_com_jy->currentText());
QSettings(filename, QSettings::IniFormat).setValue(QString(DEFAULT_SESSION_COMDEF) + "/" + "FlowControl", ui->comboBox_com_control->currentText());
}
QString Wigth = ui->comboBox_width->currentText();
QString Ip = ui->lineEdit_ip->text();
......@@ -315,8 +363,6 @@ void PrtSettingForm::on_pushButton_save_clicked()
if(Ip.isEmpty())
Ip = "127.0.0.1";
QString filename = qApp->applicationDirPath() + "/" + PREINTER_CONSS;
QLOG_DEBUG() << "printf file name : " << filename;
if(Wigth.isEmpty() || name.isEmpty())
......@@ -329,7 +375,8 @@ void PrtSettingForm::on_pushButton_save_clicked()
else
QSettings(confilename, QSettings::IniFormat).setValue(INI_NEEDPTR, 0);
QSettings(filename, QSettings::IniFormat).setValue(session + "/" + "usb", ui->lineEdit_usb->text());
QSettings(filename, QSettings::IniFormat).setValue(session + "/" + "parallel", ui->lineEdit_lpt->text());
QSettings(filename, QSettings::IniFormat).setValue(session + "/" + "printType", type);
QSettings(filename, QSettings::IniFormat).setValue(session + "/" + "type", type);
QSettings(filename, QSettings::IniFormat).setValue(session + "/" + "IP", Ip);
......
takeout/view/prtsettingform.h
......@@ -14,7 +14,7 @@ class PrtSettingForm : public QDialog
public:
explicit PrtSettingForm(QWidget *parent = 0);
~PrtSettingForm();
void GetData(char *data, QString type, QString ip, QString name, QString label_name, QString label_wigth, QString labe_high, QString label_type);
void GetData(char *data, QString type, QString lptname, QString usbname, QString ip, QString name, QString label_name, QString label_wigth, QString labe_high, QString label_type);
private slots:
void on_pushButton_test_clicked();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment