diff options
author | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2016-12-22 21:54:27 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@automotivelinux.org> | 2016-12-22 21:54:27 +0000 |
commit | a0a4afb1f26bf6d8c75e7f4907dd6c3b0771b0f6 (patch) | |
tree | afcc5bbb578172cbe2e5c31680fe95f53361190b | |
parent | 9b6ef23ba4a5cc3389dacad20220dd4308986da7 (diff) | |
parent | 3e63800b18c385cb0b52c593daa1f535498d01f0 (diff) |
Merge "Add status icon for bluetooth"
-rw-r--r-- | binding-bluetooth/bluetooth-api.c | 4 | ||||
-rw-r--r-- | binding-bluetooth/bluetooth-manager.c | 31 | ||||
-rw-r--r-- | binding-bluetooth/bluetooth-manager.h | 11 |
3 files changed, 46 insertions, 0 deletions
diff --git a/binding-bluetooth/bluetooth-api.c b/binding-bluetooth/bluetooth-api.c index f7e2d9a..487a79f 100644 --- a/binding-bluetooth/bluetooth-api.c +++ b/binding-bluetooth/bluetooth-api.c @@ -52,6 +52,8 @@ static void bt_power (struct afb_req request) if (0==ret) { + + setHMIStatus(ACTIVE); (TRUE==power_value)?json_object_object_add (jresp, "power", json_object_new_string ("on")) : json_object_object_add (jresp, "power", json_object_new_string ("off")); } @@ -72,6 +74,7 @@ static void bt_power (struct afb_req request) return; } json_object_object_add (jresp, "power", json_object_new_string ("on")); + setHMIStatus(ACTIVE); } /* "?value=" parameter is "0" or "false" */ @@ -84,6 +87,7 @@ static void bt_power (struct afb_req request) } json_object_object_add (jresp, "power", json_object_new_string ("off")); + setHMIStatus(INACTIVE); } else { diff --git a/binding-bluetooth/bluetooth-manager.c b/binding-bluetooth/bluetooth-manager.c index 4c49196..893760d 100644 --- a/binding-bluetooth/bluetooth-manager.c +++ b/binding-bluetooth/bluetooth-manager.c @@ -743,5 +743,36 @@ int isHFPConnected(struct btd_device *addr) { } +GError* setHMIStatus(enum btStates state) { + + gchar *iconString = NULL; + GDBusConnection *connection; + GVariant *params = NULL; + GVariant *message = NULL; + GError *error = NULL; + + if (state==INACTIVE) iconString = "qrc:/images/Status/HMI_Status_Bluetooth_Inactive-01.png"; + else if (state==ACTIVE) iconString = "qrc:/images/Status/HMI_Status_Bluetooth_On-01.png"; + else iconString = "qrc:/images/Status/HMI_Status_Bluetooth_Inactive-01.png"; + + connection = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error); + + params = g_variant_new("(is)", HOMESCREEN_BT_ICON_POSITION, iconString); + + message = g_dbus_connection_call_sync(connection, HOMESCREEN_SERVICE, + HOMESCREEN_ICON_PATH, HOMESCREEN_ICON_INTERFACE, "setStatusIcon", params, + NULL, G_DBUS_CALL_FLAGS_NONE, + DBUS_REPLY_TIMEOUT, NULL, &error); + + if (error) { + printf("error: %s\n", error->message); + + return error; + } else { + return NULL; + } + +} + /************************************** The End Of File **************************************/ diff --git a/binding-bluetooth/bluetooth-manager.h b/binding-bluetooth/bluetooth-manager.h index cb018b0..3602a78 100644 --- a/binding-bluetooth/bluetooth-manager.h +++ b/binding-bluetooth/bluetooth-manager.h @@ -77,6 +77,11 @@ #define AGENT_CONN (cli.agent_conn) #define OBEX_CONN (cli.obex_conn) +#define HOMESCREEN_SERVICE "org.agl.homescreen" +#define HOMESCREEN_ICON_INTERFACE "org.agl.statusbar" +#define HOMESCREEN_ICON_PATH "/StatusBar" +#define HOMESCREEN_BT_ICON_POSITION 1 + #define DBUS_REPLY_TIMEOUT (120 * 1000) #define DBUS_REPLY_TIMEOUT_SHORT (10 * 1000) @@ -115,6 +120,9 @@ typedef struct { GSList * device; } stBluetoothManage; +enum btStates {INACTIVE, ACTIVE}; + + int BluetoothManageInit(void); int adapter_set_powered(gboolean value); @@ -136,6 +144,9 @@ int device_set_property(struct btd_device * addr, const char *property, const ch int isAVPConnected(struct btd_device *BDdevice); int isHFPConnected(struct btd_device *BDdevice); +GError* setHMIStatus(enum btStates); + + #endif /* BLUETOOTH_MANAGER_H */ |