ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #573: Fix event params in eventTriggered signal

Browse Source
This commit is contained in:
Jenkins nymea 2021-03-24 20:15:40 +01:00
commit 1edbb11ecd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libnymea-app/thingmanager.cpp
View File

@ -201,8 +201,8 @@ void ThingManager::notificationReceived(const QVariantMap &data)
} }
return; return;
} }
// qDebug() << "Event received" << thingId.toString() << eventTypeId.toString() << qUtf8Printable(QJsonDocument::fromVariant(event).toJson()); qCDebug(dcThingManager) << "Event received" << thingId.toString() << eventTypeId.toString() << qUtf8Printable(QJsonDocument::fromVariant(event).toJson());
thing->eventTriggered(eventTypeId.toString(), event.value("params").toMap()); thing->eventTriggered(eventTypeId.toString(), event.value("params").toList());
} else if (notification == "Integrations.IOConnectionAdded") { } else if (notification == "Integrations.IOConnectionAdded") {
QVariantMap connectionMap = data.value("params").toMap().value("ioConnection").toMap(); QVariantMap connectionMap = data.value("params").toMap().value("ioConnection").toMap();
QUuid id = connectionMap.value("id").toUuid(); QUuid id = connectionMap.value("id").toUuid();

2
libnymea-app/types/thing.h
View File

@ -140,7 +140,7 @@ signals:
void paramsChanged(); void paramsChanged();
void settingsChanged(); void settingsChanged();
void statesChanged(); void statesChanged();
void eventTriggered(const QUuid &eventTypeId, const QVariantMap &params); void eventTriggered(const QUuid &eventTypeId, const QVariantList &params);
signals: signals:
void executeActionReply(int commandId, Thing::ThingError thingError, const QString &displayMessage); void executeActionReply(int commandId, Thing::ThingError thingError, const QString &displayMessage);