diff --git a/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp b/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp index c39f12f..e0ae822 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp +++ b/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp @@ -31,16 +31,16 @@ void SendSystem::sendDisable() socket->waitForBytesWritten(); } -void SendSystem::sendXMLmsgGUItoServer(QByteArray array) -{ - qDebug() << "SendSystem" << QThread::currentThreadId(); - QDataStream stream(socket); - stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); +//void SendSystem::sendXMLmsgGUItoServer(QByteArray array) +//{ +// qDebug() << "SendSystem" << QThread::currentThreadId(); +// QDataStream stream(socket); +// stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); - stream << PacketType::TYPE_XMLANSWER; - stream << array; - socket->waitForBytesWritten(6000); -} +// stream << PacketType::TYPE_XMLANSWER; +// stream << array; +// socket->waitForBytesWritten(6000); +//} void SendSystem::sendFileBlock(QString path) { diff --git a/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h b/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h index 69b7107..4ecb9f3 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h +++ b/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h @@ -14,7 +14,7 @@ class SendSystem :public QObject public: explicit SendSystem(QObject* parent = nullptr); void setSocket(QTcpSocket *socket); - void sendXMLmsgGUItoServer(QByteArray array); + //void sendXMLmsgGUItoServer(QByteArray array); void sendDisable(); void sendFileBlock(QString path); void sendFolderBlock(QString path); diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp index 88977c3..ed6468e 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp @@ -12,7 +12,6 @@ ConnectorToServer::ConnectorToServer(QWidget* parentWidget, QObject *parent) : versionSelectWidget(nullptr), versionContainer(nullptr), notifyController(nullptr), - isLoggedIn(false), fl_GetedOfflineMessages(false) { initialize(); @@ -44,7 +43,6 @@ bool ConnectorToServer::authorizationInstructorLocal(QString login, QString pass autorization->Login = login; autorization->Password = password; autorization->TypeClient = TypeClientAutorization::TYPE_GUI; - isLoggedIn = true; QByteArray array = dataParser->createAuthMessage(autorization); emit signal_sendXMLmsgGUItoServer(array); @@ -61,7 +59,6 @@ bool ConnectorToServer::deAuthorizationInstructorLocal(QString login) ClientDeAutorization *deAutorization = new ClientDeAutorization; deAutorization->Login = login; - isLoggedIn = false; QByteArray array = dataParser->createDeAuthMessage(deAutorization); emit signal_sendXMLmsgGUItoServer(array); @@ -367,11 +364,6 @@ void ConnectorToServer::slot_AnswerQueryToDB_ListTrainees(QList listTra listUsers.append(trainee); } emit signal_reInitMessangerByUsers(listUsers); - - if (isLoggedIn) - { - sendClientNotify(cmd_GetOfflineMessages); - } } void ConnectorToServer::slot_AnswerQueryToDB_ListComputers(QList listComputers) @@ -466,7 +458,7 @@ void ConnectorToServer::bindConnection() connect(this,&ConnectorToServer::sigSetConnect,client,&TCPClient::setConnect,Qt::AutoConnection); connect(this,&ConnectorToServer::sigStopConnect,client,&TCPClient::setDisconnect,Qt::AutoConnection); - connect(this,&ConnectorToServer::signal_sendXMLmsgGUItoServer,sendSystem,&SendSystem::sendXMLmsgGUItoServer); + connect(this,&ConnectorToServer::signal_sendXMLmsgGUItoServer,sendSystem,&SendSystem::sendXMLAnswer); connect(this,&ConnectorToServer::sigSendAnswerToServer,sendSystem,&SendSystem::sendXMLAnswer,Qt::AutoConnection); connect(recognizeSystem,&RecognizeSystem::sigAuth,this,&ConnectorToServer::slot_Auth); // ::sigLoginResult); diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.h b/InstructorsAndTrainees/connectorToServer/connectortoserver.h index fd576c6..3abfb69 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.h +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.h @@ -152,8 +152,6 @@ private: QByteArray listTaskAmmArray; ServerSettings serverSettings; - bool isLoggedIn; - ServerAuthorization serverAuth; bool fl_GetedOfflineMessages; diff --git a/ServerLMS/Systems/processingsystem.cpp b/ServerLMS/Systems/processingsystem.cpp index 7f0b291..a1b66dd 100644 --- a/ServerLMS/Systems/processingsystem.cpp +++ b/ServerLMS/Systems/processingsystem.cpp @@ -573,7 +573,7 @@ void ProcessingSystem::processingClientNotify(ClientHandler *client, ClientNotif chatSystem->sendOldMessages(client->getClient()->getId()); } - Logger::instance().log(client->getClient()->getLogin() + clientNotify.Code,LogLevel::DEBUG); + Logger::instance().log(client->getClient()->getLogin() + " notifyCode " + clientNotify.Code,LogLevel::DEBUG); } void ProcessingSystem::setCurrentDataInfo(DataInfo *dataInfo) diff --git a/ServerLMS/Systems/recognizesystem.h b/ServerLMS/Systems/recognizesystem.h index 84a4283..f6fdf3b 100644 --- a/ServerLMS/Systems/recognizesystem.h +++ b/ServerLMS/Systems/recognizesystem.h @@ -56,10 +56,7 @@ private: qint64 sizeReceiveData; qint64 fileSize; int countSend; - bool isPackageTypeInited; - void packetTypeInit(PacketType packet,Client *client); - //void packetTypeInit(PacketType type); bool checkIsChangeable(); }; diff --git a/ServerLMS/Systems/sendsystem.cpp b/ServerLMS/Systems/sendsystem.cpp index f28bd44..bc4cd1f 100644 --- a/ServerLMS/Systems/sendsystem.cpp +++ b/ServerLMS/Systems/sendsystem.cpp @@ -78,34 +78,6 @@ void SendSystem::sendFileBlock(QString path) void SendSystem::sendFileBlockByteArray(QByteArray array, PacketType packetType) { -// qDebug() << "sendFileBlockByteArray thread: " << QThread::currentThreadId(); -// if(client->getClientType() == TypeClientAutorization::TYPE_QT_CLIENT || -// client->getClientType() == TypeClientAutorization::TYPE_GUI) -// { -// QDataStream stream(socket); -// stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); - -// fileSize = array.size(); - -// if(fileSize == 0){ -// Logger::instance().log(" WARNING! Zero size ",LogLevel::ERROR); -// return; -// } - -// stream << packetType; //Отправляем тип блока -// stream << fileSize; -// stream << array; -// } -// else -// { -// sendPacketType(packetType); -// QByteArray message; -// int size = array.length(); -// message.append(reinterpret_cast(&size), sizeof(int)); -// socket->write(message); -// socket->write(array); -// } - if(client->getClientType() == TypeClientAutorization::TYPE_QT_CLIENT || client->getClientType() == TypeClientAutorization::TYPE_GUI) {