summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/Dialer.qml23
-rw-r--r--app/api/Telephony.qml91
-rw-r--r--app/phone.qrc1
3 files changed, 100 insertions, 15 deletions
diff --git a/app/Dialer.qml b/app/Dialer.qml
index 8937f0d..49495b3 100644
--- a/app/Dialer.qml
+++ b/app/Dialer.qml
@@ -20,10 +20,16 @@ import QtQuick.Controls 2.0
import QtMultimedia 5.5
import AGL.Demo.Controls 1.0
import 'models'
+import 'api' as API
Item {
id: root
+ API.Telephony {
+ id: telephony
+ url: bindingAddress
+ }
+
signal showContacts
function call(contact) {
name.text = contact.name
@@ -106,19 +112,6 @@ Item {
offImage: './images/HMI_Phone_Call.svg'
opacity: number.text.length > 0 ? 1 : 0.25
- Loader {
- id: ringtone
- active: false
- sourceComponent: Component {
- SoundEffect {
- loops: SoundEffect.Infinite
- source: './Phone.wav'
- category: 'phone'
- Component.onCompleted: play()
- }
- }
- }
-
onCheckedChanged: {
if (checked) {
if (number.text.length === 0) {
@@ -130,11 +123,11 @@ Item {
if (contact.name === '')
contact.name = 'Unknown'
history.insert(0, contact)
- ringtone.active = true
+ telephony.dial(number.text)
} else {
name.text = ''
number.text = ''
- ringtone.active = false
+ telephony.hangup()
}
}
}
diff --git a/app/api/Telephony.qml b/app/api/Telephony.qml
new file mode 100644
index 0000000..25af055
--- /dev/null
+++ b/app/api/Telephony.qml
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2016 The Qt Company Ltd.
+ * 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.
+ */
+
+import QtQuick 2.6
+import QtWebSockets 1.0
+
+WebSocket {
+ id: root
+ active: true
+ url: bindingAddress
+
+ property string statusString: "waiting..."
+ property string apiString: "telephony"
+ property var verbs: []
+ property string payloadLength: "9999"
+
+ readonly property var msgid: {
+ "call": 2,
+ "retok": 3,
+ "reterr": 4,
+ "event": 5
+ }
+
+ onTextMessageReceived: {
+ var json = JSON.parse(message)
+ var request = json[2].request
+ var response = json[2].response
+ console.debug("response: " + JSON.stringify(response))
+ switch (json[0]) {
+ case msgid.call:
+ break
+ case msgid.retok:
+ root.statusString = request.status
+ var verb = verbs.shift()
+ if (verb == "dial") {
+ console.debug("Dial response")
+ } else if (verb == "hangup") {
+ console.debug("Hangup response")
+ }
+ break
+ case msg.reterr:
+ root.statusString = "Bad return value, binding probably not installed"
+ break
+ case MessageId.event:
+ break
+ }
+ }
+
+ onStatusChanged: {
+ switch (status) {
+ case WebSocket.Open:
+ console.debug("onStatusChanged: Open")
+ break
+ case WebSocket.Error:
+ root.statusString = "WebSocket error: " + root.errorString
+ break
+ }
+ }
+
+ function sendSocketMesage(verb, parameter) {
+ var requestJson = [ msgid.call, payloadLength, apiString + '/' + verb, parameter ]
+ console.debug("sendSocketMessage: " + JSON.stringify(requestJson))
+ verbs.push(verb)
+ sendTextMessage(JSON.stringify(requestJson))
+ }
+
+ function dial(number) {
+ console.debug("Dialing " + number)
+ var parameterJson = { value: number }
+ sendSocketMesage("dial", parameterJson)
+ }
+
+ function hangup() {
+ var parameterJson = 'None'
+ sendSocketMesage("hangup", parameterJson)
+ }
+}
diff --git a/app/phone.qrc b/app/phone.qrc
index 50b3140..fccf1c8 100644
--- a/app/phone.qrc
+++ b/app/phone.qrc
@@ -2,6 +2,7 @@
<qresource prefix="/">
<file>Phone.qml</file>
<file>Dialer.qml</file>
+ <file>api/Telephony.qml</file>
<file>models/CallHistoryModel.qml</file>
<file>models/ContactsModel.qml</file>
<file>models/qmldir</file>