diff options
author | Raquel Medina <raquel.medina@konsulko.com> | 2020-03-18 23:56:31 +0100 |
---|---|---|
committer | Raquel Medina <raquel.medina@konsulko.com> | 2020-03-23 14:02:28 +0100 |
commit | 0ed292d3ccf93c889734960676a321d1166d3f66 (patch) | |
tree | b8d64d1685d2f4bf599ab3867a0d3ff557ff0479 /voice-capabilities/guimetadata.cpp | |
parent | 5c750385d02116a92fa4c120ccc26abb8267bc97 (diff) |
rework message hierarchy
Rework message hierarchy with the final objective
of splitting libqtappfw into several libraries.
This commit carries the following changes:
- Simplify message hierarchy, keeping abstract
Message class, adding specialization for call and
event messages, keeping ResponseMessage, and
removing all module specific specializations.
- Add MessageFactory class to create message
objects.
- Change messages life cycle: using smart pointers
and removing QObject from message hierarchy (a
Message is not a QObject anymore and thus
'deleteLater()' is not available).
- Adapt all modules to use new message hierarchy.
- Keep ResponseMessage original constructor to
avoid breaking TaskManager.
- Message constructors have been kept public, but
will go private on a follow-up patch (once
TaskManager class has been modified to use new
MessageFactory).
Bug-AGL: SPEC-3112
Signed-off-by: Raquel Medina <raquel.medina@konsulko.com>
Change-Id: I3a7a6325209ddeca2293f1ac745371861a947bfb
Diffstat (limited to 'voice-capabilities/guimetadata.cpp')
-rw-r--r-- | voice-capabilities/guimetadata.cpp | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/voice-capabilities/guimetadata.cpp b/voice-capabilities/guimetadata.cpp index 949cb58..4c597c1 100644 --- a/voice-capabilities/guimetadata.cpp +++ b/voice-capabilities/guimetadata.cpp @@ -17,8 +17,9 @@ #include <QDebug> #include <QJsonArray> -#include "message.h" -#include "guimetadatamessage.h" +#include "callmessage.h" +#include "eventmessage.h" +#include "messagefactory.h" #include "messageengine.h" #include "guimetadata.h" @@ -308,19 +309,20 @@ bool GuiMetadata::updateWeatherMetadata(QJsonObject &data) void GuiMetadata::onConnected() { - QStringListIterator eventIterator(events); - GuiMetadataCapabilityMessage *tmsg; + std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call); + if (!msg) + return; - tmsg = new GuiMetadataCapabilityMessage(); + CallMessage *tmsg = static_cast<CallMessage*>(msg.get()); + QStringListIterator eventIterator(events); QJsonObject parameter; QJsonArray actions; while (eventIterator.hasNext()) { actions.append(QJsonValue(eventIterator.next())); } parameter.insert("actions", actions); - tmsg->createRequest("guimetadata/subscribe", parameter); - m_mloop->sendMessage(tmsg); - delete tmsg; + tmsg->createRequest("vshl-capabilities", "guimetadata/subscribe", parameter); + m_mloop->sendMessage(std::move(msg)); } void GuiMetadata::onDisconnected() @@ -328,18 +330,21 @@ void GuiMetadata::onDisconnected() // vshl-capabilities currently has no unsubscribe verb... } -void GuiMetadata::onMessageReceived(MessageType type, Message *message) +void GuiMetadata::onMessageReceived(std::shared_ptr<Message> msg) { - if (type == MessageType::GuiMetadataCapabilityEventMessage) { - GuiMetadataCapabilityMessage *tmsg = qobject_cast<GuiMetadataCapabilityMessage*>(message); - if (tmsg->isEvent()) { - if (tmsg->isGuiMetadataRenderTemplateEvent()) { - if(updateMetadata(tmsg->eventData())) - emit renderTemplate(); - } else if (tmsg->isGuiMetadataClearTemplateEvent()) { - emit clearTemplate(); - } + if (!msg) + return; + + if (msg->isEvent()) { + std::shared_ptr<EventMessage> emsg = std::static_pointer_cast<EventMessage>(msg); + if (emsg->eventApi() != "vshl-capabilities"); + return; + QString ename = emsg->eventName(); + QJsonObject data = emsg->eventData(); + if ((ename == "render-template") && updateMetadata(data)) { + emit renderTemplate(); + } else if (ename == "clear_template") { + emit clearTemplate(); } } - message->deleteLater(); } |