taynpg/frelay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clientcore: Regardless of whether it is connected, the ClientCore will be uniformly managed by a new thread.

Browse Source
This commit is contained in:
taynpg
2025-06-20 14:33:51 +08:00
parent 0334b22ad6
commit 9c012b9613
7 changed files with 100 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
Gui/Control/ConnectControl.cpp
View File

@@ -18,10 +18,38 @@ Connecter::~Connecter()
delete ui;
}
void Connecter::SetClientCore(ClientCore* clientCore)
void Connecter::RunWorker(ClientCore* clientCore)
{
clientCore_ = clientCore;
connect(clientCore_, &ClientCore::sigClients, this, &Connecter::HandleClients);
sockWorker_ = new SocketWorker(clientCore_, nullptr);
clientCore_->moveToThread(sockWorker_);
connect(clientCore_, &ClientCore::conSuccess, this, [this]() {
setState(ConnectState::CS_CONNECTED);
qInfo() << QString(tr("Connected."));
});
connect(clientCore_, &ClientCore::conFailed, this, [this]() {
setState(ConnectState::CS_DISCONNECT);
qInfo() << QString(tr("Connect failed."));
});
connect(clientCore_, &ClientCore::connecting, this, [this]() {
setState(ConnectState::CS_CONNECTING);
qInfo() << QString(tr("Connecting..."));
});
connect(clientCore_, &ClientCore::sigDisconnect, this, [this]() {
setState(ConnectState::CS_DISCONNECT);
qInfo() << QString(tr("Disconnected."));
});
connect(this, &Connecter::sigDoConnect, clientCore_, &ClientCore::DoConnect);
connect(sockWorker_, &QThread::finished, sockWorker_, &QObject::deleteLater);
sockWorker_->start();
}
void Connecter::SetRemoteCall(const std::function<void(const QString& id)>& call)
@@ -46,33 +74,7 @@ void Connecter::Connect()
FTCommon::msg(this, tr("IP or Port is empty."));
return;
}
sockWorker_ = new SocketWorker(clientCore_, nullptr);
clientCore_->moveToThread(sockWorker_);
connect(sockWorker_, &SocketWorker::conSuccess, this, [this]() {
setState(ConnectState::CS_CONNECTED);
qInfo() << QString(tr("Connected."));
});
connect(sockWorker_, &SocketWorker::conFailed, this, [this]() {
setState(ConnectState::CS_DISCONNECT);
qInfo() << QString(tr("Connect failed."));
});
connect(sockWorker_, &SocketWorker::connecting, this, [this]() {
setState(ConnectState::CS_CONNECTING);
qInfo() << QString(tr("Connecting..."));
});
connect(sockWorker_, &SocketWorker::disconnected, this, [this]() {
setState(ConnectState::CS_DISCONNECT);
qInfo() << QString(tr("Disconnected."));
});
connect(sockWorker_, &QThread::finished, sockWorker_, &QObject::deleteLater);
sockWorker_->SetConnectInfo(ip, port.toInt());
sockWorker_->start();
emit sigDoConnect(ip, port.toInt());
}
void Connecter::setState(ConnectState cs)
@@ -107,7 +109,7 @@ void Connecter::RefreshClient()
auto frame = QSharedPointer<FrameBuffer>::create();
frame->data = infoPack(info);
frame->type = FBT_SER_MSG_ASKCLIENTS;
auto sendRet = ClientCore::asyncInvoke(clientCore_, [this, frame]() { return clientCore_->Send(frame); });
auto sendRet = ClientCore::syncInvoke(clientCore_, [this, frame]() { return clientCore_->Send(frame); });
if (!sendRet) {
qCritical() << QString(tr("send ask client list failed."));
return;

3
Gui/Control/ConnectControl.h
View File

@@ -26,12 +26,13 @@ public:
~Connecter();
public:
void SetClientCore(ClientCore* clientCore);
void RunWorker(ClientCore* clientCore);
void SetRemoteCall(const std::function<void(const QString& id)>& call);
void HandleClients(const InfoClientVec& clients);
signals:
void sendConnect(ConnectState cs);
void sigDoConnect(const QString& ip, quint16 port);
private:
void InitControl();

45
Gui/frelayGUI.cpp
View File

@@ -40,7 +40,7 @@ void frelayGUI::InitControl()
transform_->SetClientCore(clientCore_);
connecter_ = new Connecter(this);
connecter_->SetClientCore(clientCore_);
connecter_->RunWorker(clientCore_);
connecter_->SetRemoteCall([this](const QString& id) { clientCore_->SetRemoteID(id); });
localFile_ = new FileManager(this);
@@ -88,30 +88,25 @@ void frelayGUI::ControlLayout()
void frelayGUI::ControlMsgHander(QtMsgType type, const QMessageLogContext& context, const QString& msg)
{
Q_UNUSED(context);
//if (!qApp || !qobject_cast<frelayGUI*>(qApp->activeWindow())) {
// return;
//}
switch (type) {
case QtDebugMsg:
logPrint->Debug(msg);
break;
case QtInfoMsg:
logPrint->Info(msg);
break;
case QtWarningMsg:
logPrint->Warn(msg);
break;
case QtCriticalMsg:
case QtFatalMsg:
logPrint->Error(msg);
break;
default:
logPrint->Error("Unknown QtMsgType type.");
break;
}
QMetaObject::invokeMethod(
qApp,
[type, msg]() {
switch (type) {
case QtDebugMsg:
logPrint->Debug(msg);
break;
case QtInfoMsg:
logPrint->Info(msg);
break;
case QtWarningMsg:
logPrint->Warn(msg);
break;
default:
logPrint->Error(msg);
break;
}
},
Qt::QueuedConnection);
}
void frelayGUI::HandleTask(const QVector<TransTask>& tasks)