Рефакт

This commit is contained in:
2025-09-12 14:49:02 +03:00
parent 2a8947f378
commit e12ca8b62e
7 changed files with 34 additions and 29 deletions

View File

@@ -11,7 +11,6 @@
MessangerWidget::MessangerWidget(QWidget *parent) :
QWidget(parent),
oneDialogMessenger(nullptr),
currGUIclientId(""),
ui(new Ui::MessangerWidget)
{
ui->setupUi(this);
@@ -46,9 +45,9 @@ void MessangerWidget::reinitMessangerWidget(User user)
}
}
void MessangerWidget::initGUIclientId(QString id_GUIclient)
void MessangerWidget::initUserLocalGUI(User user)
{
currGUIclientId = id_GUIclient;
userLocalGUI = user;
}
int MessangerWidget::getIDuserRemote()
@@ -58,13 +57,13 @@ int MessangerWidget::getIDuserRemote()
void MessangerWidget::showSendedMessage(ClientMessage clientMessage)
{
if(currGUIclientId == clientMessage.fromId)
if(userLocalGUI.getID() == clientMessage.fromId.toInt())
oneDialogMessenger->addMsgWidgetLocal(clientMessage.Text, clientMessage.timeStr);
}
void MessangerWidget::showReceivedMessage(ClientMessage clientMessage)
{
if(QString::number(userRemote.getID()) == clientMessage.fromId)
if(userRemote.getID() == clientMessage.fromId.toInt())
oneDialogMessenger->addMsgWidgetRemote(clientMessage.Text, clientMessage.timeStr);
}
@@ -73,7 +72,7 @@ void MessangerWidget::addTabDialogMessenger(User user)
if(!oneDialogMessenger)
{//Диалога еще не существует
oneDialogMessenger = new OneDialogMessenger(user, this);
oneDialogMessenger = new OneDialogMessenger(userLocalGUI, userRemote, this);
ui->verticalLayout_ListMsg->addWidget(oneDialogMessenger);
@@ -84,7 +83,7 @@ void MessangerWidget::addTabDialogMessenger(User user)
{//Диалог уже существует
//Проверяем наличие диалога именно с этим клиентом
if(oneDialogMessenger->getUserId() == user.getID())
if(oneDialogMessenger->getUserRemoteId() == user.getID())
{
//Обновляем заголовок
updateHeader(user);
@@ -126,7 +125,7 @@ void MessangerWidget::updateHeader(User user)
void MessangerWidget::on_btnSend_clicked()
{
QString text = ui->editMsg->toPlainText();
QString from = currGUIclientId;
QString from = QString::number(userLocalGUI.getID());
QString to = QString::number(userRemote.getID());
ClientMessage message = ClientMessage(from, to, text);