summaryrefslogtreecommitdiffstats
path: root/app/bluetooth
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2016-12-22 09:07:46 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2016-12-22 09:07:46 +0000
commitec52b6af0657ebd200507e63e85573e564200d54 (patch)
treebab88e687ea87b4228a25d8c92cd54893821e550 /app/bluetooth
parent770c15e0140f9cd3772534c4fe6b0079778d0727 (diff)
parent91bc9fbdcf73222e5c000ad91e10d6e446cb5c55 (diff)
Merge "Modify UI design of Wifi and Bluetooth"
Diffstat (limited to 'app/bluetooth')
-rw-r--r--app/bluetooth/Bluetooth.qml269
1 files changed, 152 insertions, 117 deletions
diff --git a/app/bluetooth/Bluetooth.qml b/app/bluetooth/Bluetooth.qml
index e8cca1a..3a4d50f 100644
--- a/app/bluetooth/Bluetooth.qml
+++ b/app/bluetooth/Bluetooth.qml
@@ -33,6 +33,7 @@ SettingPage {
property string btAPIpath: protocol + ipAddress + ':' + portNumber + btAPI
property var jsonObjectBT
property string currentState: 'idle'
+ property string btState: 'off' //add property to indicate the bt status
Text {
id: log
@@ -53,7 +54,9 @@ SettingPage {
request(btAPIpath + 'start_discovery', function (o) {
console.log(o.responseText)
})
+ buttonScan.text = "STOP" //when power on and after send the discovery command, button set to STOP
currentState = 'discovering'
+ btState = 'on' //bt is on
//search_device()
periodicRefresh.start()
@@ -70,7 +73,9 @@ SettingPage {
//showRequestInfo(o.responseText)
console.log(o.responseText)
})
+ buttonScan.text = "SEARCH" //when power off the button should be set to SEARCH
currentState = 'idle'
+ btState = 'off' //bt off
}
}
@@ -91,7 +96,7 @@ SettingPage {
id: buttonScan
anchors.centerIn: parent
width: 100
- text: "SEARCH"
+ text: "SEARCH" //default value is SEARCH
MouseArea {
//id: mouseArea
@@ -99,15 +104,18 @@ SettingPage {
onClicked: {
if (buttonScan.text == "SEARCH"){
- request(btAPIpath + 'start_discovery', function (o) {
+ if (btState == 'on'){ //only response to the requirement when bt is on
+ request(btAPIpath + 'start_discovery', function (o) {
// log the json response
//showRequestInfo(o.responseText)
console.log(o.responseText)
})
- buttonScan.text = "CANCEL"
- currentState = 'discovering'
- periodicRefresh.start()
+ buttonScan.text = "STOP"
+ currentState = 'discovering'
+ periodicRefresh.start()
+ }
+
}else{
request(btAPIpath + 'stop_discovery', function (o) {
@@ -140,127 +148,154 @@ SettingPage {
Component {
id:blueToothDevice
Rectangle {
- height: 150
+ height: 120
width: parent.width
- color: "#222"
-
- Column {
- Text {
- id: btName
- text: deviceName
- font.pointSize: 36
- color: "#ffffff"
- }
- Text {
- id: btAddr
- text: deviceAddress
- visible: false
- }
- Text {
- text: {
- if ((devicePairable === "True")
- && (deviceConnect === "False"))
- text = "paired"
- else if ((devicePairable === "True")
- && (deviceConnect === "True")
- && (connectAVP) === "True")
- text = "AV Connection"
- else if ((devicePairable === "True")
- && (deviceConnect === "True")
- && (connectHFP) === "True")
- text = "Handsfree Connection"
- else
- text = ""
- }
- font.pointSize: 18
- color: "#ffffff"
- font.italic: true
- }
- Text {
- id: btPairable
- text: devicePairable
- visible: false
- }
- Text {
- id: btConnectstatus
- text: deviceConnect
- visible: false
- }
-
- }
- Button {
- id: removeButton
- anchors.top:parent.top
- anchors.topMargin: 15
- anchors.right: parent.right
- text: "Unpair"
+ color: "transparent"
MouseArea {
- anchors.fill: parent
- onClicked: {
- request(btAPIpath + 'remove_device?value=' + btAddr.text, function (o) {
- console.log(o.responseText)
- })
- btDeviceList.remove(findDevice(btAddr.text))
- }
- }
+ anchors.fill: parent
+ Column {
+ anchors.left: parent.left
+ anchors.leftMargin: 80
+ Text {
+ id: btName
+ text: deviceName
+ color: '#66FF99'
+ font.pixelSize: 48
+ }
+// Text {
+// id: btAddr
+// text: deviceAddress
+// font.pixelSize: 24
+// color: 'white'
+// }
+ Text {
+ text: {
+ if ((devicePairable === "True")
+ && (deviceConnect === "False"))
+ text = "paired, "
+ else if ((devicePairable === "True")
+ && (deviceConnect === "True")
+ && (connectAVP === "True")
+ && (connectHFP === "False"))
+ text = "AV Connection, "
+ else if ((devicePairable === "True")
+ && (deviceConnect === "True")
+ && (connectHFP === "True")
+ && (connectAVP === "False"))
+ text = "Handsfree Connection, "
+ else if ((devicePairable === "True")
+ && (deviceConnect === "True")
+ && (connectHFP === "True")
+ && (connectAVP === "True"))
+ text = "Handsfree & AV Connection, "
+ else
+ text = ""
+ text = text + deviceAddress
+ }
+ font.pointSize: 18
+ color: "#ffffff"
+ font.italic: true
+ }
+ Text {
+ id: btPairable
+ text: devicePairable
+ visible: false
+ }
+ Text {
+ id: btConnectstatus
+ text: deviceConnect
+ visible: false
+ }
- }
-
- Button {
- id: connectButton
- anchors.top:parent.top
- anchors.topMargin: 15
- anchors.right: removeButton.left
- anchors.rightMargin: 10
-
- text:(btConnectstatus.text == "True")? "Disconnect":((btPairable.text == "True")? "Connect":"Pair")
- MouseArea {
- anchors.fill: parent
- onClicked: {
- if (currentState == 'discovering'){
- request(btAPIpath + 'stop_discovery', function (o) {
- currentState = "idle"
- console.log(o.responseText)
- })
- }
- if (connectButton.text == "Pair"){
- connectButton.text = "Connect"
- request(btAPIpath + 'pair?value=' + btAddr.text, function (o) {
- btPairable.text = "True"
- console.log(o.responseText)
- })
- request(btAPIpath + 'set_property?Address=' + btAddr.text + '\&Property=Trusted\&value=true', function (o) {
- console.log(o.responseText)
- })
}
- else if (connectButton.text == "Connect"){
- connectButton.text = "Disconnect"
- request(btAPIpath + 'connect?value=' + btAddr.text, function (o) {
- console.log(o.responseText)
- })
+ Button {
+ id: removeButton
+ anchors.top:parent.top
+ anchors.topMargin: 15
+ //anchors.horizontalCenter: btName.horizontalCenter
+ anchors.right: parent.right
+ anchors.rightMargin: 100
+
+ text: "Unpair"
+ MouseArea {
+ anchors.fill: parent
+ onClicked: {
+ request(btAPIpath + 'remove_device?value=' + deviceAddress, function (o) {
+ console.log(o.responseText)
+ })
+ btDeviceList.remove(findDevice(deviceAddress))
+ }
+ }
+
}
- else if (connectButton.text == "Disconnect"){
- request(btAPIpath + 'disconnect?value=' + btAddr.text, function (o) {
- console.log(o.responseText)
- })
- connectButton.text = "Connect"
- btDeviceList.remove(findDevice(btAddr.text))
- }
- }
- }
+
+ Button {
+ id: connectButton
+ anchors.top:parent.top
+ anchors.topMargin: 15
+ //anchors.horizontalCenter: btName.horizontalCenter
+ anchors.right: removeButton.left
+ anchors.rightMargin: 10
+
+ text:((connectHFP === "True") || (connectAVP === "True"))? "Disconnect":((btPairable.text == "True")? "Connect":"Pair")
+ // only when HFP or AVP is connected, button will be shown as Disconnect
+ MouseArea {
+ anchors.fill: parent
+ onClicked: {
+ if (currentState == 'discovering'){
+ request(btAPIpath + 'stop_discovery', function (o) {
+ currentState = "idle"
+ console.log(o.responseText)
+ })
+ }
+ if (connectButton.text == "Pair"){
+ connectButton.text = "Connect"
+ request(btAPIpath + 'pair?value=' + deviceAddress, function (o) {
+ btPairable.text = "True"
+ console.log(o.responseText)
+ })
+ request(btAPIpath + 'set_property?Address=' + deviceAddress + '\&Property=Trusted\&value=true', function (o) {
+ console.log(o.responseText)
+ })
+ }
+ else if (connectButton.text == "Connect"){
+ connectButton.text = "Disconnect"
+ request(btAPIpath + 'connect?value=' + deviceAddress, function (o) {
+ console.log(o.responseText)
+ })
+ }
+ else if (connectButton.text == "Disconnect"){
+ request(btAPIpath + 'disconnect?value=' + deviceAddress, function (o) {
+ console.log(o.responseText)
+ })
+ connectButton.text = "Connect"
+ btDeviceList.remove(findDevice(deviceAddress))
+ }
+ }
+ }
+ }
+ }
+
+ Image {
+ source: '../images/HMI_Settings_DividingLine.svg'
+ anchors.horizontalCenter: parent.horizontalCenter
+ anchors.top: parent.top
+ anchors.topMargin: -15
+
+ visible: model.index > 0
+ }
}
- }
}
ListView {
- width: parent.width
- anchors.top: parent.top
- anchors.topMargin: 200
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 150
- model: btDeviceList
- delegate: blueToothDevice
- clip: true
+ width: parent.width
+ anchors.top: parent.top
+ anchors.topMargin: 70
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 150
+ model: btDeviceList
+ delegate: blueToothDevice
+ clip: true
}
function findDevice(address){