diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | message.h | 1 | ||||
| -rw-r--r-- | messageengine.cpp | 4 | ||||
| -rw-r--r-- | weather.cpp | 67 | ||||
| -rw-r--r-- | weather.h | 52 | ||||
| -rw-r--r-- | weathermessage.cpp | 34 | ||||
| -rw-r--r-- | weathermessage.h | 37 |
7 files changed, 197 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 122c193..9f91d1e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,12 +14,12 @@ CONFIGURE_FILE("qtappfw.pc.in" "qtappfw.pc" @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qtappfw.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) -add_library(qtappfw SHARED message.cpp messageengine.cpp telephony.cpp telephonymessage.cpp) +add_library(qtappfw SHARED message.cpp messageengine.cpp telephony.cpp telephonymessage.cpp weather.cpp weathermessage.cpp) target_link_libraries(qtappfw Qt5::WebSockets) set_target_properties(qtappfw PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION 1 - PUBLIC_HEADER "message.h;messageengine.h;telephony.h;telephonymessage.h") + PUBLIC_HEADER "message.h;messageengine.h;telephony.h;telephonymessage.h;weather.h;weathermessage.h") target_include_directories(qtappfw PRIVATE .) install(TARGETS qtappfw LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} @@ -31,6 +31,7 @@ enum MessageId { enum MessageType { GenericMessage, TelephonyEventMessage, + WeatherEventMessage, }; class Message : public QObject diff --git a/messageengine.cpp b/messageengine.cpp index 7d53694..101f7e0 100644 --- a/messageengine.cpp +++ b/messageengine.cpp @@ -17,6 +17,7 @@ #include "message.h" #include "messageengine.h" #include "telephonymessage.h" +#include "weathermessage.h" #include <QJsonArray> @@ -74,6 +75,9 @@ void MessageEngine::onTextMessageReceived(QString jsonStr) if (api == "telephony") { message = new TelephonyMessage; type = TelephonyEventMessage; + } else if (api == "weather") { + message = new WeatherMessage; + type = WeatherEventMessage; } else { message = new Message; type = GenericMessage; diff --git a/weather.cpp b/weather.cpp new file mode 100644 index 0000000..a4edb2a --- /dev/null +++ b/weather.cpp @@ -0,0 +1,67 @@ +/* + * 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 "weather.h" +#include "weathermessage.h" + +Weather::Weather (QUrl &url, QObject * parent) : + QObject(parent), + m_mloop(nullptr) +{ + m_mloop = new MessageEngine(url); + QObject::connect(m_mloop, &MessageEngine::connected, this, &Weather::onConnected); + QObject::connect(m_mloop, &MessageEngine::disconnected, this, &Weather::onDisconnected); + QObject::connect(m_mloop, &MessageEngine::messageReceived, this, &Weather::onMessageReceived); +} + +Weather::~Weather() +{ + delete m_mloop; +} + +void Weather::onConnected() +{ + WeatherMessage *tmsg = new WeatherMessage(); + tmsg->createRequest("subscribe", "weather"); + m_mloop->sendMessage(tmsg); + tmsg->deleteLater(); +} + +void Weather::onDisconnected() +{ + WeatherMessage *tmsg = new WeatherMessage(); + tmsg->createRequest("unsubscribe", "weather"); + m_mloop->sendMessage(tmsg); + tmsg->deleteLater(); +} + +void Weather::onMessageReceived(MessageType type, Message *message) +{ + if (type == WeatherEventMessage) { + WeatherMessage *tmsg = qobject_cast<WeatherMessage*>(message); + + if (tmsg->isEvent()) { + m_temperature = tmsg->temperature(); + m_condition = tmsg->condition(); + + emit temperatureChanged(m_temperature); + emit conditionChanged(m_condition); + } + } + message->deleteLater(); +} diff --git a/weather.h b/weather.h new file mode 100644 index 0000000..bfdd81b --- /dev/null +++ b/weather.h @@ -0,0 +1,52 @@ +/* + * 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. + */ + +#ifndef WEATHER_H +#define WEATHER_H + +#include <QDebug> +#include <QObject> + +#include "messageengine.h" + +class Weather : public QObject +{ + Q_OBJECT + Q_PROPERTY(QString temperature READ temperature NOTIFY temperatureChanged) + Q_PROPERTY(QString condition READ condition NOTIFY conditionChanged) + + public: + explicit Weather(QUrl &url, QObject * parent = Q_NULLPTR); + virtual ~Weather(); + + QString temperature() { return m_temperature; } + QString condition() { return m_condition; } + + signals: + void temperatureChanged(QString); + void conditionChanged(QString); + + private: + MessageEngine *m_mloop; + QString m_temperature; + QString m_condition; + + void onConnected(); + void onDisconnected(); + void onMessageReceived(MessageType, Message*); +}; + +#endif // WEATHER_H diff --git a/weathermessage.cpp b/weathermessage.cpp new file mode 100644 index 0000000..6b4aa3c --- /dev/null +++ b/weathermessage.cpp @@ -0,0 +1,34 @@ +/* + * 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 <QDebug> +#include <QJsonArray> +#include <QJsonDocument> +#include <QJsonObject> + +#include "weathermessage.h" + +bool WeatherMessage::createRequest(QString verb, QString value) +{ + QStringList verbs {"current_weather", "subscribe", "unsubscribe"}; + if (!verbs.contains(verb)) + return false; + + QJsonObject parameter; + parameter.insert("value", value); + + return Message::createRequest("weather", verb, parameter); +} diff --git a/weathermessage.h b/weathermessage.h new file mode 100644 index 0000000..e1d4dac --- /dev/null +++ b/weathermessage.h @@ -0,0 +1,37 @@ +/* + * 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. + */ + +#ifndef WEATHER_MESSAGE_H +#define WEATHER_MESSAGE_H + +#include <QJsonArray> +#include <QJsonObject> +#include "message.h" + +class WeatherMessage : public Message +{ + Q_OBJECT + public: + bool createRequest(QString verb, QString value = "None"); + QString condition() { + return m_event_data.value("weather").toArray().at(0).toObject().value("description").toString(); + }; + QString temperature() { + return QString::number(m_event_data.value("main").toObject().value("temp").toDouble()); + }; +}; + +#endif // WEATHER_MESSAGE_H |