重写配置

JxcClient.pro

@@ -88,3 +88,5 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 
 RESOURCES += \
     images.qrc
+
+include($$PWD/pqQtlib/pqQtlib.pri)

configinfo.cpp

@@ -15,59 +15,39 @@ ConfigInfo::~ConfigInfo()
 void ConfigInfo::Start()
 {
 
-    m_psetting = new QSettings(FileName, QSettings::IniFormat);
+//    m_psetting = new QSettings(FileName, QSettings::IniFormat);
 
     //判断配置文件是否存在
     QFileInfo fileInfo(FileName);
     if(!fileInfo.exists()){
         qDebug()<<"配置文件不存在";
-        Set("url","baseUrl","http://erp.itwsw.cn/api");
-        Set("hardware","printerName","");
-        Set("ElectronicScale","portName","COM1");
-        Set("ElectronicScale","portBaudRate",9600);
-        Set("ElectronicScale","portType",0);
-        Set("hardware","savePrinter",true);
-        m_psetting->sync();
+        QJsonObject obj;
+        obj.insert("baseUrl","http://erp.itwsw.cn/api");
+        obj.insert("printerName","");
+        obj.insert("portName","COM1");
+        obj.insert("portBaudRate",9600);
+        obj.insert("portType",0);
+        obj.insert("savePrinter",true);
+        Set(obj);
 //        return;
     }
-//   if(fileInfo.exists())
-//   {
-//        qDebug()<<"配置文件已存在";
-        //url接口地址
-        baseUrl = Get("url","baseUrl").toString();//服务器地址
 
-        //本机用户信息
-//        packId = Get("user","packId").toInt();//打包点id
+    GetConfig();
 
-        //硬件
-        printerName = Get("hardware","printerName").toString();//打印机名称
-
-        //电子秤
-        portName = Get("ElectronicScale","portName").toString();//串口名称
-        portBaudRate = Get("ElectronicScale","portBaudRate").toString();//串口波特率
-        portType = Get("ElectronicScale","portType").toInt();
-        savePrinter = Get("hardware","savePrinter").toBool();
-
-//   }else{
-//        qDebug()<<"配置文件不存在";
-//        //url接口地址
-//        Set("url","baseUrl","http://erp.itwsw.cn/api");
-
-//        //本机用户信息
-//        Set("user","packId",1031);
-
-//        //硬件
-//        Set("hardware","printerName","Deli DL-820T");
-//   }
 }
 
-void ConfigInfo::Set(QString qstrnodename,QString qstrkeyname,QVariant qvarvalue)
+void ConfigInfo::Set(QJsonObject obj)
 {
-    m_psetting->setValue(QString("/%1/%2").arg(qstrnodename).arg(qstrkeyname), qvarvalue);
+    PQ::ConfigFile::writeObject("Config.json",obj);
 }
 
-QVariant ConfigInfo::Get(QString name,QString keyname)
+void ConfigInfo::GetConfig()
 {
-    QVariant qvar = m_psetting->value(QString("/%1/%2").arg(name).arg(keyname));
-    return qvar;
+    QJsonObject obj = PQ::ConfigFile::readObject("Config.json");
+    baseUrl = obj.value("baseUrl").toString();
+    printerName = obj.value("printerName").toString();
+    portName = obj.value("portName").toString();
+    portBaudRate = obj.value("portBaudRate").toString();
+    portType = obj.value("portType").toInt();
+    savePrinter = obj.value("savePrinter").toBool();
 }

configinfo.h

@@ -7,6 +7,9 @@
 #include "QDir"
 #include "QDebug"
 #include "QMessageBox"
+#include "QJsonObject"
+#include "pqQtlib/utils/pqfileutils.h"
+#include "QJsonDocument"
 
 class ConfigInfo
 {
@@ -35,12 +38,12 @@ public:
 
 
 
-    void Set(QString qstrnodename,QString qstrkeyname,QVariant qvarvalue);
-    QVariant Get(QString qstrnodename,QString qstrkeyname);
+    void Set(QJsonObject obj);
+    void GetConfig();
 //    void Init();
     void Start();
 private:
-    QString FileName = QCoreApplication::applicationDirPath() + "/Config.ini";
+    QString FileName = PQ::ConfigFile::configFile("Config.json");
     QSettings *m_psetting;
 
 };

struct_/packinfo.cpp

@@ -61,6 +61,16 @@ QJsonObject BoxInfo::toObject()
 {
     QJsonObject ret;
     //todo: 小宋
+    ret.insert("box_weight",box_weight);
+    ret.insert("tube_weight",tube_number);
+    ret.insert("bucket_weight",bucket_weight);
+    ret.insert("gross_weight",bucket_weight);
+    ret.insert("net_weight",net_weight);
+    ret.insert("Level",Level);
+    ret.insert("twist_type",twist_type);
+    ret.insert("bucket_color",bucket_color);
+    ret.insert("sort",sort);
+    ret.insert("remark",remark);
     return ret;
 }
 
