尝试改成asio通信
This commit is contained in:
@@ -6,7 +6,7 @@ set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 11)
|
||||
set(CMAKE_CXX_STANDARD 20)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
add_definitions(-DUSE_QT_GUI)
|
||||
|
||||
@@ -43,13 +43,17 @@ frelayGUI::frelayGUI(QWidget* parent) : QDialog(parent), ui(new Ui::frelayGUI)
|
||||
|
||||
frelayGUI::~frelayGUI()
|
||||
{
|
||||
if (ioContextTh_.joinable()) {
|
||||
ioContext_.stop();
|
||||
ioContextTh_.join();
|
||||
}
|
||||
delete ui;
|
||||
}
|
||||
|
||||
void frelayGUI::InitControl()
|
||||
{
|
||||
logPrint = new LogPrint(this);
|
||||
clientCore_ = new ClientCore();
|
||||
clientCore_ = new ClientCore(nullptr, ioContext_);
|
||||
|
||||
compare_ = new Compare(this);
|
||||
transform_ = new TransForm(this);
|
||||
@@ -81,6 +85,7 @@ void frelayGUI::InitControl()
|
||||
}
|
||||
});
|
||||
connect(connecter_, &Connecter::sigConfirmUse, remoteFile_, &FileManager::evtHome);
|
||||
ioContextTh_ = std::thread([this]() { ioContext_.run(); });
|
||||
}
|
||||
|
||||
void frelayGUI::ControlSignal()
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
#include "Control/FileControl.h"
|
||||
#include "Form/Transform.h"
|
||||
#include "GuiUtil/Config.h"
|
||||
#include <asio.hpp>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
namespace Ui {
|
||||
@@ -50,6 +51,8 @@ private:
|
||||
ClientCore* clientCore_;
|
||||
TransForm* transform_;
|
||||
Compare* compare_;
|
||||
std::thread ioContextTh_;
|
||||
asio::io_context ioContext_;
|
||||
std::shared_ptr<FrelayConfig> config_;
|
||||
};
|
||||
#endif // FRELAYGUI_H
|
||||
|
||||
Reference in New Issue
Block a user