diff options
Diffstat (limited to 'homescreen/src')
| -rwxr-xr-x | homescreen/src/aglsocketwrapper.cpp | 90 | ||||
| -rwxr-xr-x | homescreen/src/aglsocketwrapper.h | 35 | ||||
| -rw-r--r-- | homescreen/src/chromecontroller.cpp | 137 | ||||
| -rw-r--r-- | homescreen/src/chromecontroller.h | 38 | ||||
| -rw-r--r-- | homescreen/src/constants.h | 40 | ||||
| -rw-r--r-- | homescreen/src/main.cpp | 4 |
6 files changed, 344 insertions, 0 deletions
diff --git a/homescreen/src/aglsocketwrapper.cpp b/homescreen/src/aglsocketwrapper.cpp new file mode 100755 index 0000000..8352660 --- /dev/null +++ b/homescreen/src/aglsocketwrapper.cpp @@ -0,0 +1,90 @@ +#include "aglsocketwrapper.h" +#include "constants.h" + +#include <QWebSocket> +#include <QUuid> +#include <QJsonArray> +#include <QJsonObject> +#include <QJsonDocument> + +#include <QDebug> + +namespace { +enum MessageTypes { + Call = 2, + Success = 3, + Error = 4, + Event = 5 +}; +} + +AglSocketWrapper::AglSocketWrapper(QObject *parent) : + QObject(parent) + , m_socket(new QWebSocket(QString(), QWebSocketProtocol::VersionLatest, this)) +{ + connect(m_socket, &QWebSocket::connected, this, &AglSocketWrapper::connected); + connect(m_socket, &QWebSocket::disconnected, this, &AglSocketWrapper::disconnected); + connect(m_socket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error), + [](QAbstractSocket::SocketError error) -> void { + qWarning() << "AglSocketWrapper internal socket error" << error; + }); + connect(m_socket, &QWebSocket::textMessageReceived, + this, [this](const QString &msg) -> void { + const QJsonDocument doc = QJsonDocument::fromJson(msg.toUtf8()); + if (doc.isArray()) { + const QJsonArray msgArray = doc.array(); + if (msgArray.count() >= 3) { + const int msgType = msgArray.at(0).toInt(); + switch (msgType) { + case Success: + case Error: { + auto callbackIt = m_callbacks.find( msgArray.at(1).toString()); + if (callbackIt != m_callbacks.constEnd()) { + (*callbackIt)(msgType == Success, msgArray.at(2)); + m_callbacks.erase(callbackIt); + } + } + break; + case Event: { + const QJsonObject eventObj = msgArray.at(2).toObject(); + emit eventReceived(msgArray.at(1).toString(), eventObj.value(vshl::DATA_TAG)); + } + break; + default: + break; + } + return; + } + } + qWarning() << "Unsupported message format:" << msg; + }); +} + +void AglSocketWrapper::open(const QUrl &url) +{ + m_socket->open(url); +} + +void AglSocketWrapper::close() +{ + m_socket->close(); +} + +void AglSocketWrapper::apiCall(const QString &api, const QString &verb, const QJsonValue &args, + AglSocketWrapper::ApiCallback callback) +{ + const QString id = QUuid::createUuid().toString(); + if (callback) + m_callbacks.insert(id, callback); + + QJsonArray callData; + callData.append(Call); + callData.append(id); + callData.append(api + QLatin1String("/") + verb); + callData.append(args); + + const QString msg = QLatin1String(QJsonDocument(callData).toJson(QJsonDocument::Compact)); + m_socket->sendTextMessage(msg); + + qDebug() << Q_FUNC_INFO << "Data sent:" << msg; +} diff --git a/homescreen/src/aglsocketwrapper.h b/homescreen/src/aglsocketwrapper.h new file mode 100755 index 0000000..4807cd5 --- /dev/null +++ b/homescreen/src/aglsocketwrapper.h @@ -0,0 +1,35 @@ +#ifndef AGLSOCKETWRAPPER_H +#define AGLSOCKETWRAPPER_H + +#include <QUrl> +#include <QMap> +#include <QObject> +#include <QJsonValue> + +#include <functional> + +class QWebSocket; +class AglSocketWrapper : public QObject +{ + Q_OBJECT +public: + explicit AglSocketWrapper(QObject *parent = nullptr); + + void open(const QUrl &url); + void close(); + + using ApiCallback = std::function<void(bool, const QJsonValue&)>; + void apiCall(const QString &api, const QString &verb, const QJsonValue &args = QJsonValue(), + ApiCallback callback = nullptr); + +signals: + void connected(); + void disconnected(); + void eventReceived(const QString &eventName, const QJsonValue &data); + +private: + QWebSocket *m_socket; + QMap<QString, ApiCallback> m_callbacks; +}; + +#endif // AGLSOCKETWRAPPER_H diff --git a/homescreen/src/chromecontroller.cpp b/homescreen/src/chromecontroller.cpp new file mode 100644 index 0000000..7994fa0 --- /dev/null +++ b/homescreen/src/chromecontroller.cpp @@ -0,0 +1,137 @@ +#include "chromecontroller.h" +#include "aglsocketwrapper.h" +#include "constants.h" + +#include <QTimer> +#include <QDebug> +#include <QJsonDocument> + +ChromeController::ChromeController(const QUrl &bindingUrl, QObject *parent) : + QObject(parent) + , m_aglSocket(new AglSocketWrapper(this)) +{ + //Alexa voice agent subscription---------------------------------------------------------------- + { + connect(m_aglSocket, &AglSocketWrapper::connected, + this, [this]() -> void { + m_aglSocket->apiCall(vshl::API, vshl::VOICE_AGENT_ENUMERATION_VERB, QJsonValue(), + [this](bool result, const QJsonValue &data) -> void { + if (!result) { + qWarning() << "Failed to enumerate voice agents"; + return; + } + + QJsonObject dataObj = data.toObject(); + auto objIt = dataObj.find(vshl::RESPONSE_TAG); + if (objIt == dataObj.constEnd()) { + qWarning() << "Voice agent enumeration response tag missing." + << dataObj; + return; + } + + dataObj = objIt.value().toObject(); + objIt = dataObj.find(vshl::AGENTS_TAG); + if (objIt == dataObj.constEnd()) { + qWarning() << "Voice agent enumeration agents tag missing." + << dataObj; + return; + } + + const QJsonArray agents = objIt.value().toArray(); + QString alexaAgentId; + for (const QJsonValue &agent : agents) { + const QJsonObject agentObj = agent.toObject(); + auto agentIt = agentObj.find(vshl::NAME_TAG); + if (agentIt == agentObj.constEnd()) + continue; + const QString agentName = agentIt.value().toString(); + agentIt = agentObj.find(vshl::ID_TAG); + if (agentIt == agentObj.constEnd()) + continue; + if (agentName.compare(vshl::ALEXA_AGENT_NAME) == 0) { + alexaAgentId = agentIt.value().toString(); + break; + } + } + if (alexaAgentId.isEmpty()) { + qWarning() << "Alexa voice agent not found"; + return; + } + + //Voice agent subscription------------------------------------------------------ + { + m_voiceAgentId = alexaAgentId; + const QJsonObject args { + { vshl::VOICE_AGENT_ID_ARG, alexaAgentId }, + { vshl::VOICE_AGENT_EVENTS_ARG, vshl::ALEXA_EVENTS_ARRAY } + }; + m_aglSocket->apiCall(vshl::API, vshl::SUBSCRIBE_VERB, args, + [](bool result, const QJsonValue &data) -> void { + qDebug() << (vshl::API + QLatin1String(":") + vshl::SUBSCRIBE_VERB) + << "result: " << result << " val: " << data; + }); + } + //------------------------------------------------------------------------------ + }); + }); + } + //----------------------------------------------------------------------------------------------< + + //Socket connection management------------------------------------------------------------------ + { + auto connectToBinding = [bindingUrl, this]() -> void { + m_aglSocket->open(bindingUrl); + qDebug() << "Connecting to:" << bindingUrl; + }; + connect(m_aglSocket, &AglSocketWrapper::disconnected, this, [connectToBinding]() -> void { + QTimer::singleShot(2500, connectToBinding); + }); + connectToBinding(); + } + //---------------------------------------------------------------------------------------------- + + //Speech chrome state change event handling----------------------------------------------------- + { + connect(m_aglSocket, &AglSocketWrapper::eventReceived, + this, [this](const QString &eventName, const QJsonValue &data) -> void { + if (eventName.compare(vshl::VOICE_DIALOG_STATE_EVENT + m_voiceAgentId) == 0) { + const QJsonObject dataObj = QJsonDocument::fromJson(data.toString().toUtf8()).object(); + auto objIt = dataObj.find(vshl::STATE_TAG); + if (objIt == dataObj.constEnd()) { + qWarning() << "Voice dialog state event state missing."; + return; + } + const QString stateStr = objIt.value().toString(); + if (stateStr.compare(vshl::VOICE_DIALOG_IDLE) == 0) { + setChromeState(Idle); + } else if (stateStr.compare(vshl::VOICE_DIALOG_LISTENING) == 0) { + setChromeState(Listening); + } else if (stateStr.compare(vshl::VOICE_DIALOG_THINKING) == 0) { + setChromeState(Thinking); + } else if (stateStr.compare(vshl::VOICE_DIALOG_SPEAKING) == 0) { + setChromeState(Speaking); + } else if (stateStr.compare(vshl::VOICE_DIALOG_MICROPHONEOFF) == 0) { + setChromeState(MicrophoneOff); + } + } + }); + } + //---------------------------------------------------------------------------------------------- +} + +void ChromeController::pushToTalk() +{ + m_aglSocket->apiCall(vshl::API, vshl::TAP_TO_TALK_VERB, QJsonValue(), + [](bool result, const QJsonValue &data) -> void { + qDebug() << (vshl::API + QLatin1String(":") + vshl::TAP_TO_TALK_VERB) + << "result: " << result << " val: " << data; + }); +} + +void ChromeController::setChromeState(ChromeController::ChromeState state) +{ + if (m_chromeState != state) { + m_chromeState = state; + emit chromeStateChanged(); + } +} diff --git a/homescreen/src/chromecontroller.h b/homescreen/src/chromecontroller.h new file mode 100644 index 0000000..27c26cb --- /dev/null +++ b/homescreen/src/chromecontroller.h @@ -0,0 +1,38 @@ +#pragma once + +#include <QObject> +#include <QUrl> + +class AglSocketWrapper; +class ChromeController : public QObject +{ + Q_OBJECT + + Q_PROPERTY(int chromeState READ chromeState NOTIFY chromeStateChanged) + +public: + enum ChromeState { + Idle = 0, + Listening, + Thinking, + Speaking, + MicrophoneOff + }; + Q_ENUM(ChromeState) + + explicit ChromeController(const QUrl &bindingUrl, QObject *parent = nullptr); + int chromeState() const { return m_chromeState; } + +public slots: + void pushToTalk(); + +signals: + void chromeStateChanged(); + +private: + void setChromeState(ChromeState state); + + AglSocketWrapper *m_aglSocket; + QString m_voiceAgentId; + ChromeState m_chromeState = Idle; +}; diff --git a/homescreen/src/constants.h b/homescreen/src/constants.h new file mode 100644 index 0000000..38de9b9 --- /dev/null +++ b/homescreen/src/constants.h @@ -0,0 +1,40 @@ +#ifndef CONSTANTS_H +#define CONSTANTS_H + +#include <QString> +#include <QJsonArray> +#include <QJsonObject> + +namespace vshl { +const QString API = QLatin1String("vshl-core"); +const QString VOICE_AGENT_ENUMERATION_VERB = QLatin1String("enumerateVoiceAgents"); +const QString SUBSCRIBE_VERB = QLatin1String("subscribe"); +const QString TAP_TO_TALK_VERB = QLatin1String("startListening"); + +const QString ALEXA_AGENT_NAME = QLatin1String("Alexa"); +const QJsonArray ALEXA_EVENTS_ARRAY = { + QLatin1String("voice_authstate_event"), + QLatin1String("voice_dialogstate_event"), + QLatin1String("voice_connectionstate_event") +}; + +const QString DATA_TAG = QLatin1String("data"); +const QString RESPONSE_TAG = QLatin1String("response"); +const QString AGENTS_TAG = QLatin1String("agents"); +const QString NAME_TAG = QLatin1String("name"); +const QString ID_TAG = QLatin1String("id"); +const QString STATE_TAG = QLatin1String("state"); + +const QString VOICE_AGENT_ID_ARG = QLatin1String("va_id"); +const QString VOICE_AGENT_EVENTS_ARG = QLatin1String("events"); +const QString VOICE_AGENT_ACTIONS_ARG = QLatin1String("actions"); + +const QString VOICE_DIALOG_STATE_EVENT = QLatin1String("vshl-core/voice_dialogstate_event#"); +const QString VOICE_DIALOG_IDLE = QLatin1String("IDLE"); +const QString VOICE_DIALOG_LISTENING = QLatin1String("LISTENING"); +const QString VOICE_DIALOG_THINKING = QLatin1String("THINKING"); +const QString VOICE_DIALOG_SPEAKING = QLatin1String("SPEAKING"); +const QString VOICE_DIALOG_MICROPHONEOFF = QLatin1String("MICROPHONEOFF"); +} + +#endif // CONSTANTS_H diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp index 5f283fb..5c819f9 100644 --- a/homescreen/src/main.cpp +++ b/homescreen/src/main.cpp @@ -32,6 +32,7 @@ #include "mastervolume.h" #include "homescreenhandler.h" #include "hmi-debug.h" +#include "chromecontroller.h" // XXX: We want this DBus connection to be shared across the different // QML objects, is there another way to do this, a nice way, perhaps? @@ -91,6 +92,8 @@ int main(int argc, char *argv[]) // qmlRegisterType<ApplicationLauncher>("HomeScreen", 1, 0, "ApplicationLauncher"); qmlRegisterType<StatusBarModel>("HomeScreen", 1, 0, "StatusBarModel"); qmlRegisterType<MasterVolume>("MasterVolume", 1, 0, "MasterVolume"); + qmlRegisterUncreatableType<ChromeController>("SpeechChrome", 1, 0, "SpeechChromeController", + QLatin1String("SpeechChromeController is uncreatable.")); ApplicationLauncher *launcher = new ApplicationLauncher(); QLibWindowmanager* layoutHandler = new QLibWindowmanager(); @@ -140,6 +143,7 @@ int main(int argc, char *argv[]) engine.rootContext()->setContextProperty("launcher", launcher); engine.rootContext()->setContextProperty("weather", new Weather(bindingAddress)); engine.rootContext()->setContextProperty("bluetooth", new Bluetooth(bindingAddress, engine.rootContext())); + engine.rootContext()->setContextProperty("speechChromeController", new ChromeController(bindingAddress, &engine)); engine.rootContext()->setContextProperty("screenInfo", &screenInfo); engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); |