diff --git a/DOCS/Андрей/Безымянная Kanban-доска.md b/DOCS/Андрей/Безымянная Kanban-доска.md index 45a894c..6a425f9 100644 --- a/DOCS/Андрей/Безымянная Kanban-доска.md +++ b/DOCS/Андрей/Безымянная Kanban-доска.md @@ -19,7 +19,7 @@ kanban-plugin: board ## TODO - [ ] выдавать trainee_id при авторизации -- [ ] изменить путь до самостоятельного /RRJ-95NEW-100/tasksFIM.xml и AMM +- [ ] /RRJ-95NEW-100/tasksFIM.xml и AMM на /RUS/Scens/tasksFIM.xml и AMM - [ ] Убрать ошибки QObject::moveToThread: Cannot move objects with a parent diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index 128bed3..89e8bbf 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -28,7 +28,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : ui->groupBox_Trainees->setObjectName("groupBox_Trainees"); #ifndef PROJECT_TYPE_DEBUG - ui->btnUpdateStyleSheet->setVisible(false); + //ui->btnUpdateStyleSheet->setVisible(false); #endif qRegisterMetaType("PacketType"); diff --git a/ServerLMS/Systems/sendsystem.cpp b/ServerLMS/Systems/sendsystem.cpp index 8ec470c..1092d79 100644 --- a/ServerLMS/Systems/sendsystem.cpp +++ b/ServerLMS/Systems/sendsystem.cpp @@ -198,34 +198,25 @@ void SendSystem::sendXmlAnswer(QByteArray array, PacketType packetType) } else { - - QByteArray buffer(512,0); + //QByteArray buffer(512,0); QByteArray message; message.append("size="); - message.append(QByteArray::number(array.length())); + int size = array.length(); + message.append(reinterpret_cast(&size), sizeof(int)); - memcpy(buffer.data(),message,message.length()); - qDebug() << buffer.length(); - socket->write(buffer); - socket->waitForBytesWritten(); + qDebug() << "Message size " << message.length(); + qDebug() << array.length(); + socket->write(message); if(array.length() <= 512) { - QByteArray buffer2(512,0); - memcpy(buffer2.data(),array.data(),array.length()); - socket->write(buffer2); +// QByteArray buffer2(512,0); +// memcpy(buffer2.data(),array.data(),array.length()); + socket->write(array); } else { - buffer.clear(); - QDataStream stream(array); - - while(!stream.atEnd()) - { - stream >> buffer; - socket->write(array); - socket->waitForBytesWritten(); - } + socket->write(array); } } } diff --git a/ServerLMS/serverlmswidget.cpp b/ServerLMS/serverlmswidget.cpp index 5f75f02..b544120 100644 --- a/ServerLMS/serverlmswidget.cpp +++ b/ServerLMS/serverlmswidget.cpp @@ -145,7 +145,7 @@ bool ServerLMSWidget::stopServer() //Закрываем все открытые сокеты foreach(int idSocket, clientsMap.keys()) { - clientsMap[idSocket]->sigSocketWrite(arrayAnswer); + clientsMap[idSocket]->sigSendXmlAnswer(arrayAnswer,PacketType::TYPE_XMLANSWER); //while (!clientsMap[idSocket]->sigSocketFlush()) {} QString str = QString(arrayAnswer);