diff options
author | Scott Murray <scott.murray@konsulko.com> | 2021-12-16 15:07:44 -0500 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2021-12-16 16:03:51 -0500 |
commit | fad93b42c285ffb463e9494070f40d3b339d732f (patch) | |
tree | 6ae60914c578bd34b8ebbde9b271859e8b87ab65 /voice-capabilities/guimetadata.h | |
parent | fe20f1b029f67dee1f790ade7a9114086f2abd38 (diff) |
Initial rework to replace app framework usage
Changes:
- Remove "core" code related to WebSocket messaging for the app
framework.
- Stub out hvac, navigation, network, and weather interfaces. This
allows building several of the demo applications without modification
for now. The network interface will definitely be reused to plumb
in a new connman-glib library derived from the previous network
binding. The others may potentially be reused to plumb in other
new backend implementations.
- Update the Network interface object constructor arguments to add a
agent registration flag. This prepares for the connman-glib
switch and means users will not need to be updated twice.
- Update the Bluetooth interface to use a new bluez-glib library that
is derived from the previous Bluetooth binding. This has been
successfully tested with a the Settings application.
- Remove signal-composer and voice API interface code as there are no
direct replacements planned. The signal-composer interface was
effectively exposing the binding events, so has little reuse
potential with a new backend. For the voice interface, if some form
of Alexa support becomes desirable, it can potentially be brought
back for adaptation if required.
- Disable compilation of the remaining interfaces for now. Some like
map, pbap, and mediaplayer are very likely to be used as the basis
for updating their associated applications, so keeping the code for
the planned iterative development seems easier.
- Updated copyright lines in all touched files.
Bug-AGL: SPEC-4182
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ib717ac8ac68ec457eaee74755dcf9d4f36b79d12
Diffstat (limited to 'voice-capabilities/guimetadata.h')
-rw-r--r-- | voice-capabilities/guimetadata.h | 176 |
1 files changed, 0 insertions, 176 deletions
diff --git a/voice-capabilities/guimetadata.h b/voice-capabilities/guimetadata.h deleted file mode 100644 index ba6b1a1..0000000 --- a/voice-capabilities/guimetadata.h +++ /dev/null @@ -1,176 +0,0 @@ -/* - * Copyright (C) 2020 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 GUIMETADATA_H -#define GUIMETADATA_H - -#include <memory> -#include <QObject> -#include <QtQml/QQmlContext> - -class MessageEngine; -class Message; - - -class GuiMetadata : public QObject -{ - Q_OBJECT - - // Common to all template types - Q_PROPERTY(QString type READ type) - Q_PROPERTY(QString title READ title) - Q_PROPERTY(QString subtitle READ subtitle) - - // BodyTemplate1/2 - Q_PROPERTY(QString bodyText READ bodyText) - - // BodyTemplate2 - Q_PROPERTY(QUrl bodyImageSmallUrl READ bodyImageSmallUrl) - Q_PROPERTY(QUrl bodyImageMediumUrl READ bodyImageMediumUrl) - Q_PROPERTY(QUrl bodyImageLargeUrl READ bodyImageLargeUrl) - - // WeatherTemplate - Q_PROPERTY(QString weatherCurrentTemperature READ weatherCurrentTemperature) - Q_PROPERTY(QUrl weatherCurrentWeatherIconSmallUrl READ weatherCurrentWeatherIconSmallUrl) - Q_PROPERTY(QUrl weatherCurrentWeatherIconSmallDarkBgUrl READ weatherCurrentWeatherIconSmallDarkBgUrl) - Q_PROPERTY(QUrl weatherCurrentWeatherIconMediumUrl READ weatherCurrentWeatherIconMediumUrl) - Q_PROPERTY(QUrl weatherCurrentWeatherIconMediumDarkBgUrl READ weatherCurrentWeatherIconMediumDarkBgUrl) - Q_PROPERTY(QUrl weatherCurrentWeatherIconLargeUrl READ weatherCurrentWeatherIconLargeUrl) - Q_PROPERTY(QUrl weatherCurrentWeatherIconLargeDarkBgUrl READ weatherCurrentWeatherIconLargeDarkBgUrl) - - Q_PROPERTY(QString weatherLowTemperature READ weatherLowTemperature) - Q_PROPERTY(QUrl weatherLowTemperatureArrowSmallUrl READ weatherLowTemperatureArrowSmallUrl) - Q_PROPERTY(QUrl weatherLowTemperatureArrowSmallDarkBgUrl READ weatherLowTemperatureArrowSmallDarkBgUrl) - Q_PROPERTY(QUrl weatherLowTemperatureArrowMediumUrl READ weatherLowTemperatureArrowMediumUrl) - Q_PROPERTY(QUrl weatherLowTemperatureArrowMediumDarkBgUrl READ weatherLowTemperatureArrowMediumDarkBgUrl) - Q_PROPERTY(QUrl weatherLowTemperatureArrowLargeUrl READ weatherLowTemperatureArrowLargeUrl) - Q_PROPERTY(QUrl weatherLowTemperatureArrowLargeDarkBgUrl READ weatherLowTemperatureArrowLargeDarkBgUrl) - - Q_PROPERTY(QString weatherHighTemperature READ weatherHighTemperature) - Q_PROPERTY(QUrl weatherHighTemperatureArrowSmallUrl READ weatherHighTemperatureArrowSmallUrl) - Q_PROPERTY(QUrl weatherHighTemperatureArrowSmallDarkBgUrl READ weatherHighTemperatureArrowSmallDarkBgUrl) - Q_PROPERTY(QUrl weatherHighTemperatureArrowMediumUrl READ weatherHighTemperatureArrowMediumUrl) - Q_PROPERTY(QUrl weatherHighTemperatureArrowMediumDarkBgUrl READ weatherHighTemperatureArrowMediumDarkBgUrl) - Q_PROPERTY(QUrl weatherHighTemperatureArrowLargeUrl READ weatherHighTemperatureArrowLargeUrl) - Q_PROPERTY(QUrl weatherHighTemperatureArrowLargeDarkBgUrl READ weatherHighTemperatureArrowLargeDarkBgUrl) - // weatherForecast array ignored for now - -public: - explicit GuiMetadata(QUrl &url, QQmlContext *context, QObject * parent = Q_NULLPTR); - virtual ~GuiMetadata(); - - QString type() { return m_type; } - QString title() { return m_title; } - QString subtitle() { return m_subtitle; } - - // BodyTemplate1/2 - QString bodyText() { return m_bodyText; } - - // BodyTemplate2 - QUrl bodyImageSmallUrl() { return m_bodyImageSmallUrl; } - QUrl bodyImageMediumUrl() { return m_bodyImageMediumUrl; } - QUrl bodyImageLargeUrl() { return m_bodyImageLargeUrl; } - - // WeatherTemplate - QString weatherCurrentTemperature() { return m_weatherCurrentTemperature; } - QUrl weatherCurrentWeatherIconSmallUrl() { return m_weatherCurrentWeatherIconSmallUrl; } - QUrl weatherCurrentWeatherIconSmallDarkBgUrl() { return m_weatherCurrentWeatherIconSmallDarkBgUrl; } - QUrl weatherCurrentWeatherIconMediumUrl() { return m_weatherCurrentWeatherIconMediumUrl; } - QUrl weatherCurrentWeatherIconMediumDarkBgUrl() { return m_weatherCurrentWeatherIconMediumDarkBgUrl; } - QUrl weatherCurrentWeatherIconLargeUrl() { return m_weatherCurrentWeatherIconLargeUrl; } - QUrl weatherCurrentWeatherIconLargeDarkBgUrl() { return m_weatherCurrentWeatherIconLargeDarkBgUrl; } - - QString weatherLowTemperature() { return m_weatherLowTemperature; } - QUrl weatherLowTemperatureArrowSmallUrl() { return m_weatherLowTemperatureArrowSmallUrl; } - QUrl weatherLowTemperatureArrowSmallDarkBgUrl() { return m_weatherLowTemperatureArrowSmallDarkBgUrl; } - QUrl weatherLowTemperatureArrowMediumUrl() { return m_weatherLowTemperatureArrowMediumUrl; } - QUrl weatherLowTemperatureArrowMediumDarkBgUrl() { return m_weatherLowTemperatureArrowMediumDarkBgUrl; } - QUrl weatherLowTemperatureArrowLargeUrl() { return m_weatherLowTemperatureArrowLargeUrl; } - QUrl weatherLowTemperatureArrowLargeDarkBgUrl() { return m_weatherLowTemperatureArrowLargeDarkBgUrl; } - - QString weatherHighTemperature() { return m_weatherHighTemperature; } - QUrl weatherHighTemperatureArrowSmallUrl() { return m_weatherHighTemperatureArrowSmallUrl; } - QUrl weatherHighTemperatureArrowSmallDarkBgUrl() { return m_weatherHighTemperatureArrowSmallDarkBgUrl; } - QUrl weatherHighTemperatureArrowMediumUrl() { return m_weatherHighTemperatureArrowMediumUrl; } - QUrl weatherHighTemperatureArrowMediumDarkBgUrl() { return m_weatherHighTemperatureArrowMediumDarkBgUrl; } - QUrl weatherHighTemperatureArrowLargeUrl() { return m_weatherHighTemperatureArrowLargeUrl; } - QUrl weatherHighTemperatureArrowLargeDarkBgUrl() { return m_weatherHighTemperatureArrowLargeDarkBgUrl; } - -signals: - void renderTemplate(); - void clearTemplate(); - -private: - std::shared_ptr<MessageEngine> m_mloop; - QQmlContext *m_context; - - void clearMetadata(); - bool parseImageMetadata(QJsonObject &imageObj, - QUrl &smallUrl, QUrl &mediumUrl, QUrl &largeUrl, - QUrl *pSmallDarkBgUrl = NULL, QUrl *pMediumDarkBgUrl = NULL, QUrl *pLargeDarkBgUrl = NULL); - - bool updateMetadata(QJsonObject data); - bool updateBodyMetadata(QJsonObject &data); - bool updateWeatherMetadata(QJsonObject &data); - - void onConnected(); - void onDisconnected(); - void onMessageReceived(std::shared_ptr<Message>); - - const QStringList events { - "render_template", - "clear_template", - }; - - QString m_type = ""; - QString m_title = ""; - QString m_subtitle = ""; - - // BodyTemplate1/2 - QString m_bodyText = ""; - - // BodyTemplate2 - QUrl m_bodyImageSmallUrl = QString(""); - QUrl m_bodyImageMediumUrl = QString(""); - QUrl m_bodyImageLargeUrl = QString(""); - - // WeatherTemplate - QString m_weatherCurrentTemperature = ""; - QUrl m_weatherCurrentWeatherIconSmallUrl = QString(""); - QUrl m_weatherCurrentWeatherIconSmallDarkBgUrl = QString(""); - QUrl m_weatherCurrentWeatherIconMediumUrl = QString(""); - QUrl m_weatherCurrentWeatherIconMediumDarkBgUrl = QString(""); - QUrl m_weatherCurrentWeatherIconLargeUrl = QString(""); - QUrl m_weatherCurrentWeatherIconLargeDarkBgUrl = QString(""); - - QString m_weatherLowTemperature = ""; - QUrl m_weatherLowTemperatureArrowSmallUrl = QString(""); - QUrl m_weatherLowTemperatureArrowSmallDarkBgUrl = QString(""); - QUrl m_weatherLowTemperatureArrowMediumUrl = QString(""); - QUrl m_weatherLowTemperatureArrowMediumDarkBgUrl = QString(""); - QUrl m_weatherLowTemperatureArrowLargeUrl = QString(""); - QUrl m_weatherLowTemperatureArrowLargeDarkBgUrl = QString(""); - - QString m_weatherHighTemperature = ""; - QUrl m_weatherHighTemperatureArrowSmallUrl = QString(""); - QUrl m_weatherHighTemperatureArrowSmallDarkBgUrl = QString(""); - QUrl m_weatherHighTemperatureArrowMediumUrl = QString(""); - QUrl m_weatherHighTemperatureArrowMediumDarkBgUrl = QString(""); - QUrl m_weatherHighTemperatureArrowLargeUrl = QString(""); - QUrl m_weatherHighTemperatureArrowLargeDarkBgUrl = QString(""); -}; - -#endif // GUIMETADATA_H |