diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | message.h | 1 | ||||
| -rw-r--r-- | messageengine.cpp | 4 | ||||
| -rw-r--r-- | signal-composer/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | signal-composer/signalcomposer.cpp | 85 | ||||
| -rw-r--r-- | signal-composer/signalcomposer.h | 50 | ||||
| -rw-r--r-- | signal-composer/signalcomposermessage.cpp | 29 | ||||
| -rw-r--r-- | signal-composer/signalcomposermessage.h | 36 |
8 files changed, 208 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c9b77f9..2f576e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,6 +54,7 @@ set (SUBDIRS network pbap radio + signal-composer telephony voice weather) @@ -43,6 +43,7 @@ enum MessageType { MapEventMessage, NavigationEventMessage, VoiceEventMessage, + SignalComposerEventMessage, }; class Message : public QObject diff --git a/messageengine.cpp b/messageengine.cpp index 4920043..1261339 100644 --- a/messageengine.cpp +++ b/messageengine.cpp @@ -27,6 +27,7 @@ #include "telephonymessage.h" #include "weathermessage.h" #include "voicemessage.h" +#include "signalcomposermessage.h" #include <QJsonArray> @@ -147,6 +148,9 @@ void MessageEngine::onTextMessageReceived(QString jsonStr) } else if (api == "alexa-voiceagent") { message = new AlexaVoiceMessage; type = VoiceEventMessage; + } else if (api == "signal-composer") { + message = new SignalComposerMessage; + type = SignalComposerEventMessage; } else { message = new Message; type = GenericMessage; diff --git a/signal-composer/CMakeLists.txt b/signal-composer/CMakeLists.txt new file mode 100644 index 0000000..18f3a0a --- /dev/null +++ b/signal-composer/CMakeLists.txt @@ -0,0 +1,2 @@ +add_headers(signalcomposer.h signalcomposermessage.h) +add_sources(signalcomposer.cpp signalcomposermessage.cpp) diff --git a/signal-composer/signalcomposer.cpp b/signal-composer/signalcomposer.cpp new file mode 100644 index 0000000..b02c6d3 --- /dev/null +++ b/signal-composer/signalcomposer.cpp @@ -0,0 +1,85 @@ +/* + * Copyright (C) 2018 Konsulko Group + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "message.h" +#include "messageengine.h" +#include "signalcomposer.h" +#include "signalcomposermessage.h" + +SignalComposer::SignalComposer (QUrl &url, QObject * parent) : + QObject(parent), + m_mloop(nullptr) +{ + m_mloop = new MessageEngine(url); + QObject::connect(m_mloop, &MessageEngine::connected, this, &SignalComposer::onConnected); + QObject::connect(m_mloop, &MessageEngine::disconnected, this, &SignalComposer::onDisconnected); + QObject::connect(m_mloop, &MessageEngine::messageReceived, this, &SignalComposer::onMessageReceived); +} + +SignalComposer::~SignalComposer() +{ + delete m_mloop; +} + +void SignalComposer::onConnected() +{ + QStringListIterator eventIterator(events); + SignalComposerMessage *tmsg; + + while (eventIterator.hasNext()) { + tmsg = new SignalComposerMessage(); + QJsonObject parameter; + parameter.insert("signal", eventIterator.next()); + tmsg->createRequest("subscribe", parameter); + m_mloop->sendMessage(tmsg); + delete tmsg; + } +} + +void SignalComposer::onDisconnected() +{ + QStringListIterator eventIterator(events); + SignalComposerMessage *tmsg; + + while (eventIterator.hasNext()) { + tmsg = new SignalComposerMessage(); + QJsonObject parameter; + parameter.insert("signal", eventIterator.next()); + tmsg->createRequest("unsubscribe", parameter); + m_mloop->sendMessage(tmsg); + delete tmsg; + } +} + +void SignalComposer::onMessageReceived(MessageType type, Message *message) +{ + if (type == SignalComposerEventMessage) { + SignalComposerMessage *tmsg = qobject_cast<SignalComposerMessage*>(message); + + if (tmsg->isEvent()) { + QString uid = tmsg->eventData().value("uid").toString(); + QVariant v = tmsg->eventData().value("value").toVariant(); + QString value; + if(v.canConvert(QMetaType::QString)) + value = v.toString(); + else + qWarning() << "Unconvertible type for uid " << uid; + + emit signalEvent(uid, value); + } + } + message->deleteLater(); +} diff --git a/signal-composer/signalcomposer.h b/signal-composer/signalcomposer.h new file mode 100644 index 0000000..d0b0332 --- /dev/null +++ b/signal-composer/signalcomposer.h @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2019 Konsulko Group + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef SIGNALCOMPOSER_H +#define SIGNALCOMPOSER_H + +#include <QDebug> +#include <QObject> +#include <QJsonArray> + +#include "messageengine.h" + +class SignalComposer : public QObject +{ + Q_OBJECT + + public: + explicit SignalComposer(QUrl &url, QObject * parent = Q_NULLPTR); + virtual ~SignalComposer(); + + signals: + void signalEvent(QString uid, QString value); + + private: + MessageEngine *m_mloop; + + void onConnected(); + void onDisconnected(); + void onMessageReceived(MessageType, Message*); + + const QStringList events { + "event.vehicle.speed", + "event.engine.speed", + }; +}; + +#endif // SIGNALCOMPOSER_H diff --git a/signal-composer/signalcomposermessage.cpp b/signal-composer/signalcomposermessage.cpp new file mode 100644 index 0000000..69b8d00 --- /dev/null +++ b/signal-composer/signalcomposermessage.cpp @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2019 Konsulko Group + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <QJsonArray> +#include <QJsonDocument> +#include <QJsonObject> + +#include "signalcomposermessage.h" + +bool SignalComposerMessage::createRequest(QString verb, QJsonObject parameter) +{ + if (!verbs.contains(verb)) + return false; + + return Message::createRequest("signal-composer", verb, parameter); +} diff --git a/signal-composer/signalcomposermessage.h b/signal-composer/signalcomposermessage.h new file mode 100644 index 0000000..e5b6892 --- /dev/null +++ b/signal-composer/signalcomposermessage.h @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2019 Konsulko Group + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef SIGNALCOMPOSER_MESSAGE_H +#define SIGNALCOMPOSER_MESSAGE_H + +#include "message.h" + +class SignalComposerMessage : public Message +{ + Q_OBJECT + + public: + bool createRequest(QString verb, QJsonObject parameter); + + private: + QStringList verbs { + "subscribe", + "unsubscribe", + }; +}; + +#endif // SIGNALCOMPOSER_MESSAGE_H |