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>

1 files changed, 5 insertions, 4 deletions

diff --git a/app/Shift.qml b/app/Shift.qml
index 60a0f0f..7d2d017 100644
--- a/app/Shift.qml
+++ b/app/Shift.qml
@@ -21,7 +21,8 @@ import QtWebSockets 1.0
 Row {
     property real percent: 1
     property var carshift: [
-        "images/meters/tacho_shift_N.svg", "images/meters/tacho_shift_D.svg"
+        "images/meters/tacho_shift_N.svg", "images/meters/tacho_shift_D.svg",
+        "images/meters/tacho_shift_P.svg", "images/meters/tacho_shift_R.svg"
     ]
 
     property var wheelshift: [
@@ -36,16 +37,16 @@ Row {
         fillMode: Image.PreserveAspectFit
         smooth: true
         asynchronous: true
-        source: wshift === 0 ? carshift[0] : carshift[1]
+        source: wshift == "N" ? carshift[0] : ( wshift == "P" ? carshift[2] : ( wshift == "R" ? carshift[3] : carshift[1]))
     }
 
     Image {
-        visible: wshift > 0
+        visible: (wshift == "D1" || wshift == "D2"||wshift == "D3"||wshift == "D4"||wshift == "D5"||wshift == "D6")
         width: percent*sourceSize.width
         height: percent*sourceSize.height
         fillMode: Image.PreserveAspectFit
         smooth: true
         asynchronous: true
-        source: (wshift > 0 && wshift <= wheelshift.length) ? wheelshift[wshift-1] : wheelshift[0]
+        source: (wshift == "D1") ? wheelshift[0] : ((wshift == "D2") ? wheelshift[1] : ((wshift == "D3") ? wheelshift[2] : ((wshift == "D4") ? wheelshift[3] : ((wshift == "D5") ? wheelshift[4] : wheelshift[5] ))))
     }
 }