@@ -71,6 +81,16 @@ QSharedPointer<BoxInfo> BoxInfo::fromObject(QSharedPointer<PackInfo> & pack,QJso
     QSharedPointer<BoxInfo> ret(new BoxInfo(pack,""));
     ret->case_number = case_number;
     // TODO 小宋
+    ret->box_weight = obj.value("box_weight").toInt();
+    ret->tube_number = obj.value("tube_number").toInt();
+    ret->bucket_weight = obj.value("tube_number").toInt();
+    ret->gross_weight = obj.value("gross_weight").toInt();
+    ret->net_weight = obj.value("net_weight").toInt();
+    ret->Level = obj.value("Level").toString();
+    ret->twist_type = obj.value("bucket_color").toString();
+    ret->bucket_color = obj.value("bucket_color").toString();
+    ret->sort = obj.value("sort").toString();
+    ret->remark = obj.value("remark").toString();
     return ret;
 }
 
@@ -78,7 +98,19 @@ QJsonObject PackInfo::toObject()
 {
     QJsonObject ret;
     ret.insert("time",QString::number(this->time()));
+
     //todo: 小宋
+    ret.insert("quantity",quantity);
+    ret.insert("level_id",level_id);
+    ret.insert("level",level);
+    ret.insert("machine_no",machine_no);
+    ret.insert("packing_time",packing_time);
+    ret.insert("packing_type",packing_type);
+    ret.insert("operator_id",operator_id);
+    ret.insert("carton_type",carton_type);
+    ret.insert("remark",remark);
+    ret.insert("telephone",telephone);
+    ret.insert("customer",customer);
     return ret;
 }
 
@@ -94,6 +126,17 @@ QSharedPointer<PackInfo> PackInfo::fromObject(QJsonObject &obj)
     ret->_time = obj.value("time").toString().toLongLong();
 
     //todo: 小宋
+    ret->quantity = obj.value("quantity").toInt();
+    ret->level_id = obj.value("level_id").toInt();
+    ret->level = obj.value("level").toString();
+    ret->machine_no = obj.value("machine_no").toString();
+    ret->packing_time = obj.value("packing_time").toString();
+    ret->packing_type = obj.value("packing_type").toString();
+    ret->operator_id = obj.value("operator_id").toInt();
+    ret->carton_type = obj.value("canton_type").toString();
+    ret->remark = obj.value("remark").toString();
+    ret->telephone = obj.value("telephone").toString();
+    ret->customer = obj.value("customer").toString();
     return ret;
 }
 

struct_/projectinfo.cpp

@@ -5,6 +5,32 @@ QJsonObject ProjectInfo::toObject()
 {
     QJsonObject ret;
     // TODO: 小宋
+    ret.insert("goods_id",goods_id);
+    ret.insert("batch_no",batch_no);
+    ret.insert("category",category);
+    ret.insert("product_type_code",product_type_code);
+    ret.insert("spec_role",spec_role);
+    ret.insert("denier",denier);
+    ret.insert("dtex",dtex);
+    ret.insert("fiber",fiber);
+    ret.insert("specs",specs);
+    ret.insert("color",color);
+    ret.insert("twist_type",twist_type);
+    ret.insert("bucket_color",bucket_color);
+    ret.insert("box_weight",box_weight);
+    ret.insert("bucket_weight",bucket_weight);
+    ret.insert("machine_no",machine_no);
+    ret.insert("carton_type",carton_type);
+    ret.insert("limit_number",limit_number);
+    ret.insert("bucket_number",bucket_number);
+    ret.insert("cake_float",cake_float);
+    ret.insert("box_float",box_float);
+    ret.insert("box_rule",box_rule);
+    ret.insert("customer",customer);
+    ret.insert("remark",remark);
+    ret.insert("is_disable",is_disable);
+    ret.insert("create_time",create_time);
+    ret.insert("modified_time",modified_time);
     return ret;
 }
 

widget/settingsform.cpp

@@ -49,10 +49,13 @@ void SettingsForm::on_back_btn_clicked()
 
 void SettingsForm::on_save_btn_clicked()
 {
-    config.Set("url","baseUrl",ui->baseUrlLine->text());
-    config.Set("hardware","printerName",ui->printerName->currentText());
-    config.Set("ElectronicScale","portName",ui->portName->currentText());
-    config.Set("ElectronicScale","portBaudRate",ui->portBaudRate->currentText());
-    config.Set("ElectronicScale","portType",ui->comboBox_2->currentIndex());
+
+    QJsonObject obj;
+    obj.insert("baseUrl",ui->baseUrlLine->text());
+    obj.insert("printerName",ui->printerName->currentText());
+    obj.insert("portName",ui->portName->currentText());
+    obj.insert("portBaudRate",ui->portBaudRate->currentText());
+    obj.insert("portType",ui->comboBox_2->currentIndex());
+    config.Set(obj);
     QMessageBox::information(this,"提示","请重新启动程序，以使用新配置！");
 }