diff options
author | Scott Murray <scott.murray@konsulko.com> | 2021-12-16 15:07:44 -0500 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2021-12-16 16:03:51 -0500 |
commit | fad93b42c285ffb463e9494070f40d3b339d732f (patch) | |
tree | 6ae60914c578bd34b8ebbde9b271859e8b87ab65 /bluetooth/bluetoothmodel.cpp | |
parent | fe20f1b029f67dee1f790ade7a9114086f2abd38 (diff) |
Initial rework to replace app framework usage
Changes:
- Remove "core" code related to WebSocket messaging for the app
framework.
- Stub out hvac, navigation, network, and weather interfaces. This
allows building several of the demo applications without modification
for now. The network interface will definitely be reused to plumb
in a new connman-glib library derived from the previous network
binding. The others may potentially be reused to plumb in other
new backend implementations.
- Update the Network interface object constructor arguments to add a
agent registration flag. This prepares for the connman-glib
switch and means users will not need to be updated twice.
- Update the Bluetooth interface to use a new bluez-glib library that
is derived from the previous Bluetooth binding. This has been
successfully tested with a the Settings application.
- Remove signal-composer and voice API interface code as there are no
direct replacements planned. The signal-composer interface was
effectively exposing the binding events, so has little reuse
potential with a new backend. For the voice interface, if some form
of Alexa support becomes desirable, it can potentially be brought
back for adaptation if required.
- Disable compilation of the remaining interfaces for now. Some like
map, pbap, and mediaplayer are very likely to be used as the basis
for updating their associated applications, so keeping the code for
the planned iterative development seems easier.
- Updated copyright lines in all touched files.
Bug-AGL: SPEC-4182
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ib717ac8ac68ec457eaee74755dcf9d4f36b79d12
Diffstat (limited to 'bluetooth/bluetoothmodel.cpp')
-rw-r--r-- | bluetooth/bluetoothmodel.cpp | 207 |
1 files changed, 132 insertions, 75 deletions
diff --git a/bluetooth/bluetoothmodel.cpp b/bluetooth/bluetoothmodel.cpp index 294b50b..605f950 100644 --- a/bluetooth/bluetoothmodel.cpp +++ b/bluetooth/bluetoothmodel.cpp @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2019-2021 Konsulko Group + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #include "bluetoothmodel.h" #include <QDebug> @@ -13,52 +29,52 @@ BluetoothDevice::BluetoothDevice(const QString &id, QString BluetoothDevice::id() const { - return m_id; + return m_id; } QString BluetoothDevice::address() const { - return m_address; + return m_address; } QString BluetoothDevice::name() const { - return m_name; + return m_name; } bool BluetoothDevice::paired() const { - return m_paired; + return m_paired; } bool BluetoothDevice::connected() const { - return m_connected; + return m_connected; } void BluetoothDevice::setId(const QString id) { - m_id = id; + m_id = id; } void BluetoothDevice::setAddress(const QString address) { - m_address = address; + m_address = address; } void BluetoothDevice::setName(const QString name) { - m_name = name; + m_name = name; } void BluetoothDevice::setPaired(const bool paired) { - m_paired = paired; + m_paired = paired; } void BluetoothDevice::setConnected(const bool connected) { - m_connected = connected; + m_connected = connected; } BluetoothModel::BluetoothModel(QObject *parent) @@ -68,117 +84,158 @@ BluetoothModel::BluetoothModel(QObject *parent) void BluetoothModel::addDevice(BluetoothDevice *device) { - beginInsertRows(QModelIndex(), rowCount(), rowCount()); - m_devices << device; - endInsertRows(); + if (!device) + return; + + beginInsertRows(QModelIndex(), rowCount(), rowCount()); + m_devices << device; + endInsertRows(); } void BluetoothModel::removeDevice(BluetoothDevice *device) { - int row = m_devices.indexOf(device); - beginRemoveRows(QModelIndex(), row, row); - m_devices.removeAt(row); - endRemoveRows(); - delete device; + if (!device) + return; + + int row = m_devices.indexOf(device); + if (row < 0) + return; + beginRemoveRows(QModelIndex(), row, row); + m_devices.removeAt(row); + endRemoveRows(); + delete device; } void BluetoothModel::removeAllDevices() { - beginRemoveRows(QModelIndex(), 0, m_devices.count() - 1); - qDeleteAll(m_devices.begin(), m_devices.end()); - m_devices.clear(); - endRemoveRows(); + if (!m_devices.count()) + return; + + beginRemoveRows(QModelIndex(), 0, m_devices.count() - 1); + qDeleteAll(m_devices.begin(), m_devices.end()); + m_devices.clear(); + endRemoveRows(); } int BluetoothModel::rowCount(const QModelIndex &parent) const { - Q_UNUSED(parent); - return m_devices.count(); + Q_UNUSED(parent); + return m_devices.count(); } QVariant BluetoothModel::data(const QModelIndex &index, int role) const { - if (index.row() < 0 || index.row() >= m_devices.count()) - return QVariant(); + if (index.row() < 0 || index.row() >= m_devices.count()) + return QVariant(); - const BluetoothDevice *device = m_devices[index.row()]; + const BluetoothDevice *device = m_devices[index.row()]; - switch (role) { + switch (role) { case IdRole: - return device->id(); + return device->id(); case AddressRole: - return device->address(); + return device->address(); case NameRole: - return device->name(); + return device->name(); case PairedRole: - return device->paired(); + return device->paired(); case ConnectedRole: - return device->connected(); - } + return device->connected(); + } - return QVariant(); + return QVariant(); } QHash<int, QByteArray> BluetoothModel::roleNames() const { - QHash<int, QByteArray> roles; - roles[IdRole] = "id"; - roles[AddressRole] = "address"; - roles[NameRole] = "name"; - roles[PairedRole] = "paired"; - roles[ConnectedRole] = "connected"; + QHash<int, QByteArray> roles; + roles[IdRole] = "id"; + roles[AddressRole] = "address"; + roles[NameRole] = "name"; + roles[PairedRole] = "paired"; + roles[ConnectedRole] = "connected"; - return roles; + return roles; } QModelIndex BluetoothModel::indexOf(BluetoothDevice *device) { - int row = m_devices.indexOf(device); + int row = m_devices.indexOf(device); - return index(row); + return index(row); } BluetoothDevice *BluetoothModel::getDevice(QString id) { - for (auto device : m_devices) { - if (device->id() == id) - return device; - } + for (auto device : m_devices) { + if (device->id() == id) + return device; + } - return nullptr; + return nullptr; } -BluetoothDevice *BluetoothModel::updateDeviceProperties(BluetoothDevice *device, QJsonObject data) +BluetoothDevice *BluetoothModel::updateDeviceProperties(BluetoothDevice *device, const gchar *dev_str, GVariant *properties) { - QJsonObject properties = data.value("properties").toObject(); - QString id = data.value("device").toString(); - QString address = properties.value("address").toString(); - QString name = properties.value("name").toString(); - bool paired = properties.value("paired").toBool(); - bool connected = properties.value("connected").toBool(); + GVariantDict *props_dict = g_variant_dict_new(properties); + if (!props_dict) + return nullptr; + + QString id(dev_str); + if (id.isEmpty()) { + g_variant_dict_unref(props_dict); + return nullptr; + } + + gchar *p = NULL; + QString address; + if (g_variant_dict_lookup(props_dict, "Address", "s", &p)) { + address = QString(p); + g_free(p); + } + + p = NULL; + QString name; + if (g_variant_dict_lookup(props_dict, "Name", "s", &p)) { + name = QString(p); + g_free(p); + } + + gboolean paired = FALSE; + bool have_paired = false; + if (g_variant_dict_lookup(props_dict, "Paired", "b", &paired)) { + have_paired = true; + } + + gboolean connected = FALSE; + bool have_connected = false; + if (g_variant_dict_lookup(props_dict, "Connected", "b", &connected)) { + have_connected = true; + } - if (id.isEmpty()) - return nullptr; + g_variant_dict_unref(props_dict); - if (device == nullptr) - return new BluetoothDevice(id, address, name, paired, connected); + if (device == nullptr) { + // Create new device object + return new BluetoothDevice(id, address, name, paired, connected); + } - device->setId(id); + device->setId(id); - if (!address.isEmpty()) - device->setAddress(address); + if (!address.isEmpty()) + device->setAddress(address); - if (!name.isEmpty()) - device->setName(name); + if (!name.isEmpty()) + device->setName(name); - if (properties.contains("paired")) - device->setPaired(paired); + if (have_paired) + device->setPaired(paired); - if (properties.contains("connected")) - device->setConnected(connected); + if (have_connected) + device->setConnected(connected); - emit dataChanged(indexOf(device), indexOf(device)); + emit dataChanged(indexOf(device), indexOf(device)); - return device; + return device; } BluetoothModelFilter::BluetoothModelFilter(QObject *parent) : QSortFilterProxyModel(parent) @@ -187,9 +244,9 @@ BluetoothModelFilter::BluetoothModelFilter(QObject *parent) : QSortFilterProxyMo bool BluetoothModelFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const { - BluetoothModel *model = qobject_cast<BluetoothModel *>(sourceModel()); - QModelIndex index = model->index(sourceRow); - bool paired = model->data(index, BluetoothModel::BluetoothRoles::PairedRole).toBool(); + BluetoothModel *model = qobject_cast<BluetoothModel *>(sourceModel()); + QModelIndex index = model->index(sourceRow); + bool paired = model->data(index, BluetoothModel::BluetoothRoles::PairedRole).toBool(); - return ((paired ? "true" : "false") == filterRegExp().pattern()); + return ((paired ? "true" : "false") == filterRegExp().pattern()); } |