1. 完善结算备份重发功能。 2. 修复日志乱码。

FMVip_LXJ/backup/fmbackup.cpp

@@ -35,7 +35,7 @@ bool FMBackup::connect()
     if(!QFile::exists(dbname)) {
         isOk = createTable(dbname);
     } else {
-        _db = QSqlDatabase::addDatabase("QSQLITE");
+        _db = QSqlDatabase::addDatabase("QSQLITE", "fmvipbackupdb");
         _db.setDatabaseName(dbname);
         isOk =_db.open();
     }
@@ -50,7 +50,7 @@ bool FMBackup::connect()
 
 bool FMBackup::createTable(const QString &dbname)
 {
-    _db = QSqlDatabase::addDatabase("QSQLITE");
+    _db = QSqlDatabase::addDatabase("QSQLITE", "fmvipbackupdb");
     _db.setDatabaseName(dbname);
     _db.open();
     QSqlQuery query(_db);

FMVip_LXJ/backup/resend.cpp

@@ -33,16 +33,20 @@ void ReSend::trySend()
             break;
         } else{
             FMBackup::instance()->removeReqData(id);
-            qDebug() << "重发响应成功："<< data;
+            qDebug() << "重发响应成功："<< QString::fromUtf8(data);
         }
     }
 }
 
 void ReSend::run()
 {
+    int waitTime = 0;
     while(true)
     {
-        trySend();
-        QThread::sleep(5);
+        if(++waitTime > 30) {
+            trySend();
+            waitTime = 0;
+        }
+        QThread::sleep(1);
     }
 }

FMVip_LXJ/fmnetwork.cpp

 #include "fmnetwork.h"
 #include "global.h"
+#include "fmsetting.h"
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
@@ -48,14 +49,18 @@ QByteArray FMNetwork::send(const QString *url, const QByteArray *data)
     if(timer.isActive())
     {
         timer.stop();
+
         if (reply->error() == QNetworkReply::NoError) {
             rspData = reply->readAll();
         } else {
             int err = reply->error();
             setError(FM_API_NETWORERROR, err, netErrInfo(err));
+            qDebug() << QString::fromLocal8Bit("Network error: (%1) %2").arg(err).arg(reply->errorString());
+            qDebug() << QString::fromLocal8Bit("Network reply: %1.").arg(QString::fromUtf8(reply->readAll()));
         }
     }else{
         setError(FM_API_TIMEOUT);
+        qDebug() << QString::fromLocal8Bit("Timeout.");
     }
     return rspData;
 }

FMVip_LXJ/task/fmtask.cpp

@@ -47,8 +47,8 @@ QByteArray FMTask::doTask()
         (this->*fun)();
         qDebug() << "Run over function: " << index++;
         if(error() != FM_API_SUCCESS) {
-            qDebug() << QString("Task error %1: %2").arg(error()).arg(errorString());
-            return QString(ErrorMsgJson).arg(error()).arg(errorString()).toUtf8();
+            qDebug() << QString::fromLocal8Bit("Task error %1: %2").arg(error()).arg(errorString());
+            return QString::fromLocal8Bit(ErrorMsgJson).arg(error()).arg(errorString()).toLocal8Bit();
         }
     }
 

FMVip_LXJ/task/taskfinal.cpp

@@ -82,7 +82,7 @@ bool TaskFinal::sendToServer(bool isShowMsg)
     FMTask::sendToServer(false);
 
     // 备份
-    if(error() == FM_API_NETWORERROR) {
+    if(error() == FM_API_NETWORERROR || error() == FM_API_TIMEOUT) {
 
         if(searchJsonValue(serverReqJsonObj,ServerProps(PosProps.CodeAmount)).toInt() == 0 &&
            searchJsonValue(serverReqJsonObj,ServerProps(PosProps.ScoreAmount)).toInt() == 0 &&
@@ -137,7 +137,7 @@ QString TaskFinal::backup()
             .arg(newId, 5, 10, QChar('0'));
     QJsonDocument json(serverReqJsonObj);
     bool isOk = FMBackup::instance()->updateReqData(newId, this->url, json.toJson(QJsonDocument::Compact));
-    if(isOk && uuid.length()==20) {
+    if(isOk) {
         return uuid;
     }
     return "";