网络模块为初始化时不能添加请求任务

Author: wangwj-f

.gitignore

@@ -272,3 +272,19 @@ ModelManifest.xml
 /bin/Win32/Release/NetworkTool.exe
 /bin/Win32/Debug/QMultiThreadNetworkd.dll
 /bin/Win32/Release/QMultiThreadNetwork.dll
+/source/GeneratedFiles/Debug/moc_networkuploadrequest.cpp
+/source/GeneratedFiles/Debug/moc_networkrunnable.cpp
+/source/GeneratedFiles/Debug/moc_networkrequest.cpp
+/source/GeneratedFiles/Debug/moc_networkreply.cpp
+/source/GeneratedFiles/Debug/moc_networkmtdownloadrequest.cpp
+/source/GeneratedFiles/Debug/moc_networkmanager.cpp
+/source/GeneratedFiles/Debug/moc_networkdownloadrequest.cpp
+/source/GeneratedFiles/Debug/moc_networkcommonrequest.cpp
+/source/GeneratedFiles/Release/moc_networkuploadrequest.cpp
+/source/GeneratedFiles/Release/moc_networkrunnable.cpp
+/source/GeneratedFiles/Release/moc_networkrequest.cpp
+/source/GeneratedFiles/Release/moc_networkreply.cpp
+/source/GeneratedFiles/Release/moc_networkmtdownloadrequest.cpp
+/source/GeneratedFiles/Release/moc_networkmanager.cpp
+/source/GeneratedFiles/Release/moc_networkdownloadrequest.cpp
+/source/GeneratedFiles/Release/moc_networkcommonrequest.cpp

include/networkmanager.h

@@ -20,6 +20,7 @@ That must be called in the main thread.
 #define NETWORKMANAGER_H
 
 #include <QObject>
+#include <atomic>
 #include "networkreply.h"
 #include "networkdef.h"
 #include "network_global.h"
@@ -96,7 +97,11 @@ private Q_SLOTS:
 private:
     QScopedPointer<NetworkManagerPrivate> d_ptr;
     static NetworkManager* ms_pInstance;
+#if _MSC_VER >= 1700
+    static std::atomic<bool> ms_bIntialized;
+#else
     static bool ms_bIntialized;
+#endif
 };
 
 #endif //NETWORKMANAGER_H

samples/networktool/networktool.cpp

@@ -533,6 +533,7 @@ void NetworkTool::onUpload()
     req.strReqArg = strUploadFilePath; //本地文件路径
     req.bShowProgress = uiAddTask.cb_showProgress->isChecked();
     req.bTryAgainWhileFailed = true;
+    req.mapRawHeader.insert("Authorization", "bearer cn-ad0c0fe1-7643-42c1-8cfa-e7dc74e05e7b");
 
     NetworkReply *pReply = NetworkManager::globalInstance()->addRequest(req);
     if (nullptr != pReply)

source/inc/networkmanager.h

@@ -20,6 +20,7 @@ That must be called in the main thread.
 #define NETWORKMANAGER_H
 
 #include <QObject>
+#include <atomic>
 #include "networkreply.h"
 #include "networkdef.h"
 #include "network_global.h"
@@ -96,7 +97,11 @@ private Q_SLOTS:
 private:
     QScopedPointer<NetworkManagerPrivate> d_ptr;
     static NetworkManager* ms_pInstance;
+#if _MSC_VER >= 1700
+    static std::atomic<bool> ms_bIntialized;
+#else
     static bool ms_bIntialized;
+#endif
 };
 
 #endif //NETWORKMANAGER_H

source/networkmanager.cpp

@@ -620,7 +620,11 @@ bool NetworkManagerPrivate::releaseRequestThread(quint64 uiRequestId)
 
 //////////////////////////////////////////////////////////////////////////
 NetworkManager *NetworkManager::ms_pInstance = nullptr;
+#if _MSC_VER >= 1700
+std::atomic<bool> NetworkManager::ms_bIntialized = false;
+#else
 bool NetworkManager::ms_bIntialized = false;
+#endif
 
 NetworkManager::NetworkManager(QObject *parent)
     : QObject(parent)
@@ -706,6 +710,13 @@ void NetworkManager::fini()
 
 NetworkReply *NetworkManager::addRequest(RequestTask& request)
 {
+    if (NetworkManager::isInitialized())
+    {
+        qDebug() << "[QMultiThreadNetwork] You must call NetworkManager::initialize() before any request.";
+        LOG_INFO("[QMultiThreadNetwork] You must call NetworkManager::initialize() before any request.");
+        return nullptr;
+    }
+
     Q_D(NetworkManager);
     d->resetStopAllFlag();
 
@@ -719,6 +730,13 @@ NetworkReply *NetworkManager::addRequest(RequestTask& request)
 
 NetworkReply *NetworkManager::addBatchRequest(BatchRequestTask& tasks, quint64 &uiBatchId)
 {
+    if (NetworkManager::isInitialized())
+    {
+        qDebug() << "[QMultiThreadNetwork] You must call NetworkManager::initialize() before any request.";
+        LOG_INFO("[QMultiThreadNetwork] You must call NetworkManager::initialize() before any request.");
+        return nullptr;
+    }
+
     Q_D(NetworkManager);
     d->resetStopAllFlag();
 
@@ -840,7 +858,7 @@ void NetworkManager::updateProgress(quint64 uiId, quint64 uiBatchId, qint64 iByt
 
 void NetworkManager::onRequestFinished(const RequestTask &request)
 {
-    //Q_ASSERT(QThread::currentThread() == NetworkManager::globalInstance()->thread());
+    Q_ASSERT(QThread::currentThread() == NetworkManager::globalInstance()->thread());
     Q_D(NetworkManager);
     if (d->isStopAllState())
         return;