X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=homescreen%2Fqml%2FStatusArea.qml;h=14ccb8f7f3e4e1e4fe761248ebd9f8ccb637b89a;hb=refs%2Fchanges%2F34%2F22534%2F1;hp=3f2b280cfeff946ae7cbf8e2d417a0d2b4bb6c7c;hpb=58ecf2c3229ab677ca39095b52ab88b1a41861bd;p=apps%2Fhomescreen.git

diff --git a/homescreen/qml/StatusArea.qml b/homescreen/qml/StatusArea.qml
index 3f2b280..14ccb8f 100644
--- a/homescreen/qml/StatusArea.qml
+++ b/homescreen/qml/StatusArea.qml
@@ -37,13 +37,13 @@ Item {
         onConditionChanged: {
             var icon = ''
 
-            if (condition.indexOf("clouds") != -1) {
+            if (condition.indexOf("clouds") !== -1) {
                 icon = "WeatherIcons_Cloudy-01.png"
-            } else if (condition.indexOf("thunderstorm") != -1) {
+            } else if (condition.indexOf("thunderstorm") !== -1) {
                 icon = "WeatherIcons_Thunderstorm-01.png"
-            } else if (condition.indexOf("snow") != -1) {
+            } else if (condition.indexOf("snow") !== -1) {
                 icon = "WeatherIcons_Snow-01.png"
-            } else if (condition.indexOf("rain") != -1) {
+            } else if (condition.indexOf("rain") !== -1) {
                 icon = "WeatherIcons_Rain-01.png"
             }
 
@@ -129,30 +129,8 @@ Item {
                 Connections {
                     target: bluetooth
 
-                    //{"event":"Bluetooth-Manager\/connection","data":{"Status":"connected","Address":"88:BD:45:EC:3A:E6"},"jtype":"afb-event"}
-                    //{"event":"Bluetooth-Manager\/connection","data":{"Status":"disconnected","Address":"88:BD:45:EC:3A:E6"},"jtype":"afb-event"}
-                    onConnectionEvent: {
-                        // console.log("bluetooth connection is:", data.Status)
-                        // console.log("onConnectionEvent bt_icon.deviceName:",bt_icon.deviceName, "bt_icon.connStatus:", bt_icon.connStatus)
-                        if (data.Status == "connected"){
-                            bt_icon.connStatus = true
-                        } else if (data.Status == "disconnected"){
-                            bt_icon.connStatus = false
-                        }
-                    }
-                    //{"event":"Bluetooth-Manager\/device_updated","data":{"Address":"88:BD:45:EC:3A:E6","Name":"SG02","Paired":"True","Connected":"True","AVPConnected":"True","Metadata":{"Title":"","Artist":"","Status":"stop}
-                    onDeviceUpdatedEvent: {
-                        // console.log("bluetooth onDeviceUpdatedEvent date is:", data.Name, "Paired: ", data.Paired, "Connected: ", data.Connected)
-                        // console.log("onDeviceUpdatedEvent bt_icon.deviceName:",bt_icon.deviceName, "bt_icon.connStatus:", bt_icon.connStatus)
-                        if ( data.Paired == "True" &&  data.Connected == "True" ){
-                            bt_icon.deviceName = data.Name
-                            bt_icon.connStatus = true
-                        } else {
-                            if(bt_icon.deviceName == data.Name)
-                            {
-                                bt_icon.connStatus = false
-                            }
-                        }
+                    onPowerChanged: {
+                            bt_icon.connStatus = state
                     }
                 }
             }