diff options
Diffstat (limited to 'app/main.qml')
| -rw-r--r-- | app/main.qml | 75 |
1 files changed, 30 insertions, 45 deletions
diff --git a/app/main.qml b/app/main.qml index be756b8..8fdc3b7 100644 --- a/app/main.qml +++ b/app/main.qml @@ -18,7 +18,6 @@ import QtQuick 2.6 import QtQuick.Layouts 1.3
import QtQuick.Controls 2.0
import QtQuick.Window 2.2
-import Camera 1.0
import QtWebSockets 1.0
ApplicationWindow {
@@ -50,6 +49,8 @@ ApplicationWindow { }else if (websocket.status === WebSocket.Open){
console.log ("Socket Open")
do_subscribe()
+ do_unsubscribe()
+ do_subscribe()
}else if (websocket.status === WebSocket.Closed){
console.log ("Socket closed")
}
@@ -57,7 +58,7 @@ ApplicationWindow { onTextMessageReceived: {
var message_json = JSON.parse(message);
-
+ console.log ("Get message: ", message)
if (message_json[0] === msgid_enu.event){
var propertyName = message_json[2].event.split("/")[1]
if (propertyName === "messages.vehicle.average.speed"){
@@ -191,23 +192,12 @@ ApplicationWindow { width: 320
height: 180
- Camera {
- id: camdev
- width: camarea.width
- height: camarea.height
- onIsrunningChanged: {
- camerabg_up.visible = !isrunning
- }
- Image {
- id: camerabg_up
- anchors.centerIn: parent
- width: 200
- height: 200
- source: "images/camera/camera_bg.svg"
- }
- }
- Component.onCompleted: {
- camdev.enumerateCameras();
+ Image {
+ id: camerabg_up
+ anchors.centerIn: parent
+ width: 200
+ height: 200
+ source: "images/camera/camera_bg.svg"
}
}
}
@@ -230,13 +220,8 @@ ApplicationWindow { }else{
do_subscribe()
}
- var number = camdev.camranum();
- console.log("tachometer visible is " + visible)
- camdev.start(number[0], "30", "640*480")
}else{
- do_subscribe()
- console.log("tachometer visible is " + visible)
- camdev.stop()
+ do_unsubscribe()
}
}
@@ -248,30 +233,30 @@ ApplicationWindow { function do_subscribe() {
do_call(api_str, "subscribe", "vehicle.average.speed")
do_call(api_str, "subscribe", "engine.speed")
- do_call(api_str, "subscribe", "fuel.level")
- do_call(api_str, "subscribe", "transmission.gearinfo")
- do_call(api_str, "subscribe", "transmission.mode")
- do_call(api_str, "subscribe", "DriveMode")
- do_call(api_str, "subscribe", "transmission.shift.gear")
- do_call(api_str, "subscribe", "Transmission.SiftPosition.neutral")
- do_call(api_str, "subscribe", "Transmission.SiftPosition.driving")
- do_call(api_str, "subscribe", "Transmission.SiftPosition.parking")
- do_call(api_str, "subscribe", "Transmission.SiftPosition.reverse")
- do_call(api_str, "subscribe", "Transmission.SiftPosition.B")
+ // do_call(api_str, "subscribe", "fuel.level")
+ // do_call(api_str, "subscribe", "transmission.gearinfo")
+ // do_call(api_str, "subscribe", "transmission.mode")
+ // do_call(api_str, "subscribe", "DriveMode")
+ // do_call(api_str, "subscribe", "transmission.shift.gear")
+ // do_call(api_str, "subscribe", "Transmission.SiftPosition.neutral")
+ // do_call(api_str, "subscribe", "Transmission.SiftPosition.driving")
+ // do_call(api_str, "subscribe", "Transmission.SiftPosition.parking")
+ // do_call(api_str, "subscribe", "Transmission.SiftPosition.reverse")
+ // do_call(api_str, "subscribe", "Transmission.SiftPosition.B")
}
function do_unsubscribe() {
do_call(api_str, "unsubscribe", "vehicle.average.speed")
do_call(api_str, "unsubscribe", "engine.speed")
- do_call(api_str, "unsubscribe", "fuel.level")
- do_call(api_str, "unsubscribe", "transmission.gearinfo")
- do_call(api_str, "unsubscribe", "transmission.mode")
- do_call(api_str, "unsubscribe", "DriveMode")
- do_call(api_str, "unsubscribe", "transmission.shift.gear")
- do_call(api_str, "unsubscribe", "Transmission.SiftPosition.neutral")
- do_call(api_str, "unsubscribe", "Transmission.SiftPosition.driving")
- do_call(api_str, "unsubscribe", "Transmission.SiftPosition.parking")
- do_call(api_str, "unsubscribe", "Transmission.SiftPosition.reverse")
- do_call(api_str, "unsubscribe", "Transmission.SiftPosition.B")
+ // do_call(api_str, "unsubscribe", "fuel.level")
+ // do_call(api_str, "unsubscribe", "transmission.gearinfo")
+ // do_call(api_str, "unsubscribe", "transmission.mode")
+ // do_call(api_str, "unsubscribe", "DriveMode")
+ // do_call(api_str, "unsubscribe", "transmission.shift.gear")
+ // do_call(api_str, "unsubscribe", "Transmission.SiftPosition.neutral")
+ // do_call(api_str, "unsubscribe", "Transmission.SiftPosition.driving")
+ // do_call(api_str, "unsubscribe", "Transmission.SiftPosition.parking")
+ // do_call(api_str, "unsubscribe", "Transmission.SiftPosition.reverse")
+ // do_call(api_str, "unsubscribe", "Transmission.SiftPosition.B")
}
}
|