1.实现可配置网络读写超时时间 2.更换图标

POS/setting.cpp

@@ -244,7 +244,7 @@ bool Setting::doRequest(const QByteArray &reqData, QByteArray &rspData)
     int sendDataLen = reqData.length();
 
     // 如果需要，加上消息头
-    if(Instance()->settingObj["NeedSocketHeader"].toBool()) {
+    if(Instance()->settingObj["NeedSocketHeader"].toBool() || true) {
         char *sendDataWithHeader = new char[sendDataLen + sizeof(FMSOCKHEADER)];
         FMSOCKHEADER header = { 0, 0, 0 };
         header.flag = 0x4d46;
@@ -259,12 +259,12 @@ bool Setting::doRequest(const QByteArray &reqData, QByteArray &rspData)
         socket.write(sendData, sendDataLen);
     }
 
-    if(!socket.waitForBytesWritten(10 * 1000)) {
+    if(!socket.waitForBytesWritten()) {
         Instance()->setErrorString(QString("Write data failed. ").arg(socket.errorString()));
         socket.close();
         return false;
     }
-    if(!socket.waitForReadyRead()) {
+    if(!socket.waitForReadyRead(1000*Instance()->settingObj["WaitReadTime"].toInt(120))) {
         Instance()->setErrorString(QString("Read data failed.").arg(socket.errorString()));
         socket.close();
         return false;