From 389b5994553fdae59d484068d542910efee79e9c Mon Sep 17 00:00:00 2001 From: Matt Porter Date: Mon, 25 Jun 2018 11:01:11 -0400 Subject: Reorg binding-specific modules into subdirectories Move binding-specific code into per-binding subdirectories. This separates the core message engine code and simplifies adding new binding-specific modules. Bug-AGL: SPEC-1525 Change-Id: I8fc545e3af375e2ed9e79a41363b7ade97e9b20a Signed-off-by: Matt Porter --- telephony/CMakeLists.txt | 2 + telephony/telephony.cpp | 110 +++++++++++++++++++++++++++++++++++++++++ telephony/telephony.h | 72 +++++++++++++++++++++++++++ telephony/telephonymessage.cpp | 34 +++++++++++++ telephony/telephonymessage.h | 36 ++++++++++++++ 5 files changed, 254 insertions(+) create mode 100644 telephony/CMakeLists.txt create mode 100644 telephony/telephony.cpp create mode 100644 telephony/telephony.h create mode 100644 telephony/telephonymessage.cpp create mode 100644 telephony/telephonymessage.h (limited to 'telephony') diff --git a/telephony/CMakeLists.txt b/telephony/CMakeLists.txt new file mode 100644 index 0000000..1dfcd63 --- /dev/null +++ b/telephony/CMakeLists.txt @@ -0,0 +1,2 @@ +add_headers(telephony.h telephonymessage.h) +add_sources(telephony.cpp telephonymessage.cpp) diff --git a/telephony/telephony.cpp b/telephony/telephony.cpp new file mode 100644 index 0000000..7f6a571 --- /dev/null +++ b/telephony/telephony.cpp @@ -0,0 +1,110 @@ +/* + * Copyright (C) 2017 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 "telephony.h" +#include "telephonymessage.h" + +Telephony::Telephony (QUrl &url, QObject * parent) : + QObject(parent), + m_connected(false), + m_mloop(nullptr), + m_call_state("disconnected") +{ + m_mloop = new MessageEngine(url); + QObject::connect(m_mloop, &MessageEngine::connected, this, &Telephony::onConnected); + QObject::connect(m_mloop, &MessageEngine::disconnected, this, &Telephony::onDisconnected); + QObject::connect(m_mloop, &MessageEngine::messageReceived, this, &Telephony::onMessageReceived); +} + +Telephony::~Telephony() +{ + delete m_mloop; +} + +void Telephony::dial(QString number) +{ + TelephonyMessage *tmsg = new TelephonyMessage(); + tmsg->createRequest("dial", number); + m_mloop->sendMessage(tmsg); + tmsg->deleteLater(); +} + +void Telephony::answer() +{ + TelephonyMessage *tmsg = new TelephonyMessage(); + tmsg->createRequest("answer"); + m_mloop->sendMessage(tmsg); + tmsg->deleteLater(); +} + +void Telephony::hangup() +{ + TelephonyMessage *tmsg = new TelephonyMessage(); + tmsg->createRequest("hangup"); + m_mloop->sendMessage(tmsg); + tmsg->deleteLater(); +} + +void Telephony::onConnected() +{ + QStringList events { + "callStateChanged", + "dialingCall", + "incomingCall", + "terminatedCall"}; + QStringListIterator eventIterator(events); + TelephonyMessage *tmsg; + + while (eventIterator.hasNext()) { + tmsg = new TelephonyMessage(); + tmsg->createRequest("subscribe", eventIterator.next()); + m_mloop->sendMessage(tmsg); + tmsg->deleteLater(); + } + + setConnected(true); +} + +void Telephony::onDisconnected() +{ + setConnected(false); +} + +void Telephony::onMessageReceived(MessageType type, Message *message) +{ + if (type == TelephonyEventMessage) { + TelephonyMessage *tmsg = qobject_cast(message); + + if (tmsg->isEvent()) { + if (tmsg->isCallStateChanged()) { + setCallState(tmsg->state()); + } else if (tmsg->isDialingCall()) { + m_colp = tmsg->colp(); + setCallState("dialing"); + } else if (tmsg->isIncomingCall()) { + m_clip = tmsg->clip(); + setCallState("incoming"); + } else if (tmsg->isTerminatedCall()) { + setCallState("disconnected"); + m_colp = ""; + m_clip = ""; + } + } + } + message->deleteLater(); +} diff --git a/telephony/telephony.h b/telephony/telephony.h new file mode 100644 index 0000000..7cff598 --- /dev/null +++ b/telephony/telephony.h @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2017 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 TELEPHONY_H +#define TELEPHONY_H + +#include +#include + +#include "messageengine.h" + +class Telephony : public QObject +{ + Q_OBJECT + Q_PROPERTY(bool connected READ connected WRITE setConnected NOTIFY connectedChanged) + Q_PROPERTY(QString callState READ callState WRITE setCallState NOTIFY callStateChanged) + Q_PROPERTY(QString callClip READ callClip) + Q_PROPERTY(QString callColp READ callColp) + + public: + explicit Telephony(QUrl &url, QObject * parent = Q_NULLPTR); + virtual ~Telephony(); + Q_INVOKABLE void dial(QString number); + Q_INVOKABLE void answer(); + Q_INVOKABLE void hangup(); + + void setConnected(bool state) + { + m_connected = state; + emit connectedChanged(state); + } + + void setCallState(QString callState) + { + m_call_state = callState; + emit callStateChanged(m_call_state); + } + + bool connected() { return m_connected; } + QString callState() { return m_call_state; } + QString callClip() { return m_clip; } + QString callColp() { return m_colp; } + + signals: + void connectedChanged(bool); + void callStateChanged(QString); + + private: + bool m_connected; + MessageEngine *m_mloop; + QString m_call_state; + QString m_clip; + QString m_colp; + void onConnected(); + void onDisconnected(); + void onMessageReceived(MessageType, Message*); +}; + +#endif // TELEPHONY_H diff --git a/telephony/telephonymessage.cpp b/telephony/telephonymessage.cpp new file mode 100644 index 0000000..67128cf --- /dev/null +++ b/telephony/telephonymessage.cpp @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2017 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 +#include +#include +#include + +#include "telephonymessage.h" + +bool TelephonyMessage::createRequest(QString verb, QString value) +{ + QStringList verbs {"dial", "answer", "hangup", "subscribe", "unsubscribe"}; + if (!verbs.contains(verb)) + return false; + + QJsonObject parameter; + parameter.insert("value", value); + + return Message::createRequest("telephony", verb, parameter); +} diff --git a/telephony/telephonymessage.h b/telephony/telephonymessage.h new file mode 100644 index 0000000..87d06a6 --- /dev/null +++ b/telephony/telephonymessage.h @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2017 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 TELEPHONY_MESSAGE_H +#define TELEPHONY_MESSAGE_H + +#include "message.h" + +class TelephonyMessage : public Message +{ + Q_OBJECT + public: + bool isCallStateChanged() { return (this->eventName() == "callStateChanged"); }; + bool isDialingCall() { return m_event ? (this->eventName() == "dialingCall") : false; }; + bool isIncomingCall() { return m_event ? (this->eventName() == "incomingCall") : false; }; + bool isTerminatedCall() { return (this->eventName() == "terminatedCall"); }; + QString clip() { return m_event_data.find("clip").value().toString(); }; + QString colp() { return m_event_data.find("colp").value().toString(); }; + QString state() { return m_event_data.find("state").value().toString(); }; + bool createRequest(QString verb, QString value = "None"); +}; + +#endif // TELEPHONY_MESSAGE_H -- cgit 1.2.3-korg