mirror of
https://github.com/Sani7/remote-ui.git
synced 2026-10-27 06:01:14 +01:00
Update websocket wrapper
now using size_t as id type instead of QString
This commit is contained in:
@@ -25,14 +25,14 @@ Web_socket_wrapper::~Web_socket_wrapper()
|
|||||||
close();
|
close();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Web_socket_wrapper::send_command(Command command, QString id)
|
void Web_socket_wrapper::send_command(Command command, size_t id)
|
||||||
{
|
{
|
||||||
json j;
|
json j;
|
||||||
switch (command)
|
switch (command)
|
||||||
{
|
{
|
||||||
case Command::get_UI_element:
|
case Command::get_UI_element:
|
||||||
j["command"]["type"] = magic_enum::enum_name(command).data();
|
j["command"]["type"] = magic_enum::enum_name(command).data();
|
||||||
j["command"]["id"] = id.toStdString();
|
j["command"]["id"] = id;
|
||||||
m_web_socket->sendTextMessage(QString(j.dump().data()));
|
m_web_socket->sendTextMessage(QString(j.dump().data()));
|
||||||
break;
|
break;
|
||||||
case Command::get_UI_elements:
|
case Command::get_UI_elements:
|
||||||
@@ -47,6 +47,16 @@ void Web_socket_wrapper::send_command(Command command, QString id)
|
|||||||
j["command"]["type"] = magic_enum::enum_name(command).data();
|
j["command"]["type"] = magic_enum::enum_name(command).data();
|
||||||
m_web_socket->sendTextMessage(QString(j.dump().data()));
|
m_web_socket->sendTextMessage(QString(j.dump().data()));
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Web_socket_wrapper::send_command(Command command, QString id)
|
||||||
|
{
|
||||||
|
json j;
|
||||||
|
switch (command)
|
||||||
|
{
|
||||||
case Command::switch_simulator:
|
case Command::switch_simulator:
|
||||||
j["command"]["type"] = magic_enum::enum_name(command).data();
|
j["command"]["type"] = magic_enum::enum_name(command).data();
|
||||||
j["command"]["name"] = id.toStdString();
|
j["command"]["name"] = id.toStdString();
|
||||||
@@ -57,14 +67,14 @@ void Web_socket_wrapper::send_command(Command command, QString id)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Web_socket_wrapper::send_event(Event event, QString id)
|
void Web_socket_wrapper::send_event(Event event, size_t id)
|
||||||
{
|
{
|
||||||
json j;
|
json j;
|
||||||
switch (event)
|
switch (event)
|
||||||
{
|
{
|
||||||
case Event::clicked:
|
case Event::clicked:
|
||||||
j["event"]["type"] = magic_enum::enum_name(event).data();
|
j["event"]["type"] = magic_enum::enum_name(event).data();
|
||||||
j["event"]["id"] = id.toStdString();
|
j["event"]["id"] = id;
|
||||||
m_web_socket->sendTextMessage(QString(j.dump().data()));
|
m_web_socket->sendTextMessage(QString(j.dump().data()));
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
@@ -72,14 +82,14 @@ void Web_socket_wrapper::send_event(Event event, QString id)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Web_socket_wrapper::send_event(Event event, QString id, double val)
|
void Web_socket_wrapper::send_event(Event event, size_t id, double val)
|
||||||
{
|
{
|
||||||
json j;
|
json j;
|
||||||
switch (event)
|
switch (event)
|
||||||
{
|
{
|
||||||
case Event::value_changed:
|
case Event::value_changed:
|
||||||
j["event"]["type"] = magic_enum::enum_name(event).data();
|
j["event"]["type"] = magic_enum::enum_name(event).data();
|
||||||
j["event"]["id"] = id.toStdString();
|
j["event"]["id"] = id;
|
||||||
j["event"]["value"] = val;
|
j["event"]["value"] = val;
|
||||||
m_web_socket->sendTextMessage(QString(j.dump().data()));
|
m_web_socket->sendTextMessage(QString(j.dump().data()));
|
||||||
break;
|
break;
|
||||||
@@ -88,20 +98,20 @@ void Web_socket_wrapper::send_event(Event event, QString id, double val)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Web_socket_wrapper::send_event(Event event, QString id, QString val)
|
void Web_socket_wrapper::send_event(Event event, size_t id, QString val)
|
||||||
{
|
{
|
||||||
json j;
|
json j;
|
||||||
switch (event)
|
switch (event)
|
||||||
{
|
{
|
||||||
case Event::text_changed:
|
case Event::text_changed:
|
||||||
j["event"]["type"] = magic_enum::enum_name(event).data();
|
j["event"]["type"] = magic_enum::enum_name(event).data();
|
||||||
j["event"]["id"] = id.toStdString();
|
j["event"]["id"] = id;
|
||||||
j["event"]["text"] = val.toStdString();
|
j["event"]["text"] = val.toStdString();
|
||||||
m_web_socket->sendTextMessage(QString(j.dump().data()));
|
m_web_socket->sendTextMessage(QString(j.dump().data()));
|
||||||
break;
|
break;
|
||||||
case Event::selected:
|
case Event::selected:
|
||||||
j["event"]["type"] = magic_enum::enum_name(event).data();
|
j["event"]["type"] = magic_enum::enum_name(event).data();
|
||||||
j["event"]["id"] = id.toStdString();
|
j["event"]["id"] = id;
|
||||||
j["event"]["selected"] = val.toStdString();
|
j["event"]["selected"] = val.toStdString();
|
||||||
m_web_socket->sendTextMessage(QString(j.dump().data()));
|
m_web_socket->sendTextMessage(QString(j.dump().data()));
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -34,10 +34,11 @@ class Web_socket_wrapper : public QObject
|
|||||||
public:
|
public:
|
||||||
explicit Web_socket_wrapper(const QUrl &url, QObject *parent = nullptr);
|
explicit Web_socket_wrapper(const QUrl &url, QObject *parent = nullptr);
|
||||||
~Web_socket_wrapper();
|
~Web_socket_wrapper();
|
||||||
void send_command(Command command, QString id = QString());
|
void send_command(Command command, size_t id = 0);
|
||||||
void send_event(Event event, QString id);
|
void send_command(Command command, QString id);
|
||||||
void send_event(Event event, QString id, double val);
|
void send_event(Event event, size_t id);
|
||||||
void send_event(Event event, QString id, QString val);
|
void send_event(Event event, size_t id, double val);
|
||||||
|
void send_event(Event event, size_t id, QString val);
|
||||||
void close();
|
void close();
|
||||||
|
|
||||||
Q_SIGNALS:
|
Q_SIGNALS:
|
||||||
|
|||||||
Reference in New Issue
Block a user