diff options
| author |   zheng_wenlong <wenlong_zheng@nexty-ele.com> | 2019-02-06 13:51:09 +0900 |
|---|---|---|
| committer | zheng_wenlong <wenlong_zheng@nexty-ele.com> | 2019-02-06 13:53:35 +0900 |
| commit | 95b45c40f7db39d4a9a0ceb2995b976b0f2792e4 (patch) | |
| tree | 6d3684d394b5cc74898ccfa811f6434f639d101c /app/Als-meter-demo.qml | |
| parent | a35b3631420ac051a1b50a00806ee29900f03250 (diff) | |
Change als-meter-demo by using low-canneedlefish_13.93.0needlefish/13.93.0marlin_12.93.0marlin_12.92.0marlin_12.91.0marlin_12.90.1marlin_12.90.0marlin/12.93.0marlin/12.92.0marlin/12.91.0marlin/12.90.1marlin/12.90.0lamprey_11.92.0lamprey_11.91.0lamprey/11.92.0lamprey/11.91.0koi_10.93.0koi_10.92.0koi_10.91.0koi/10.93.0koi/10.92.0koi/10.91.0jellyfish_9.99.4jellyfish_9.99.3jellyfish_9.99.2jellyfish_9.99.1jellyfish/9.99.4jellyfish/9.99.3jellyfish/9.99.2jellyfish/9.99.1icefish_8.99.5icefish_8.99.4icefish_8.99.3icefish_8.99.2icefish_8.99.1icefish/8.99.5icefish/8.99.4icefish/8.99.3icefish/8.99.2icefish/8.99.1halibut_8.0.6halibut_8.0.5halibut_8.0.4halibut_8.0.3halibut_8.0.2halibut_8.0.1halibut_8.0.0halibut_7.99.3halibut_7.99.2halibut_7.99.1halibut_7.90.0halibut/8.0.6halibut/8.0.5halibut/8.0.4halibut/8.0.3halibut/8.0.2halibut/8.0.1halibut/8.0.0halibut/7.99.3halibut/7.99.2halibut/7.99.1halibut/7.90.09.99.49.99.39.99.29.99.18.99.58.99.48.99.38.99.28.99.18.0.68.0.58.0.48.0.38.0.28.0.18.0.07.99.37.99.27.99.17.90.013.93.012.93.012.92.012.91.012.90.112.90.011.92.011.91.010.93.010.92.010.91.0halibut
Change als-meter-demo by using low-can data.
For m3ulcb/h3ulcb board, the usb camera device id is over 10,
Detect the camera device from 0 to 19.
Change-Id: Icbd0b4327c9c356f40cea320420d149d850e4347
Signed-off-by: zheng_wenlong <wenlong_zheng@nexty-ele.com>
Diffstat (limited to 'app/Als-meter-demo.qml')
| -rw-r--r-- | app/Als-meter-demo.qml | 298 |
1 files changed, 144 insertions, 154 deletions
diff --git a/app/Als-meter-demo.qml b/app/Als-meter-demo.qml index 4549704..486c4bf 100644 --- a/app/Als-meter-demo.qml +++ b/app/Als-meter-demo.qml @@ -27,12 +27,13 @@ ApplicationWindow { height: 1487
property string als_meter_demo_request_str: ""
- property string api_str: "steering-wheel"
+ property string api_str: "low-can"
property var msgid_enu: { "call":2, "retok":3, "reterr":4, "event":5 }
property int recirc:0
property int vehiclespeed: 0
property real enginespeed: 0
- property int wshift: 0
+ property string wshift: "N"
+ property int circulation: 0
WebSocket {
id: websocket
@@ -57,23 +58,19 @@ ApplicationWindow { if (message_json[0] === msgid_enu.event){
var propertyName = message_json[2].event.split("/")[1]
- if (propertyName === "TransmissionMode"){
+ if (propertyName === "messages.transmission.mode"){
wshift = message_json[2].data.value
- }else if (propertyName === "VehicleSpeed"){
+ }else if (propertyName === "messages.vehicle.average.speed"){
vehiclespeed = message_json[2].data.value
- }else if (propertyName === "EngineSpeed"){
+ }else if (propertyName === "messages.engine.speed"){
enginespeed = message_json[2].data.value
}
- }else if (message_json[0] === msgid_enu.retok){
- for (var item in message_json[2].response){
- if (item === "TransmissionMode"){
- wshift = message_json[2].response["TransmissionMode"]["value"]
- }else if (item === "VehicleSpeed"){
- vehiclespeed = message_json[2].response["VehicleSpeed"]["value"]
- }else if (item === "EngineSpeed"){
- enginespeed = message_json[2].response["EngineSpeed"]["value"]
- }
+ else if ( message.indexOf("messages.hvac.circulation") > 0 )
+ {
+ circulation = message_json[2].data.value ? 1 : 0
}
+ }else if (message_json[0] === msgid_enu.retok){
+ console.log ("Response is OK!")
}else{
console.log ("Event type error:", message_json[0])
}
@@ -93,153 +90,160 @@ ApplicationWindow { }
Item {
- id: topscreen_up
- width: root.width
- height: (root.height - bottomscreen.height)/2
+ id: container
+ anchors.centerIn: parent
+ width: 1080
+ height: 1487
+ scale: screenInfo.scale_factor()
- CameraControl {
- id:cameracontrol_up
- listWH: true
- device: camera_up
+ Item {
+ id: topscreen_up
width: root.width
- height:80
- }
- Camera {
- id: camera_up
- width: root.width
- height: topscreen_up.height - cameracontrol_up.height
- anchors.top: cameracontrol_up.bottom
- onIsrunningChanged: {
- camerabg_up.visible = !isrunning
+ height: (root.height - bottomscreen.height)/2
- if (isrunning){
- if (cameracontrol_dn.device.cameraCnt() === 1)
- cameracontrol_dn.switchstatus = false;
- }else{
- cameracontrol_dn.switchstatus = true;
- }
+ CameraControl {
+ id:cameracontrol_up
+ listWH: true
+ device: camera_up
+ width: root.width
+ height:80
}
- onCamraCntChanged: {
- if (!camera_dn.isrunning)
- cameracontrol_dn.number = camera_dn.camranum();
+ Camera {
+ id: camera_up
+ width: root.width
+ height: topscreen_up.height - cameracontrol_up.height
+ anchors.top: cameracontrol_up.bottom
+ onIsrunningChanged: {
+ camerabg_up.visible = !isrunning
- if (!camera_up.isrunning)
- cameracontrol_up.number = camera_up.camranum();
- }
+ if (isrunning){
+ if (cameracontrol_dn.device.cameraCnt() === 1)
+ cameracontrol_dn.switchstatus = false;
+ }else{
+ cameracontrol_dn.switchstatus = true;
+ }
+ }
+ onCamraCntChanged: {
+ if (!camera_dn.isrunning)
+ cameracontrol_dn.number = camera_dn.camranum();
- Image {
- id: camerabg_up
- anchors.centerIn: parent
- width: 200
- height: 200
- source: "images/camera/camera_bg.svg"
+ if (!camera_up.isrunning)
+ cameracontrol_up.number = camera_up.camranum();
+ }
+
+ Image {
+ id: camerabg_up
+ anchors.centerIn: parent
+ width: 200
+ height: 200
+ source: "images/camera/camera_bg.svg"
+ }
}
}
- }
- Item {
- id: topscreen_dn
- width: root.width
- height: (root.height - bottomscreen.height)/2
- anchors.top: topscreen_up.bottom
- CameraControl {
- id:cameracontrol_dn
- listWH: false
- device: camera_dn
+ Item {
+ id: topscreen_dn
width: root.width
- height:80
- back:0
- }
- Camera {
- id: camera_dn
- width: root.width
- height: topscreen_dn.height - cameracontrol_dn.height
- anchors.top: cameracontrol_dn.bottom
- onIsrunningChanged: {
- camerabg_dn.visible = !isrunning
+ height: (root.height - bottomscreen.height)/2
+ anchors.top: topscreen_up.bottom
+ CameraControl {
+ id:cameracontrol_dn
+ listWH: false
+ device: camera_dn
+ width: root.width
+ height:80
+ back:0
+ }
+ Camera {
+ id: camera_dn
+ width: root.width
+ height: topscreen_dn.height - cameracontrol_dn.height
+ anchors.top: cameracontrol_dn.bottom
+ onIsrunningChanged: {
+ camerabg_dn.visible = !isrunning
- if (isrunning){
- if (cameracontrol_up.device.cameraCnt() === 1)
- cameracontrol_up.switchstatus = false;
- }else{
- cameracontrol_up.switchstatus = true;
+ if (isrunning){
+ if (cameracontrol_up.device.cameraCnt() === 1)
+ cameracontrol_up.switchstatus = false;
+ }else{
+ cameracontrol_up.switchstatus = true;
+ }
}
- }
- onCamraCntChanged: {
- if (!camera_up.isrunning)
- cameracontrol_up.number = camera_up.camranum();
+ onCamraCntChanged: {
+ if (!camera_up.isrunning)
+ cameracontrol_up.number = camera_up.camranum();
- if (!camera_dn.isrunning)
- cameracontrol_dn.number = camera_dn.camranum();
- }
+ if (!camera_dn.isrunning)
+ cameracontrol_dn.number = camera_dn.camranum();
+ }
- Image {
- id: camerabg_dn
- anchors.centerIn: parent
- width: 200
- height: 200
- source: "images/camera/camera_bg.svg"
+ Image {
+ id: camerabg_dn
+ anchors.centerIn: parent
+ width: 200
+ height: 200
+ source: "images/camera/camera_bg.svg"
+ }
}
}
- }
- Item {
- id: bottomscreen
- width: root.width
- height: 600
- anchors.bottom: parent.bottom
- Image {
- width: parent.width
- height: parent.height
- asynchronous: true
- fillMode: Image.TileHorizontally
- smooth: true
- source: "images/homescreen/homebg_bottom.svg"
- }
- RowLayout {
- id: smtparts
- anchors.left: parent.left
- anchors.right: parent.right
- Speed {
- id: speedparts
- anchors.left: parent.left
- anchors.leftMargin: 30
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 120
- width: imgwidth
- height: imgheight
+ Item {
+ id: bottomscreen
+ width: root.width
+ height: 600
+ anchors.bottom: parent.bottom
+ Image {
+ width: parent.width
+ height: parent.height
+ asynchronous: true
+ fillMode: Image.TileHorizontally
+ smooth: true
+ source: "images/homescreen/homebg_bottom.svg"
}
- ColumnLayout {
- id: tachoparts
- anchors.horizontalCenter: parent.horizontalCenter
- Tacho {
- anchors.top: parent.top
- anchors.topMargin: -60
- anchors.horizontalCenter: parent.horizontalCenter
+ RowLayout {
+ id: smtparts
+ anchors.left: parent.left
+ anchors.right: parent.right
+ Speed {
+ id: speedparts
+ anchors.left: parent.left
+ anchors.leftMargin: 30
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 120
width: imgwidth
height: imgheight
}
- MidOther {
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 110
+ ColumnLayout {
+ id: tachoparts
anchors.horizontalCenter: parent.horizontalCenter
+ Tacho {
+ anchors.top: parent.top
+ anchors.topMargin: -60
+ anchors.horizontalCenter: parent.horizontalCenter
+ width: imgwidth
+ height: imgheight
+ }
+ MidOther {
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 110
+ anchors.horizontalCenter: parent.horizontalCenter
+ width: imgwidth
+ height: imgheight
+ }
+ }
+ Mid {
+ id: midparts
+ anchors.right: parent.right
+ anchors.rightMargin: 25
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 90
width: imgwidth
height: imgheight
}
}
- Mid {
- id: midparts
- anchors.right: parent.right
- anchors.rightMargin: 25
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 90
- width: imgwidth
- height: imgheight
- }
}
}
-
onVisibleChanged: {
if (visible){
if (!websocket.active){
@@ -255,36 +259,22 @@ ApplicationWindow { }
}
- Connections {
- target: appVisible
- onVisibleChanged: {
- if (!visible){
- if (websocket.active)
- do_unsubscribe()
- }else{
- if (websocket.active){
- do_subscribe()
- }else{
- websocket.active = true
- }
- }
- }
- }
-
function do_call(binding, verb, event_name) {
als_meter_demo_request_str = '[' + msgid_enu.call + ',"99999","' + binding+'/'+verb + '", {"event":"' + event_name + '"} ]'
websocket.sendTextMessage (als_meter_demo_request_str)
}
function do_subscribe() {
- do_call(api_str, "subscribe", "VehicleSpeed")
- do_call(api_str, "subscribe", "TransmissionMode")
- do_call(api_str, "subscribe", "EngineSpeed")
+ do_call(api_str, "subscribe", "vehicle.average.speed")
+ do_call(api_str, "subscribe", "transmission.mode")
+ do_call(api_str, "subscribe", "engine.speed")
+ do_call(api_str, "subscribe", "hvac.circulation")
}
function do_unsubscribe() {
- do_call(api_str, "unsubscribe", "VehicleSpeed")
- do_call(api_str, "unsubscribe", "TransmissionMode")
- do_call(api_str, "unsubscribe", "EngineSpeed")
+ do_call(api_str, "unsubscribe", "vehicle.average.speed")
+ do_call(api_str, "unsubscribe", "transmission.mode")
+ do_call(api_str, "unsubscribe", "engine.speed")
+ do_call(api_str, "unsubscribe", "hvac.circulation")
}
}
|