Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

ref: change message attributes

Browse Source
This commit is contained in:
semenov
2025-08-04 16:37:54 +03:00
parent 501b84b13a
commit 33c7a31143
12 changed files with 62 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp
View File

@@ -88,7 +88,6 @@ QByteArray DataParser::createMessage(ClientMessage clientMessage)
xmlWriter.writeAttribute("From",clientMessage.fromId);
xmlWriter.writeAttribute("To", clientMessage.toId);
xmlWriter.writeAttribute("Text", clientMessage.Text);
xmlWriter.writeAttribute("UserType",clientMessage.UserType);
xmlWriter.writeEndElement();
xmlWriter.writeEndElement();

5
InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp
View File

@@ -526,11 +526,6 @@ void RecognizeSystem::xmlParser(QByteArray array)
if (name == "Text"){
clientMessage->Text = value;
}
if (name == "UserType")
{
clientMessage->UserType = value;
}
}
emit signal_ReceiveMessage(*clientMessage);

11
InstructorsAndTrainees/connectorToServer/Datas.h
View File

@@ -74,17 +74,18 @@ public:
class ClientMessage
{
public:
QString fromId;
QString toId;
QString fromId;//формат id-typeId
QString toId;//формат id-typeId
QString Text;
QString UserType;
//TypeId
//0 - инструктор, 1 - обучаемый
ClientMessage(){}
ClientMessage(QString fromId, QString toId, QString text, QString UserType)
ClientMessage(QString fromId, QString toId, QString text)
{
this->fromId = fromId;
this->toId = toId;
this->Text = text;
this->UserType = UserType;
}
};

7
InstructorsAndTrainees/messanger/messangerwidget.cpp
View File

@@ -153,8 +153,10 @@ void MessangerWidget::clear()
void MessangerWidget::on_btnSend_clicked()
{
QString text = ui->editMsg->toPlainText();
ClientMessage message = ClientMessage(currClientId,selectedUserId,text,"0");
QString from = currClientId + "-" + QString::number(0);// временный костыль, так как чаты только с обучаемыми
QString to = selectedUserId + "-" + QString::number(1);// временный костыль, так как чаты только с обучаемыми
ClientMessage message = ClientMessage(from,to,text);
emit signal_sendMessage(message);
ui->editMsg->clear();
@@ -229,9 +231,10 @@ void MessangerWidget::slot_InitMessanger(QList<Trainee> listTrainees)
void MessangerWidget::slot_showMessage(ClientMessage clientMessage)
{
auto result = clientMessage.fromId.split("-");
for(Trainee trainee: listTrainees)
{
if(QString::number(trainee.getID()) == clientMessage.fromId)
if(QString::number(trainee.getID()) == result[0])
{
addMsgFromClient(trainee, clientMessage.Text);
break;