ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rework bluetooth wifi setup to be more userfiendly

Browse Source
This commit is contained in:
Michael Zanetti 2018-10-22 23:33:55 +02:00
parent c1a425de03
commit 0967a0fc9e
28 changed files with 834 additions and 899 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libnymea-app-core/libnymea-app-core.h
View File

@ -36,7 +36,7 @@
#include "models/valuelogsproxymodel.h"
#include "models/interfacesproxy.h"
#include "configuration/basicconfiguration.h"
#include "wifisetup/networkmanagercontroler.h"
#include "wifisetup/networkmanagercontroller.h"
#include "wifisetup/wirelessaccesspoint.h"
#include "wifisetup/wirelessaccesspoints.h"
#include "wifisetup/wirelessaccesspointsproxy.h"
@ -161,14 +161,14 @@ void registerQmlTypes() {
qmlRegisterUncreatableType<Tag>(uri, 1, 0, "Tag", "Get it from Tags");
qmlRegisterType<TagsProxyModel>(uri, 1, 0, "TagsProxyModel");
qmlRegisterType<NetworkManagerControler>(uri, 1, 0, "NetworkManagerControler");
qmlRegisterType<NetworkManagerController>(uri, 1, 0, "NetworkManagerController");
qmlRegisterType<BluetoothDiscovery>(uri, 1, 0, "BluetoothDiscovery");
qmlRegisterUncreatableType<BluetoothDeviceInfo>(uri, 1, 0, "BluetoothDeviceInfo", "Can't create this in QML. Get it from the DeviceInfos.");
qmlRegisterUncreatableType<BluetoothDeviceInfos>(uri, 1, 0, "BluetoothDeviceInfos", "Can't create this in QML. Get it from the BluetoothDiscovery.");
qmlRegisterUncreatableType<WirelessSetupManager>(uri, 1, 0, "WirelessSetupManager", "Can't create this in QML. Get it from the NetworkManagerControler.");
qmlRegisterUncreatableType<WirelessAccessPoint>(uri, 1, 0, "WirelessAccessPoints", "Can't create this in QML. Get it from the WirelessAccessPoints.");
qmlRegisterUncreatableType<WirelessAccessPoints>(uri, 1, 0, "WirelessAccessPoints", "Can't create this in QML. Get it from the Engine instance.");
qmlRegisterUncreatableType<WirelessAccessPointsProxy>(uri, 1, 0, "WirelessAccessPoints", "Can't create this in QML. Get it from the Engine instance.");
qmlRegisterType<WirelessAccessPointsProxy>(uri, 1, 0, "WirelessAccessPointsProxy");
qmlRegisterSingletonType<AWSClient>(uri, 1, 0, "AWSClient", awsClientProvider);
qmlRegisterUncreatableType<AWSDevice>(uri, 1, 0, "AWSDevice", "Can't create this in QML. Get it from AWSClient");

4
libnymea-app-core/libnymea-app-core.pro
View File

@ -63,7 +63,7 @@ SOURCES += \
wifisetup/wirelessaccesspoint.cpp \
wifisetup/wirelessaccesspoints.cpp \
wifisetup/wirelesssetupmanager.cpp \
wifisetup/networkmanagercontroler.cpp \
wifisetup/networkmanagercontroller.cpp \
models/logsmodelng.cpp \
models/interfacesproxy.cpp \
models/tagsproxymodel.cpp \
@ -123,7 +123,7 @@ HEADERS += \
wifisetup/wirelessaccesspoint.h \
wifisetup/wirelessaccesspoints.h \
wifisetup/wirelesssetupmanager.h \
wifisetup/networkmanagercontroler.h \
wifisetup/networkmanagercontroller.h \
libnymea-app-core.h \
models/logsmodelng.h \
models/interfacesproxy.h \

10
libnymea-app-core/wifisetup/bluetoothdevice.cpp
View File

@ -27,8 +27,8 @@ BluetoothDevice::BluetoothDevice(const QBluetoothDeviceInfo &deviceInfo, QObject
m_deviceInfo(deviceInfo),
m_connected(false)
{
m_controller = new QLowEnergyController(deviceInfo, this);
m_controller->setRemoteAddressType(QLowEnergyController::PublicAddress);
m_controller = QLowEnergyController::createCentral(deviceInfo, this);
// m_controller->setRemoteAddressType(QLowEnergyController::PublicAddress);
connect(m_controller, &QLowEnergyController::connected, this, &BluetoothDevice::onConnected);
connect(m_controller, &QLowEnergyController::disconnected, this, &BluetoothDevice::onDisconnected);
@ -71,6 +71,11 @@ QString BluetoothDevice::statusText() const
void BluetoothDevice::connectDevice()
{
if (m_controller->state() != QLowEnergyController::UnconnectedState) {
qDebug() << "Controller in state:" << m_controller->state() << "Not connecting...";
return;
}
qDebug() << "QLoweEnergyController connecting...";
m_controller->connectToDevice();
}
@ -144,6 +149,7 @@ void BluetoothDevice::onDeviceStateChanged(const QLowEnergyController::Controlle
setStatusText(QString(tr("%1 disconnected.").arg(name())));
break;
default:
qDebug() << "BluetoothDevice: Unhandled state entered:" << state;
break;
}
}

2
libnymea-app-core/wifisetup/bluetoothdevice.h
View File

@ -37,7 +37,7 @@ class BluetoothDevice : public QObject
Q_PROPERTY(QString statusText READ statusText NOTIFY statusTextChanged)
public:
explicit BluetoothDevice(const QBluetoothDeviceInfo &deviceInfo, QObject *parent = 0);
explicit BluetoothDevice(const QBluetoothDeviceInfo &deviceInfo, QObject *parent = nullptr);
QString name() const;
QBluetoothAddress address() const;

6
libnymea-app-core/wifisetup/bluetoothdeviceinfos.cpp
View File

@ -22,6 +22,8 @@
#include "bluetoothdeviceinfos.h"
#include <QDebug>
BluetoothDeviceInfos::BluetoothDeviceInfos(QObject *parent) : QAbstractListModel(parent)
{
@ -70,9 +72,12 @@ BluetoothDeviceInfo *BluetoothDeviceInfos::get(int index) const
void BluetoothDeviceInfos::addBluetoothDeviceInfo(BluetoothDeviceInfo *deviceInfo)
{
qDebug() << "Adding device" << deviceInfo->name();
deviceInfo->setParent(this);
beginInsertRows(QModelIndex(), m_deviceInfos.count(), m_deviceInfos.count());
m_deviceInfos.append(deviceInfo);
endInsertRows();
emit countChanged();
}
void BluetoothDeviceInfos::clearModel()
@ -81,6 +86,7 @@ void BluetoothDeviceInfos::clearModel()
qDeleteAll(m_deviceInfos);
m_deviceInfos.clear();
endResetModel();
emit countChanged();
}
QHash<int, QByteArray> BluetoothDeviceInfos::roleNames() const

6
libnymea-app-core/wifisetup/bluetoothdeviceinfos.h
View File

@ -31,6 +31,7 @@
class BluetoothDeviceInfos : public QAbstractListModel
{
Q_OBJECT
Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
public:
enum BluetoothDeviceInfoRole {
BluetoothDeviceInfoRoleName = Qt::DisplayRole,
@ -45,12 +46,15 @@ public:
int rowCount(const QModelIndex & parent = QModelIndex()) const;
QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const;
Q_INVOKABLE int count() const;
int count() const;
Q_INVOKABLE BluetoothDeviceInfo *get(int index) const;
void addBluetoothDeviceInfo(BluetoothDeviceInfo *deviceInfo);
Q_INVOKABLE void clearModel();
signals:
void countChanged();
protected:
QHash<int, QByteArray> roleNames() const;

176
libnymea-app-core/wifisetup/bluetoothdiscovery.cpp
View File

@ -23,6 +23,7 @@
#include "bluetoothdiscovery.h"
#include <QDebug>
#include <QTimer>
#include <QBluetoothLocalDevice>
BluetoothDiscovery::BluetoothDiscovery(QObject *parent) :
@ -35,40 +36,40 @@ BluetoothDiscovery::BluetoothDiscovery(QObject *parent) :
QBluetoothLocalDevice localDevice;
if (!localDevice.isValid()) {
qWarning() << "BluetoothDiscovery: there is no bluetooth device available.";
setBluetoothAvailable(false);
m_bluetoothAvailable = false;
return;
}
if (localDevice.allDevices().isEmpty()) {
qWarning() << "BluetoothDiscovery: there is no bluetooth device available currently.";
setBluetoothAvailable(false);
m_bluetoothAvailable = false;
return;
}
setBluetoothAvailable(true);
m_bluetoothAvailable = true;
// FIXME: check the device with the most capabilities and check if low energy is available
QBluetoothHostInfo adapterHostInfo = localDevice.allDevices().first();
qDebug() << "BluetoothDiscovery: using bluetooth adapter" << adapterHostInfo.name() << adapterHostInfo.address().toString();
m_localDevice = new QBluetoothLocalDevice(adapterHostInfo.address(), this);
connect(m_localDevice, &QBluetoothLocalDevice::hostModeStateChanged, this, &BluetoothDiscovery::onBluetoothHostModeChanged);
onBluetoothHostModeChanged(m_localDevice->hostMode());
m_discoveryAgent = new QBluetoothDeviceDiscoveryAgent(m_localDevice->address(), this);
#else
// Note: on iOS there is no QBluetoothLocalDevice available, therefore we have to assume there is one and
// start the discovery agent with the default constructor.
// https://bugreports.qt.io/browse/QTBUG-65547
setBluetoothAvailable(true);
setBluetoothEnabled(true);
m_discoveryAgent = new QBluetoothDeviceDiscoveryAgent(this);
m_bluetoothAvailable = true;
// Always start with assuming BT is enabled
m_bluetoothEnabled = true;
qDebug() << "Initializing Bluetooth";
onBluetoothHostModeChanged(QBluetoothLocalDevice::HostConnectable);
#endif
connect(m_discoveryAgent, &QBluetoothDeviceDiscoveryAgent::deviceDiscovered, this, &BluetoothDiscovery::deviceDiscovered);
connect(m_discoveryAgent, &QBluetoothDeviceDiscoveryAgent::finished, this, &BluetoothDiscovery::discoveryFinished);
connect(m_discoveryAgent, SIGNAL(error(QBluetoothDeviceDiscoveryAgent::Error)), this, SLOT(onError(QBluetoothDeviceDiscoveryAgent::Error)));
}
bool BluetoothDiscovery::bluetoothAvailable() const
@ -78,27 +79,50 @@ bool BluetoothDiscovery::bluetoothAvailable() const
bool BluetoothDiscovery::bluetoothEnabled() const
{
return m_bluetoothEnabled;
#ifdef Q_OS_IOS
return m_bluetoothAvailable && m_bluetoothEnabled;
#endif
qDebug() << "bluetoothEnabled(): m_bluetoothAvailable:" << m_bluetoothAvailable;
return m_bluetoothAvailable && m_localDevice->hostMode() != QBluetoothLocalDevice::HostPoweredOff;
}
void BluetoothDiscovery::setBluetoothEnabled(bool bluetoothEnabled) {
if (!m_bluetoothAvailable) {
return;
}
if (bluetoothEnabled) {
if (m_localDevice->hostMode() == QBluetoothLocalDevice::HostPoweredOff) {
m_localDevice->powerOn();
}
} else {
if (m_localDevice->hostMode() != QBluetoothLocalDevice::HostPoweredOff) {
m_localDevice->setHostMode(QBluetoothLocalDevice::HostPoweredOff);
}
}
}
void BluetoothDiscovery::setBluetoothEnabled(bool enabled)
bool BluetoothDiscovery::discoveryEnabled() const
{
m_bluetoothEnabled = enabled;
emit bluetoothEnabledChanged(m_bluetoothEnabled);
if (!m_localDevice)
return;
if (enabled) {
m_localDevice->powerOn();
} else {
m_localDevice->setHostMode(QBluetoothLocalDevice::HostPoweredOff);
}
return m_discoveryEnabled;
}
bool BluetoothDiscovery::discovering() const
{
return m_discovering;
return m_discoveryAgent && m_discoveryAgent->isActive();
}
void BluetoothDiscovery::setDiscoveryEnabled(bool discoveryEnabled)
{
if (m_discoveryEnabled == discoveryEnabled) {
return;
}
m_discoveryEnabled = discoveryEnabled;
emit discoveringChanged();
if (m_discoveryEnabled) {
start();
} else {
stop();
}
}
BluetoothDeviceInfos *BluetoothDiscovery::deviceInfos()
@ -106,36 +130,36 @@ BluetoothDeviceInfos *BluetoothDiscovery::deviceInfos()
return m_deviceInfos;
}
void BluetoothDiscovery::setBluetoothAvailable(bool available)
{
if (m_bluetoothAvailable == available)
return;
m_bluetoothAvailable = available;
emit bluetoothAvailableChanged(m_bluetoothAvailable);
}
void BluetoothDiscovery::setDiscovering(bool discovering)
{
if (m_discovering == discovering)
return;
m_discovering = discovering;
emit discoveringChanged(m_discovering);
}
void BluetoothDiscovery::onBluetoothHostModeChanged(const QBluetoothLocalDevice::HostMode &hostMode)
{
// qDebug() << "BluetoothDiscovery: host mode changed" << hostMode;
qDebug() << "BluetoothDiscovery: host mode changed" << hostMode;
switch (hostMode) {
case QBluetoothLocalDevice::HostPoweredOff:
setBluetoothEnabled(false);
stop();
if (m_discoveryAgent) {
stop();
m_discoveryAgent->deleteLater();
m_discoveryAgent = nullptr;
}
m_deviceInfos->clearModel();
emit bluetoothEnabledChanged(false);
break;
default:
// Note: discovery works in all other modes
setBluetoothEnabled(true);
emit bluetoothEnabledChanged(hostMode != QBluetoothLocalDevice::HostPoweredOff);
if (!m_discoveryAgent) {
#ifdef Q_OS_ANDROID
m_discoveryAgent = new QBluetoothDeviceDiscoveryAgent(m_localDevice->address(), this);
#else
m_discoveryAgent = new QBluetoothDeviceDiscoveryAgent(this);
#endif
connect(m_discoveryAgent, &QBluetoothDeviceDiscoveryAgent::deviceDiscovered, this, &BluetoothDiscovery::deviceDiscovered);
connect(m_discoveryAgent, &QBluetoothDeviceDiscoveryAgent::finished, this, &BluetoothDiscovery::discoveryFinished);
connect(m_discoveryAgent, &QBluetoothDeviceDiscoveryAgent::canceled, this, &BluetoothDiscovery::discoveryCancelled);
connect(m_discoveryAgent, SIGNAL(error(QBluetoothDeviceDiscoveryAgent::Error)), this, SLOT(onError(QBluetoothDeviceDiscoveryAgent::Error)));
}
if (m_discoveryEnabled && !m_discoveryAgent->isActive()) {
start();
}
break;
}
}
@ -148,7 +172,7 @@ void BluetoothDiscovery::deviceDiscovered(const QBluetoothDeviceInfo &deviceInfo
BluetoothDeviceInfo *deviceInformation = new BluetoothDeviceInfo(deviceInfo);
bool isLowEnergy = deviceInfo.coreConfigurations() & QBluetoothDeviceInfo::LowEnergyCoreConfiguration;
// qDebug() << "BluetoothDiscovery: [+]" << deviceInformation->name() << "(" << deviceInformation->address() << ")" << (isLowEnergy ? "LE" : "");
qDebug() << "BluetoothDiscovery: [+]" << deviceInformation->name() << "(" << deviceInformation->address() << ")" << (isLowEnergy ? "LE" : "");
if (!isLowEnergy || deviceInformation->name().isEmpty()) {
delete deviceInformation;
@ -158,7 +182,7 @@ void BluetoothDiscovery::deviceDiscovered(const QBluetoothDeviceInfo &deviceInfo
// Check if we already have added this device info
foreach (BluetoothDeviceInfo *di, m_deviceInfos->deviceInfos()) {
if (di->address() == deviceInformation->address()) {
// qWarning() << "BluetoothDiscover: device" << deviceInformation->name() << "(" << deviceInformation->address() << ") already added";
qWarning() << "BluetoothDiscover: device" << deviceInformation->name() << "(" << deviceInformation->address() << ") already added";
deviceInformation->deleteLater();
return;
}
@ -169,47 +193,59 @@ void BluetoothDiscovery::deviceDiscovered(const QBluetoothDeviceInfo &deviceInfo
void BluetoothDiscovery::discoveryFinished()
{
// qDebug() << "BluetoothDiscovery: Discovery finished";
if (m_enabled) {
qDebug() << "BluetoothDiscovery: Discovery finished";
if (m_discoveryEnabled) {
qDebug() << "BluetoothDiscovery: Restarting discovery";
m_discoveryAgent->start();
}
}
void BluetoothDiscovery::discoveryCancelled()
{
qDebug() << "BluetoothDiscovery: Discovery cancelled";
}
void BluetoothDiscovery::onError(const QBluetoothDeviceDiscoveryAgent::Error &error)
{
qWarning() << "BluetoothDiscovery: Discovery error:" << error << m_discoveryAgent->errorString();
setDiscovering(false);
#ifdef Q_OS_IOS
if (error == QBluetoothDeviceDiscoveryAgent::PoweredOffError) {
m_bluetoothEnabled = false;
emit bluetoothEnabledChanged(false);
onBluetoothHostModeChanged(QBluetoothLocalDevice::HostPoweredOff);
QTimer::singleShot(5000, this, [this] () {
m_bluetoothEnabled = true;
onBluetoothHostModeChanged(QBluetoothLocalDevice::HostConnectable);
});
}
#endif
emit discoveringChanged();
}
void BluetoothDiscovery::start()
{
m_enabled = true;
if (!m_discoveryAgent)
return;
if (m_discoveryAgent->isActive())
m_discoveryAgent->stop();
m_deviceInfos->clearModel();
if (!m_bluetoothEnabled) {
if (!m_discoveryAgent || !bluetoothEnabled()) {
return;
}
// qDebug() << "BluetoothDiscovery: Start discovering.";
if (m_discoveryAgent->isActive()) {
m_discoveryAgent->stop();
}
m_deviceInfos->clearModel();
qDebug() << "BluetoothDiscovery: Start discovering.";
m_discoveryAgent->start();
setDiscovering(true);
emit discoveringChanged();
}
void BluetoothDiscovery::stop()
{
m_enabled = false;
if (!m_discoveryAgent)
if (!m_discoveryAgent) {
return;
}
// qDebug() << "BluetoothDiscovery: Stop discovering.";
qDebug() << "BluetoothDiscovery: Stop discovering.";
m_discoveryAgent->stop();
setDiscovering(false);
emit discoveringChanged();
}

53
libnymea-app-core/wifisetup/bluetoothdiscovery.h
View File

@ -33,51 +33,52 @@ class BluetoothDiscovery : public QObject
{
Q_OBJECT
Q_PROPERTY(bool bluetoothAvailable READ bluetoothAvailable NOTIFY bluetoothAvailableChanged)
Q_PROPERTY(bool bluetoothEnabled READ bluetoothEnabled NOTIFY bluetoothEnabledChanged)
Q_PROPERTY(bool bluetoothEnabled READ bluetoothEnabled WRITE setBluetoothEnabled NOTIFY bluetoothEnabledChanged)
Q_PROPERTY(bool discoveryEnabled READ discoveryEnabled WRITE setDiscoveryEnabled NOTIFY discoveryEnabledChanged)
Q_PROPERTY(bool discovering READ discovering NOTIFY discoveringChanged)
Q_PROPERTY(BluetoothDeviceInfos *deviceInfos READ deviceInfos CONSTANT)
public:
explicit BluetoothDiscovery(QObject *parent = 0);
explicit BluetoothDiscovery(QObject *parent = nullptr);
bool bluetoothAvailable() const;
bool bluetoothEnabled() const;
void setBluetoothEnabled(bool enabled);
void setBluetoothEnabled(bool bluetoothEnabled);
bool discoveryEnabled() const;
void setDiscoveryEnabled(bool discoveryEnabled);
bool discovering() const;
BluetoothDeviceInfos *deviceInfos();
signals:
void bluetoothAvailableChanged(bool bluetoothAvailable);
void bluetoothEnabledChanged(bool bluetoothEnabled);
void discoveryEnabledChanged(bool discoveryEnabled);
void discoveringChanged();
private slots:
void onBluetoothHostModeChanged(const QBluetoothLocalDevice::HostMode &hostMode);
void deviceDiscovered(const QBluetoothDeviceInfo &deviceInfo);
void discoveryFinished();
void discoveryCancelled();
void onError(const QBluetoothDeviceDiscoveryAgent::Error &error);
private slots:
void start();
void stop();
private:
QBluetoothLocalDevice *m_localDevice = nullptr;
QBluetoothDeviceDiscoveryAgent *m_discoveryAgent = nullptr;
BluetoothDeviceInfos *m_deviceInfos;
bool m_enabled = false;
bool m_discovering = false;
bool m_bluetoothAvailable = false;
#ifdef Q_OS_IOS
bool m_bluetoothEnabled = false;
void setBluetoothAvailable(bool available);
void setDiscovering(bool discovering);
signals:
void bluetoothAvailableChanged(bool bluetoothAvailable);
void bluetoothEnabledChanged(bool bluetoothEnabled);
void discoveringChanged(bool discovering);
private slots:
void onBluetoothHostModeChanged(const QBluetoothLocalDevice::HostMode &hostMode);
void deviceDiscovered(const QBluetoothDeviceInfo &deviceInfo);
void discoveryFinished();
void onError(const QBluetoothDeviceDiscoveryAgent::Error &error);
public slots:
Q_INVOKABLE void start();
Q_INVOKABLE void stop();
#endif
bool m_discoveryEnabled = false;
};
#endif // BLUETOOTHDISCOVERY_H

13
libnymea-app-core/wifisetup/networkmanagercontroler.cpp → libnymea-app-core/wifisetup/networkmanagercontroller.cpp
View File

@ -20,20 +20,19 @@
* *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "networkmanagercontroler.h"
#include "engine.h"
#include "networkmanagercontroller.h"
NetworkManagerControler::NetworkManagerControler(QObject *parent) : QObject(parent)
NetworkManagerController::NetworkManagerController(QObject *parent) : QObject(parent)
{
}
BluetoothDeviceInfo *NetworkManagerControler::bluetoothDeviceInfo() const
BluetoothDeviceInfo *NetworkManagerController::bluetoothDeviceInfo() const
{
return m_bluetoothDeviceInfo;
}
void NetworkManagerControler::setBluetoothDeviceInfo(BluetoothDeviceInfo *bluetoothDeviceInfo)
void NetworkManagerController::setBluetoothDeviceInfo(BluetoothDeviceInfo *bluetoothDeviceInfo)
{
if (m_bluetoothDeviceInfo != bluetoothDeviceInfo) {
m_bluetoothDeviceInfo = bluetoothDeviceInfo;
@ -41,12 +40,12 @@ void NetworkManagerControler::setBluetoothDeviceInfo(BluetoothDeviceInfo *blueto
}
}
WirelessSetupManager *NetworkManagerControler::manager()
WirelessSetupManager *NetworkManagerController::manager()
{
return m_wirelessSetupManager;
}
void NetworkManagerControler::connectDevice()
void NetworkManagerController::connectDevice()
{
if (!m_bluetoothDeviceInfo) {
qWarning() << "Can't connect to device. bluetoothDeviceInfo not set.";

10
libnymea-app-core/wifisetup/networkmanagercontroler.h → libnymea-app-core/wifisetup/networkmanagercontroller.h
View File

@ -20,8 +20,8 @@
* *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#ifndef NETWORKMANAGERCONTROLER_H
#define NETWORKMANAGERCONTROLER_H
#ifndef NETWORKMANAGERCONTROLLER_H
#define NETWORKMANAGERCONTROLLER_H
#include <QObject>
#include <QBluetoothDeviceInfo>
@ -29,14 +29,14 @@
#include "bluetoothdeviceinfo.h"
#include "wirelesssetupmanager.h"
class NetworkManagerControler : public QObject
class NetworkManagerController : public QObject
{
Q_OBJECT
Q_PROPERTY(BluetoothDeviceInfo* bluetoothDeviceInfo READ bluetoothDeviceInfo WRITE setBluetoothDeviceInfo)
Q_PROPERTY(WirelessSetupManager *manager READ manager NOTIFY managerChanged)
public:
explicit NetworkManagerControler(QObject *parent = nullptr);
explicit NetworkManagerController(QObject *parent = nullptr);
BluetoothDeviceInfo* bluetoothDeviceInfo() const;
void setBluetoothDeviceInfo(BluetoothDeviceInfo* bluetoothDeviceInfo);
@ -57,4 +57,4 @@ signals:
};
#endif // NETWORKMANAGERCONTROLER_H
#endif // NETWORKMANAGERCONTROLLER_H

15
libnymea-app-core/wifisetup/wirelessaccesspoint.cpp
View File

@ -100,18 +100,3 @@ void WirelessAccessPoint::setProtected(const bool &isProtected)
emit isProtectedChanged(m_isProtected);
}
bool WirelessAccessPoint::selectedNetwork() const
{
return m_selectedNetwork;
}
void WirelessAccessPoint::setSelectedNetwork(bool selected)
{
if (m_selectedNetwork == selected)
return;
qDebug() << "Selected network changed" << m_ssid << selected;
m_selectedNetwork = selected;
emit selectedNetworkChanged(m_selectedNetwork);
}

8
libnymea-app-core/wifisetup/wirelessaccesspoint.h
View File

@ -34,10 +34,9 @@ class WirelessAccessPoint : public QObject
Q_PROPERTY(QString hostAddress READ hostAddress NOTIFY hostAddressChanged)
Q_PROPERTY(int signalStrength READ signalStrength NOTIFY signalStrengthChanged)
Q_PROPERTY(bool isProtected READ isProtected NOTIFY isProtectedChanged)
Q_PROPERTY(bool selectedNetwork READ selectedNetwork WRITE setSelectedNetwork NOTIFY selectedNetworkChanged)
public:
WirelessAccessPoint(QObject *parent = 0);
WirelessAccessPoint(QObject *parent = nullptr);
QString ssid() const;
void setSsid(const QString ssid);
@ -54,16 +53,12 @@ public:
bool isProtected() const;
void setProtected(const bool &isProtected);
bool selectedNetwork() const;
void setSelectedNetwork(bool selected);
private:
QString m_ssid;
QString m_macAddress;
QString m_hostAddress;
int m_signalStrength = 0;
bool m_isProtected = false;
bool m_selectedNetwork = false;
signals:
void ssidChanged(const QString &ssid);
@ -71,7 +66,6 @@ signals:
void hostAddressChanged(const QString &hostAddress);
void signalStrengthChanged(int signalStrength);
void isProtectedChanged(bool isProtected);
void selectedNetworkChanged(bool selectedNetwork);
};
#endif // WIRELESSACCESSPOINT_H

16
libnymea-app-core/wifisetup/wirelessaccesspoints.cpp
View File

@ -71,8 +71,6 @@ QVariant WirelessAccessPoints::data(const QModelIndex &index, int role) const
return accessPoint->signalStrength();
} else if (role == WirelessAccesspointRoleProtected) {
return accessPoint->isProtected();
} else if (role == WirelessAccesspointRoleSelectedNetwork) {
return accessPoint->selectedNetwork();
}
return QVariant();
@ -120,11 +118,6 @@ void WirelessAccessPoints::addWirelessAccessPoint(WirelessAccessPoint *accessPoi
m_wirelessAccessPoints.append(accessPoint);
endInsertRows();
connect(accessPoint, &WirelessAccessPoint::selectedNetworkChanged, this, [accessPoint, this]() {
int idx = m_wirelessAccessPoints.indexOf(accessPoint);
if (idx < 0) return;
emit dataChanged(index(idx), index(idx), {WirelessAccesspointRoleSelectedNetwork});
});
connect(accessPoint, &WirelessAccessPoint::signalStrengthChanged, this, [accessPoint, this]() {
int idx = m_wirelessAccessPoints.indexOf(accessPoint);
if (idx < 0) return;
@ -150,14 +143,6 @@ void WirelessAccessPoints::removeWirelessAccessPoint(WirelessAccessPoint *access
emit countChanged();
}
void WirelessAccessPoints::clearSelectedNetwork()
{
foreach (WirelessAccessPoint *accessPoint, m_wirelessAccessPoints) {
accessPoint->setSelectedNetwork(false);
accessPoint->setHostAddress(QString());
}
}
QHash<int, QByteArray> WirelessAccessPoints::roleNames() const
{
QHash<int, QByteArray> roles;
@ -166,7 +151,6 @@ QHash<int, QByteArray> WirelessAccessPoints::roleNames() const
roles[WirelessAccesspointRoleHostAddress] = "hostAddress";
roles[WirelessAccesspointRoleSignalStrength] = "signalStrength";
roles[WirelessAccesspointRoleProtected] = "protected";
roles[WirelessAccesspointRoleSelectedNetwork] = "selectedNetwork";
return roles;
}

7
libnymea-app-core/wifisetup/wirelessaccesspoints.h
View File

@ -39,11 +39,10 @@ public:
WirelessAccesspointRoleMacAddress,
WirelessAccesspointRoleHostAddress,
WirelessAccesspointRoleSignalStrength,
WirelessAccesspointRoleProtected,
WirelessAccesspointRoleSelectedNetwork
WirelessAccesspointRoleProtected
};
explicit WirelessAccessPoints(QObject *parent = 0);
explicit WirelessAccessPoints(QObject *parent = nullptr);
QList<WirelessAccessPoint *> wirelessAccessPoints();
void setWirelessAccessPoints(QList<WirelessAccessPoint *> wirelessAccessPoints);
@ -60,8 +59,6 @@ public:
void addWirelessAccessPoint(WirelessAccessPoint *accessPoint);
void removeWirelessAccessPoint(WirelessAccessPoint *accessPoint);
Q_INVOKABLE void clearSelectedNetwork();
signals:
void countChanged();

37
libnymea-app-core/wifisetup/wirelessaccesspointsproxy.cpp
View File

@ -42,43 +42,12 @@ void WirelessAccessPointsProxy::setAccessPoints(WirelessAccessPoints *accessPoin
m_accessPoints = accessPoints;
emit accessPointsChanged();
setSourceModel(m_accessPoints);
sort(0);
invalidate();
}
bool WirelessAccessPointsProxy::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
{
Q_UNUSED(source_parent)
Q_UNUSED(source_row)
// Filter out the current selected network
// WirelessAccessPoint *accessPoint = m_accessPoints->get(source_row);
// // Filter out selected network
// if (accessPoint->selectedNetwork())
// return false;
return true;
}
bool WirelessAccessPointsProxy::lessThan(const QModelIndex &left, const QModelIndex &right) const
{
WirelessAccessPoint *leftAccessPoint = m_accessPoints->get(left.row());
WirelessAccessPoint *rightAccessPoint = m_accessPoints->get(right.row());
if (leftAccessPoint->selectedNetwork())
return true;
return leftAccessPoint->signalStrength() > rightAccessPoint->signalStrength();
connect(accessPoints, &WirelessAccessPoints::countChanged, this, &WirelessAccessPointsProxy::countChanged);
setSortRole(WirelessAccessPoints::WirelessAccesspointRoleSignalStrength);
sort(0, Qt::DescendingOrder);
}
WirelessAccessPoint *WirelessAccessPointsProxy::get(int index) const
{
return m_accessPoints->get(mapToSource(this->index(index, 0)).row());
}
void WirelessAccessPointsProxy::invokeSort()
{
sort(0);
invalidate();
}

16
libnymea-app-core/wifisetup/wirelessaccesspointsproxy.h
View File

@ -32,6 +32,8 @@ class WirelessAccessPoints;
class WirelessAccessPointsProxy : public QSortFilterProxyModel
{
Q_OBJECT
Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
Q_PROPERTY(WirelessAccessPoints* accessPoints READ accessPoints WRITE setAccessPoints)
public:
explicit WirelessAccessPointsProxy(QObject *parent = nullptr);
@ -40,21 +42,13 @@ public:
Q_INVOKABLE WirelessAccessPoint* get(int index) const;
Q_INVOKABLE void invokeSort();
protected:
bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
signals:
void countChanged();
void accessPointsChanged();
private:
WirelessAccessPoints *m_accessPoints = nullptr;
signals:
void accessPointsChanged();
public slots:
};
#endif // WIRELESSACCESSPOINTSPROXY_H

123
libnymea-app-core/wifisetup/wirelesssetupmanager.cpp
View File

@ -46,11 +46,8 @@ static QBluetoothUuid systemResponseCharacteristicUuid = QBluetoothUuid(QUuid("
WirelessSetupManager::WirelessSetupManager(const QBluetoothDeviceInfo &deviceInfo, QObject *parent) :
BluetoothDevice(deviceInfo, parent),
m_accessPoints(new WirelessAccessPoints(this)),
m_accessPointsProxy(new WirelessAccessPointsProxy(this))
m_accessPoints(new WirelessAccessPoints(this))
{
m_accessPointsProxy->setAccessPoints(m_accessPoints);
connect(this, &WirelessSetupManager::connectedChanged, this, &WirelessSetupManager::onConnectedChanged);
connect(this, &WirelessSetupManager::serviceDiscoveryFinished, this, &WirelessSetupManager::onServiceDiscoveryFinished);
}
@ -85,11 +82,6 @@ bool WirelessSetupManager::initialized() const
return m_initialized;
}
bool WirelessSetupManager::initializing() const
{
return m_initializing;
}
bool WirelessSetupManager::working() const
{
return m_working;
@ -115,14 +107,14 @@ bool WirelessSetupManager::wirelessEnabled() const
return m_wirelessEnabled;
}
WirelessAccessPoints *WirelessSetupManager::accessPoints()
WirelessAccessPoints *WirelessSetupManager::accessPoints() const
{
return m_accessPoints;
}
WirelessAccessPointsProxy *WirelessSetupManager::accessPointsProxy()
WirelessAccessPoint *WirelessSetupManager::currentConnection() const
{
return m_accessPointsProxy;
return m_currentConnection;
}
void WirelessSetupManager::reloadData()
@ -149,7 +141,8 @@ void WirelessSetupManager::loadNetworks()
m_inputDataStream.clear();
setStatusText("WifiSetupManager: Loading wifi network list...");
setWorking(true);
m_working = true;
emit workingChanged();
QVariantMap request;
request.insert("c", (int)WirelessServiceCommandGetNetworks);
@ -175,7 +168,8 @@ void WirelessSetupManager::loadCurrentConnection()
m_inputDataStream.clear();
setStatusText("WifiSetupManager: Loading current connection data");
setWorking(true);
m_working = true;
emit workingChanged();
QVariantMap request;
request.insert("c", (int)WirelessServiceCommandGetCurrentConnection);
@ -198,7 +192,8 @@ void WirelessSetupManager::performWifiScan()
}
setStatusText("WifiSetupManager: Perform refresh...");
setWorking(true);
m_working = true;
emit workingChanged();
QVariantMap request;
request.insert("c", (int)WirelessServiceCommandScan);
@ -340,8 +335,6 @@ void WirelessSetupManager::checkInitialized()
if (initialized && m_wirelessEnabled && m_networkingEnabled) {
loadNetworks();
}
setInitialized(initialized);
}
void WirelessSetupManager::setModelNumber(const QString &modelNumber)
@ -374,36 +367,6 @@ void WirelessSetupManager::setHardwareRevision(const QString &hardwareRevision)
emit hardwareRevisionChanged();
}
void WirelessSetupManager::setInitializing(bool initializing)
{
if (m_initializing == initializing)
return;
qDebug() << "WifiSetupManager:" << (initializing ? "initializing" : "not initializing");
m_initializing = initializing;
emit initializingChanged();
}
void WirelessSetupManager::setInitialized(bool initialized)
{
if (m_initialized == initialized)
return;
qDebug() << "WifiSetupManager:" << (initialized ? "initialized" : "not initialized");
m_initialized = initialized;
emit initializedChanged();
}
void WirelessSetupManager::setWorking(bool working)
{
if (m_working == working)
return;
qDebug() << "WifiSetupManager:" << (working ? "working" : "not working");
m_working = working;
emit workingChanged();
}
void WirelessSetupManager::setNetworkStatus(int networkStatus)
{
if (m_networkStatus == networkStatus)
@ -491,16 +454,16 @@ void WirelessSetupManager::processNetworkResponse(const QVariantMap &response)
switch (responseCode) {
case NetworkServiceResponseIvalidValue:
emit errorOccured(tr("Invalid value."));
emit errorOccurred(tr("Invalid value."));
break;
case NetworkServiceResponseNetworkManagerNotAvailable:
emit errorOccured(tr("There is no networkmanager available on the device."));
emit errorOccurred(tr("There is no networkmanager available on the device."));
break;
case NetworkServiceResponseWirelessNotAvailable:
emit errorOccured(tr("There is no wireless device available on the device."));
emit errorOccurred(tr("There is no wireless device available on the device."));
break;
default:
emit errorOccured(tr("Unknown error occured."));
emit errorOccurred(tr("Unknown error occured."));
break;
}
@ -512,7 +475,8 @@ void WirelessSetupManager::processNetworkResponse(const QVariantMap &response)
void WirelessSetupManager::processWifiResponse(const QVariantMap &response)
{
setWorking(false);
m_working = false;
emit workingChanged();
if (!response.contains("c") || !response.contains("r")) {
qWarning() << "WifiSetupManager: Got invalid response map.";
@ -527,25 +491,25 @@ void WirelessSetupManager::processWifiResponse(const QVariantMap &response)
switch (responseCode) {
case WirelessServiceResponseIvalidCommand:
emit errorOccured(tr("Invalid command."));
emit errorOccurred(tr("Invalid command."));
break;
case WirelessServiceResponseIvalidParameters:
emit errorOccured(tr("Invalid parameters."));
emit errorOccurred(tr("Invalid parameters."));
break;
case WirelessServiceResponseNetworkManagerNotAvailable:
emit errorOccured(tr("There is no networkmanager available on the device."));
emit errorOccurred(tr("There is no networkmanager available on the device."));
break;
case WirelessServiceResponseWirelessNotAvailable:
emit errorOccured(tr("There is no wireless device available on the device."));
emit errorOccurred(tr("There is no wireless device available on the device."));
break;
case WirelessServiceResponseWirelessNotEnabled:
emit errorOccured(tr("The wireless networking is disabled on the device."));
emit errorOccurred(tr("The wireless networking is disabled on the device."));
break;
case WirelessServiceResponseNetworkingNotEnabled:
emit errorOccured(tr("The networking is disabled on the device."));
emit errorOccurred(tr("The networking is disabled on the device."));
break;
default:
emit errorOccured(tr("Unknown error occured."));
emit errorOccurred(tr("Unknown error occured."));
break;
}
@ -569,12 +533,10 @@ void WirelessSetupManager::processWifiResponse(const QVariantMap &response)
accessPoint->setMacAddress(accessPointVariantMap.value("m").toString());
accessPoint->setSignalStrength(accessPointVariantMap.value("s").toInt());
accessPoint->setProtected(accessPointVariantMap.value("p").toBool());
accessPoint->setSelectedNetwork(false);
accessPoint->setHostAddress("");
m_accessPoints->addWirelessAccessPoint(accessPoint);
}
m_accessPointsProxy->setAccessPoints(m_accessPoints);
loadCurrentConnection();
@ -595,17 +557,20 @@ void WirelessSetupManager::processWifiResponse(const QVariantMap &response)
QVariantMap currentConnection = response.value("p").toMap();;
// Find current network
m_currentConnection = nullptr;
QString macAddress = currentConnection.value("m").toString();
foreach (WirelessAccessPoint *accessPoint, m_accessPoints->wirelessAccessPoints()) {
if (accessPoint->macAddress() == macAddress) {
// Set the current network
accessPoint->setSelectedNetwork(true);
m_currentConnection = accessPoint;
accessPoint->setHostAddress(currentConnection.value("i").toString());
} else {
accessPoint->setSelectedNetwork(false);
accessPoint->setHostAddress(QString());
}
}
qDebug() << "current connection is:" << m_currentConnection;
emit currentConnectionChanged();
m_initialized = true;
emit initializedChanged();
break;
}
@ -616,7 +581,8 @@ void WirelessSetupManager::processWifiResponse(const QVariantMap &response)
void WirelessSetupManager::processSystemResponse(const QVariantMap &response)
{
setWorking(false);
m_working = false;
emit workingChanged();
if (!response.contains("c") || !response.contains("r")) {
qWarning() << "WifiSetupManager: Got invalid response map.";
@ -659,9 +625,10 @@ void WirelessSetupManager::onConnectedChanged()
m_accessPoints->clearModel();
setInitialized(false);
setInitializing(false);
setWorking(false);
m_initialized = false;
emit initializedChanged();
m_working = false;
emit workingChanged();
setManufacturer("");
setModelNumber("");
@ -673,8 +640,6 @@ void WirelessSetupManager::onConnectedChanged()
void WirelessSetupManager::onServiceDiscoveryFinished()
{
setInitializing(true);
foreach (const QBluetoothUuid &serviceUuid, controller()->services()) {
qDebug() << "WifiSetupManager: -->" << serviceUuid.toString();
}
@ -812,7 +777,8 @@ void WirelessSetupManager::onNetworkServiceStateChanged(const QLowEnergyService:
m_netwokService->writeDescriptor(wirelessEnabledCharacteristic.descriptor(QBluetoothUuid::ClientCharacteristicConfiguration), QByteArray::fromHex("0100"));
setStatusText("Connected and ready");
setWorking(false);
m_working = false;
emit workingChanged();
// Done with discovery
setNetworkStatus(networkCharacteristic.value().toHex().toUInt(0, 16));
@ -846,7 +812,10 @@ void WirelessSetupManager::onNetworkServiceCharacteristicChanged(const QLowEnerg
{
if (characteristic.uuid() == networkStatusCharacteristicUuid) {
qDebug() << "Network status changed:" << value;
setNetworkStatus(value.toHex().toUInt(0, 16));
setNetworkStatus(value.toHex().toInt(nullptr, 16));
if (m_networkStatus == NetworkStatusGlobal) {
loadCurrentConnection();
}
return;
} else if (characteristic.uuid() == networkResponseCharacteristicUuid) {
// Check if currently reading
@ -915,7 +884,6 @@ void WirelessSetupManager::onWifiServiceStateChanged(const QLowEnergyService::Se
m_wifiService->writeDescriptor(m_wifiService->characteristic(wifiStatusCharacteristicUuid).descriptor(QBluetoothUuid::ClientCharacteristicConfiguration), QByteArray::fromHex("0100"));
setWirelessStatus(m_wifiService->characteristic(wifiStatusCharacteristicUuid).value().toHex().toUInt(0, 16));
m_accessPointsProxy->invokeSort();
// System service
if (!m_systemService) {
@ -974,8 +942,11 @@ void WirelessSetupManager::onWifiServiceCharacteristicChanged(const QLowEnergyCh
}
if (characteristic.uuid() == wifiStatusCharacteristicUuid) {
qDebug() << "Wireless status changed:" << value;
setWirelessStatus(value.toHex().toUInt(0, 16));
qDebug() << "Wireless status changed:" << value.toHex().toUInt(nullptr, 16) << "Old status:" << m_wirelessStatus;
setWirelessStatus(value.toHex().toInt(nullptr, 16));
if (m_wirelessStatus == WirelessStatusActivated) {
loadCurrentConnection();
}
return;
}

123
libnymea-app-core/wifisetup/wirelesssetupmanager.h
View File

@ -36,12 +36,10 @@ class WirelessSetupManager : public BluetoothDevice
{
Q_OBJECT
Q_PROPERTY(bool working READ working NOTIFY workingChanged)
Q_PROPERTY(bool initializing READ initializing NOTIFY initializingChanged)
Q_PROPERTY(bool initialized READ initialized NOTIFY initializedChanged)
Q_PROPERTY(WirelessAccessPoints *accessPoints READ accessPoints CONSTANT)
Q_PROPERTY(WirelessAccessPointsProxy *accessPointsProxy READ accessPointsProxy CONSTANT)
Q_PROPERTY(WirelessAccessPoint *currentConnection READ currentConnection NOTIFY currentConnectionChanged)
Q_PROPERTY(QString modelNumber READ modelNumber NOTIFY modelNumberChanged)
Q_PROPERTY(QString manufacturer READ manufacturer NOTIFY manufacturerChanged)
@ -150,7 +148,6 @@ public:
QString hardwareRevision() const;
bool initialized() const;
bool initializing() const;
bool working() const;
NetworkStatus networkStatus() const;
@ -159,8 +156,8 @@ public:
bool networkingEnabled() const;
bool wirelessEnabled() const;
WirelessAccessPoints *accessPoints();
WirelessAccessPointsProxy *accessPointsProxy();
WirelessAccessPoints *accessPoints() const;
WirelessAccessPoint *currentConnection() const;
void reloadData();
@ -174,63 +171,6 @@ public:
Q_INVOKABLE void disconnectWirelessNetwork();
Q_INVOKABLE void pressPushButton();
private:
QLowEnergyService *m_deviceInformationService = nullptr;
QLowEnergyService *m_netwokService = nullptr;
QLowEnergyService *m_wifiService = nullptr;
QLowEnergyService *m_systemService = nullptr;
WirelessAccessPoints *m_accessPoints = nullptr;
WirelessAccessPointsProxy *m_accessPointsProxy = nullptr;
QString m_modelNumber;
QString m_manufacturer;
QString m_softwareRevision;
QString m_firmwareRevision;
QString m_hardwareRevision;
bool m_networkingEnabled = false;
bool m_wirelessEnabled = false;
bool m_working = false;
bool m_initialized = false;
bool m_initializing = false;
NetworkStatus m_networkStatus = NetworkStatusUnknown;
WirelessStatus m_wirelessStatus = WirelessStatusUnknown;
bool m_readingResponse = false;
QByteArray m_inputDataStream;
QString m_ssid;
QString m_password;
QVariantList m_accessPointsVariantList;
void checkInitialized();
// Private set methods for read only properties
void setModelNumber(const QString &modelNumber);
void setManufacturer(const QString &manufacturer);
void setSoftwareRevision(const QString &softwareRevision);
void setFirmwareRevision(const QString &firmwareRevision);
void setHardwareRevision(const QString &hardwareRevision);
void setInitializing(bool initializing);
void setInitialized(bool initialized);
void setWorking(bool working);
void setNetworkStatus(int networkStatus);
void setWirelessStatus(int wirelessStatus);
void setNetworkingEnabled(bool networkingEnabled);
void setWirelessEnabled(bool wirelessEnabled);
// Data methods
void streamData(const QVariantMap &request);
void processNetworkResponse(const QVariantMap &response);
void processWifiResponse(const QVariantMap &response);
void processSystemResponse(const QVariantMap &response);
signals:
void modelNumberChanged();
void manufacturerChanged();
@ -238,7 +178,6 @@ signals:
void firmwareRevisionChanged();
void hardwareRevisionChanged();
void initializingChanged();
void initializedChanged();
void workingChanged();
@ -247,7 +186,9 @@ signals:
void networkingEnabledChanged();
void wirelessEnabledChanged();
void errorOccured(const QString &errorMessage);
void currentConnectionChanged();
void errorOccurred(const QString &errorMessage);
private slots:
void onConnectedChanged();
@ -269,6 +210,58 @@ private slots:
void onSystemServiceCharacteristicChanged(const QLowEnergyCharacteristic &characteristic, const QByteArray &value);
void onSystemServiceReadFinished(const QLowEnergyCharacteristic &characteristic, const QByteArray &value);
private:
QLowEnergyService *m_deviceInformationService = nullptr;
QLowEnergyService *m_netwokService = nullptr;
QLowEnergyService *m_wifiService = nullptr;
QLowEnergyService *m_systemService = nullptr;
WirelessAccessPoints *m_accessPoints = nullptr;
WirelessAccessPoint *m_currentConnection = nullptr;
QString m_modelNumber;
QString m_manufacturer;
QString m_softwareRevision;
QString m_firmwareRevision;
QString m_hardwareRevision;
bool m_networkingEnabled = false;
bool m_wirelessEnabled = false;
bool m_working = false;
bool m_initialized = false;
NetworkStatus m_networkStatus = NetworkStatusUnknown;
WirelessStatus m_wirelessStatus = WirelessStatusUnknown;
bool m_readingResponse = false;
QByteArray m_inputDataStream;
QString m_ssid;
QString m_password;
QVariantList m_accessPointsVariantList;
void checkInitialized();
// Private set methods for read only properties
void setModelNumber(const QString &modelNumber);
void setManufacturer(const QString &manufacturer);
void setSoftwareRevision(const QString &softwareRevision);
void setFirmwareRevision(const QString &firmwareRevision);
void setHardwareRevision(const QString &hardwareRevision);
void setNetworkStatus(int networkStatus);
void setWirelessStatus(int wirelessStatus);
void setNetworkingEnabled(bool networkingEnabled);
void setWirelessEnabled(bool wirelessEnabled);
// Data methods
void streamData(const QVariantMap &request);
void processNetworkResponse(const QVariantMap &response);
void processWifiResponse(const QVariantMap &response);
void processSystemResponse(const QVariantMap &response);
};
#endif // WIRELESSSETUPMANAGER_H

2
libnymea-common/types/calendaritems.cpp
View File

@ -14,6 +14,8 @@ int CalendarItems::rowCount(const QModelIndex &parent) const
QVariant CalendarItems::data(const QModelIndex &index, int role) const
{
Q_UNUSED(index)
Q_UNUSED(role)
return QVariant();
}

2
libnymea-common/types/timeeventitems.cpp
View File

@ -16,6 +16,8 @@ int TimeEventItems::rowCount(const QModelIndex &parent) const
QVariant TimeEventItems::data(const QModelIndex &index, int role) const
{
Q_UNUSED(index)
Q_UNUSED(role)
return QVariant();
}

61
nymea-app/resources.qrc
View File

@ -3,18 +3,47 @@
<file>ui/Nymea.qml</file>
<file>ui/connection/ConnectPage.qml</file>
<file>ui/connection/ManualConnectPage.qml</file>
<file>ui/connection/BluetoothDiscoveryPage.qml</file>
<file>ui/connection/ConnectingPage.qml</file>
<file>ui/connection/wifisetup/BluetoothDiscoveryPage.qml</file>
<file>ui/connection/wifisetup/WirelessSetupPage.qml</file>
<file>ui/connection/wifisetup/ConnectWiFiPage.qml</file>
<file>ui/connection/wifisetup/NetworkSettingsPage.qml</file>
<file>ui/mainviews/DevicesPage.qml</file>
<file>ui/NewDeviceWizard.qml</file>
<file>ui/SettingsPage.qml</file>
<file>ui/components/GuhHeader.qml</file>
<file>ui/components/HeaderButton.qml</file>
<file>ui/components/ColorPicker.qml</file>
<file>ui/components/ColorIcon.qml</file>
<file>ui/components/ThinDivider.qml</file>
<file>ui/components/ThrottledSlider.qml</file>
<file>ui/components/ColorPickerCt.qml</file>
<file>ui/components/IconMenuItem.qml</file>
<file>ui/components/Graph.qml</file>
<file>ui/components/ErrorDialog.qml</file>
<file>ui/components/InterfacesModels.qml</file>
<file>ui/components/ShutterControls.qml</file>
<file>ui/components/MeaDialog.qml</file>
<file>ui/components/MeaListItemDelegate.qml</file>
<file>ui/components/MainPageTabButton.qml</file>
<file>ui/components/AutoSizeMenu.qml</file>
<file>ui/components/EmptyViewPlaceholder.qml</file>
<file>ui/components/RemoveDeviceMethodDialog.qml</file>
<file>ui/components/FancyHeader.qml</file>
<file>ui/components/MainPageTile.qml</file>
<file>ui/components/BusyOverlay.qml</file>
<file>ui/components/AWSPasswordTextField.qml</file>
<file>ui/components/BrightnessSlider.qml</file>
<file>ui/components/SegmentedImage.qml</file>
<file>ui/components/SegmentRenderer.qml</file>
<file>ui/components/SegmentBoundingBoxes.qml</file>
<file>ui/components/FingerprintVisual.qml</file>
<file>ui/components/ListSectionHeader.qml</file>
<file>ui/components/ListFilterInput.qml</file>
<file>ui/images/add.svg</file>
<file>ui/images/back.svg</file>
<file>ui/images/close.svg</file>
<file>ui/images/info.svg</file>
<file>ui/components/ColorPicker.qml</file>
<file>ui/customviews/CustomViewBase.qml</file>
<file>ui/customviews/WeatherView.qml</file>
<file>ui/customviews/MediaControllerView.qml</file>
@ -25,7 +54,6 @@
<file>ui/devicelistpages/GenericDeviceListPage.qml</file>
<file>ui/devicelistpages/LightsDeviceListPage.qml</file>
<file>ui/customviews/ExtendedVolumeController.qml</file>
<file>ui/components/ColorIcon.qml</file>
<file>ui/images/light-on.svg</file>
<file>ui/images/light-off.svg</file>
<file>ui/images/media-preview-start.svg</file>
@ -45,7 +73,6 @@
<file>ui/images/media-seek-forward.svg</file>
<file>ui/images/media-skip-backward.svg</file>
<file>ui/images/media-skip-forward.svg</file>
<file>ui/components/ThinDivider.qml</file>
<file>ui/images/weather-app-symbolic.svg</file>
<file>ui/images/weathericons/weather-clear-day.svg</file>
<file>ui/images/weathericons/weather-clear-night.svg</file>
@ -61,15 +88,11 @@
<file>ui/images/weathericons/humidity.svg</file>
<file>ui/images/weathericons/wind.svg</file>
<file>ui/devicepages/WeatherDevicePage.qml</file>
<file>ui/components/ThrottledSlider.qml</file>
<file>ui/components/ColorPickerCt.qml</file>
<file>ui/images/navigation-menu.svg</file>
<file>ui/components/IconMenuItem.qml</file>
<file>ui/images/settings.svg</file>
<file>ui/images/stock_link.svg</file>
<file>ui/images/share.svg</file>
<file>ui/devicepages/SensorDevicePage.qml</file>
<file>ui/components/Graph.qml</file>
<file>ui/images/sensors.svg</file>
<file>ui/images/network-wired-symbolic.svg</file>
<file>ui/images/notification.svg</file>
@ -109,7 +132,6 @@
<file>ui/images/go-down.svg</file>
<file>ui/system/PluginsPage.qml</file>
<file>ui/system/PluginParamsPage.qml</file>
<file>ui/components/ErrorDialog.qml</file>
<file>ui/fonts/Ubuntu-B.ttf</file>
<file>ui/fonts/Ubuntu-BI.ttf</file>
<file>ui/fonts/Ubuntu-C.ttf</file>
@ -119,7 +141,6 @@
<file>ui/fonts/Ubuntu-MI.ttf</file>
<file>ui/fonts/Ubuntu-R.ttf</file>
<file>ui/fonts/Ubuntu-RI.ttf</file>
<file>ui/components/InterfacesModels.qml</file>
<file>ui/magic/StateEvaluatorDelegate.qml</file>
<file>ui/magic/EditStateEvaluatorPage.qml</file>
<file>ui/magic/SimpleStateEvaluatorDelegate.qml</file>
@ -139,7 +160,6 @@
<file>qtquickcontrols2.conf</file>
<file>ui/images/bluetooth.svg</file>
<file>ui/images/refresh.svg</file>
<file>ui/WirelessControlerPage.qml</file>
<file>ui/images/nm-signal-00.svg</file>
<file>ui/images/nm-signal-00-secure.svg</file>
<file>ui/images/nm-signal-25.svg</file>
@ -174,14 +194,12 @@
<file>ui/images/up.svg</file>
<file>ui/devicepages/GarageGateDevicePage.qml</file>
<file>ui/images/remove.svg</file>
<file>ui/components/ShutterControls.qml</file>
<file>../LICENSE</file>
<file>ui/images/Built_with_Qt_RGB_logo.svg</file>
<file>ui/images/Built_with_Qt_RGB_logo_vertical.svg</file>
<file>ui/magic/TimeEventDelegate.qml</file>
<file>ui/magic/EditTimeEventItemPage.qml</file>
<file>ui/magic/EventDescriptorDelegate.qml</file>
<file>ui/components/MeaDialog.qml</file>
<file>ui/magic/RuleActionDelegate.qml</file>
<file>ui/magic/EditCalendarItemPage.qml</file>
<file>ui/magic/CalendarItemDelegate.qml</file>
@ -190,7 +208,6 @@
<file>ui/images/event.svg</file>
<file>ui/images/state.svg</file>
<file>ui/images/event-interface.svg</file>
<file>ui/components/MeaListItemDelegate.qml</file>
<file>ui/images/state-interface.svg</file>
<file>ui/images/action-interface.svg</file>
<file>ui/system/AboutNymeaPage.qml</file>
@ -203,14 +220,9 @@
<file>ui/images/starred.svg</file>
<file>ui/images/non-starred.svg</file>
<file>ui/images/slideshow.svg</file>
<file>ui/components/MainPageTabButton.qml</file>
<file>ui/mainviews/ScenesView.qml</file>
<file>ui/mainviews/FavoritesView.qml</file>
<file>ui/mainviews/DevicesPageDelegate.qml</file>
<file>ui/components/AutoSizeMenu.qml</file>
<file>ui/components/EmptyViewPlaceholder.qml</file>
<file>ui/components/RemoveDeviceMethodDialog.qml</file>
<file>ui/components/FancyHeader.qml</file>
<file>ui/images/awning/awning-100.svg</file>
<file>ui/devicepages/AwningDevicePage.qml</file>
<file>ui/images/awning/awning-000.svg</file>
@ -232,7 +244,6 @@
<file>ui/images/sensors/moisture.svg</file>
<file>ui/images/sensors/pressure.svg</file>
<file>ui/images/sensors/temperature.svg</file>
<file>ui/components/MainPageTile.qml</file>
<file>ui/images/configure.svg</file>
<file>ui/images/network-wifi-symbolic.svg</file>
<file>ui/KeyboardLoader.qml</file>
@ -240,14 +251,11 @@
<file>ui/system/CloudSettingsPage.qml</file>
<file>ui/images/cloud-offline.svg</file>
<file>ui/images/cloud-error.svg</file>
<file>ui/components/BusyOverlay.qml</file>
<file>ui/components/AWSPasswordTextField.qml</file>
<file>ui/appsettings/AboutPage.qml</file>
<file>ui/appsettings/AppSettingsPage.qml</file>
<file>ui/appsettings/DeveloperOptionsPage.qml</file>
<file>ui/appsettings/CloudLoginPage.qml</file>
<file>ui/devicepages/NotificationsDevicePage.qml</file>
<file>ui/components/BrightnessSlider.qml</file>
<file>ui/devicepages/LightDevicePage.qml</file>
<file>ui/devicelistpages/SensorsDeviceListPage.qml</file>
<file>ui/devicelistpages/WeatherDeviceListPage.qml</file>
@ -257,18 +265,13 @@
<file>ui/devicepages/FingerprintReaderDevicePage.qml</file>
<file>ui/images/account.svg</file>
<file>ui/images/contact-new.svg</file>
<file>ui/components/SegmentedImage.qml</file>
<file>ui/components/SegmentRenderer.qml</file>
<file>ui/components/SegmentBoundingBoxes.qml</file>
<file>ui/components/FingerprintVisual.qml</file>
<file>ui/images/fingerprint/fingerprint_boxes.json</file>
<file>ui/images/fingerprint/fingerprint_segmented.png</file>
<file>ui/images/fingerprint.svg</file>
<file>ui/components/ListSectionHeader.qml</file>
<file>ui/images/find.svg</file>
<file>ui/images/erase.svg</file>
<file>ui/components/ListFilterInput.qml</file>
<file>ui/system/ConnectionInterfacesPage.qml</file>
<file>ui/system/ConnectionInterfaceDelegate.qml</file>
<file>ui/connection/wifisetup/BoxInfoPage.qml</file>
</qresource>
</RCC>

445
nymea-app/ui/WirelessControlerPage.qml
View File

@ -1,445 +0,0 @@
import QtQuick 2.4
import QtQuick.Controls 2.1
import QtQuick.Layouts 1.2
import QtQuick.Controls.Material 2.1
import Nymea 1.0
import "components"
Page {
id: root
property string name
property string address
property QtObject networkManger
header: GuhHeader {
text: qsTr("%1 box network setup").arg(app.systemName)
onBackPressed: {
pageStack.pop()
pageStack.pop()
}
HeaderButton {
imageSource: Qt.resolvedUrl("images/refresh.svg")
onClicked: networkManger.manager.loadNetworks()
}
HeaderButton {
imageSource: Qt.resolvedUrl("images/settings.svg")
onClicked: pageStack.push(settingsPage)
}
}
Connections {
target: networkManger.manager
onErrorOccured: {
print("Error occurred", errorMessage)
var errorDialog = Qt.createComponent(Qt.resolvedUrl("components/ErrorDialog.qml"));
var popup = errorDialog.createObject(app, {text: errorMessage})
popup.open()
}
onWirelessStatusChanged: {
switch(networkManger.manager.wirelessStatus) {
case WirelessSetupManager.WirelessStatusDisconnected:
//networkManger.manager.loadCurrentConnection()
networkManger.manager.accessPoints.clearSelectedNetwork()
break;
case WirelessSetupManager.WirelessStatusActivated:
networkManger.manager.loadCurrentConnection()
break;
default:
break;
}
}
}
function getWirelessStatusString() {
switch (networkManger.manager.wirelessStatus) {
case WirelessSetupManager.WirelessStatusUnknown:
return qsTr("Unknown status.");
case WirelessSetupManager.WirelessStatusUnmanaged:
return qsTr("Network unmanaged.");
case WirelessSetupManager.WirelessStatusUnavailable:
return qsTr("Network unavailable.");
case WirelessSetupManager.WirelessStatusDisconnected:
return qsTr("Disconnected.");
case WirelessSetupManager.WirelessStatusPrepare:
return qsTr("Prepare connection...");
case WirelessSetupManager.WirelessStatusConfig:
return qsTr("Configure network...");
case WirelessSetupManager.WirelessStatusNeedAuth:
return qsTr("Authentication needed");
case WirelessSetupManager.WirelessStatusIpConfig:
return qsTr("Configuration IP...");
case WirelessSetupManager.WirelessStatusIpCheck:
return qsTr("Check IP...");
case WirelessSetupManager.WirelessStatusSecondaries:
return qsTr("Secondaries...");
case WirelessSetupManager.WirelessStatusActivated:
return qsTr("Network connected.");
case WirelessSetupManager.WirelessStatusDeactivating:
return qsTr("Network disconnecting...");
case WirelessSetupManager.WirelessStatusFailed:
return qsTr("Network connection failed.");
default:
return "???";
}
}
function getNetworkStatusString() {
switch (networkManger.manager.networkStatus) {
case WirelessSetupManager.NetworkStatusUnknown:
return qsTr("Unknown status.");
case WirelessSetupManager.NetworkStatusAsleep:
return qsTr("Asleep.");
case WirelessSetupManager.NetworkStatusDisconnected:
return qsTr("Disconnected.");
case WirelessSetupManager.NetworkStatusDisconnecting:
return qsTr("Disconnecting...");
case WirelessSetupManager.NetworkStatusConnecting:
return qsTr("Connecting...");
case WirelessSetupManager.NetworkStatusLocal:
return qsTr("Connected local.");
case WirelessSetupManager.NetworkStatusConnectedSite:
return qsTr("Connected site.");
case WirelessSetupManager.NetworkStatusGlobal:
return qsTr("Online.");
default:
return "???"
}
}
ColumnLayout {
anchors.fill: parent
visible: networkManger.manager.initialized
MeaListItemDelegate {
Layout.fillWidth: true
progressive: false
text: qsTr("Networking status")
subText: getNetworkStatusString()
}
ThinDivider {
visible: networkManger.manager.wirelessEnabled
}
ListView {
Layout.fillWidth: true
Layout.fillHeight: true
model: networkManger.manager.accessPointsProxy
clip: true
BusyIndicator {
anchors.centerIn: parent
running: networkManger.manager.working
}
delegate: MeaListItemDelegate {
width: parent.width
text: model.ssid
enabled: !networkManger.manager.working
subText: {
if (!model.selectedNetwork) {
return "";
}
return getWirelessStatusString()
}
iconColor: model.selectedNetwork ? app.accentColor : "#808080"
iconName: {
if (model.protected) {
if (model.signalStrength <= 25)
return Qt.resolvedUrl("images/nm-signal-25-secure.svg")
if (model.signalStrength <= 50)
return Qt.resolvedUrl("images/nm-signal-50-secure.svg")
if (model.signalStrength <= 75)
return Qt.resolvedUrl("images/nm-signal-75-secure.svg")
if (model.signalStrength <= 100)
return Qt.resolvedUrl("images/nm-signal-100-secure.svg")
} else {
if (model.signalStrength <= 25)
return Qt.resolvedUrl("images/nm-signal-25.svg")
if (model.signalStrength <= 50)
return Qt.resolvedUrl("images/nm-signal-50.svg")
if (model.signalStrength <= 75)
return Qt.resolvedUrl("images/nm-signal-75.svg")
if (model.signalStrength <= 100)
return Qt.resolvedUrl("images/nm-signal-100.svg")
}
}
onClicked: {
print("Connect to ", model.ssid, " --> ", model.macAddress)
if (model.selectedNetwork) {
pageStack.push(networkInformationPage, { ssid: model.ssid, macAddress: model.macAddress })
} else {
pageStack.push(authenticationPage, { ssid: model.ssid, macAddress: model.macAddress })
}
}
}
}
}
Component {
id: networkInformationPage
Page {
id: root
property string ssid
property string macAddress
property var accessPoint : networkManger.manager.accessPoints.getAccessPoint(ssid)
header: GuhHeader {
text: qsTr("Network information")
onBackPressed: pageStack.pop()
}
ColumnLayout {
anchors { left: parent.left; top: parent.top; right: parent.right }
MeaListItemDelegate {
Layout.fillWidth: true
progressive: false
text: qsTr("SSID:")
subText: root.ssid
}
MeaListItemDelegate {
Layout.fillWidth: true
progressive: false
text: qsTr("Mac Address:")
subText: root.macAddress
}
MeaListItemDelegate {
Layout.fillWidth: true
progressive: false
text: qsTr("Host Address:")
subText: accessPoint.hostAddress
}
MeaListItemDelegate {
Layout.fillWidth: true
progressive: false
text: qsTr("Signal strength:")
subText: accessPoint.signalStrength
}
MeaListItemDelegate {
Layout.fillWidth: true
progressive: false
text: qsTr("Protected:")
subText: accessPoint.isProtected ? "Protected" : "Open"
}
MeaListItemDelegate {
Layout.fillWidth: true
progressive: false
text: qsTr("Connection status:")
subText: getWirelessStatusString()
}
Button {
Layout.fillWidth: true
Layout.leftMargin: app.margins
Layout.rightMargin: app.margins
text: qsTr("Disconnect")
onPressed: {
networkManger.manager.disconnectWirelessNetwork()
pageStack.pop()
}
}
}
}
}
Component {
id: authenticationPage
Page {
id: root
property string ssid
property string macAddress
header: GuhHeader {
text: qsTr("Wireless authentication")
onBackPressed: pageStack.pop()
}
ColumnLayout {
anchors { left: parent.left; top: parent.top; right: parent.right }
Label {
wrapMode: Text.WordWrap
Layout.fillWidth: true
Layout.leftMargin: app.margins
Layout.rightMargin: app.margins
Layout.topMargin: app.margins
text: qsTr("Please enter the password for the Wifi network.")
}
MeaListItemDelegate {
Layout.fillWidth: true
text: ssid
subText: macAddress
progressive: false
}
RowLayout {
Layout.fillWidth: true
Layout.leftMargin: app.margins
Layout.rightMargin: app.margins
spacing: app.margins
TextField {
id: passwordTextField
Layout.fillWidth: true
echoMode: TextInput.Password
}
ColorIcon {
Layout.preferredHeight: app.iconSize
Layout.preferredWidth: app.iconSize
name: "../images/eye.svg"
color: passwordTextField.echoMode === TextInput.Normal ? app.accentColor : keyColor
MouseArea {
anchors.fill: parent
anchors.margins: -app.margins / 2
onClicked: {
if (passwordTextField.echoMode === TextInput.Normal) {
passwordTextField.echoMode = TextInput.Password
} else {
passwordTextField.echoMode = TextInput.Normal
}
}
}
}
}
Button {
Layout.fillWidth: true
Layout.leftMargin: app.margins
Layout.rightMargin: app.margins
text: qsTr("Connect")
onPressed: {
networkManger.manager.connectWirelessNetwork(ssid, passwordTextField.text)
var accessPoint = networkManger.manager.accessPoints.getAccessPoint(ssid)
networkManger.manager.accessPoints.clearSelectedNetwork()
accessPoint.selectedNetwork = true
pageStack.pop()
}
}
}
}
}
Component {
id: settingsPage
Page {
id: root
header: GuhHeader {
text: qsTr("Network manager settings")
onBackPressed: pageStack.pop()
}
ColumnLayout {
anchors { left: parent.left; top: parent.top; right: parent.right }
MeaListItemDelegate {
Layout.fillWidth: true
iconName: "../images/info.svg"
text: qsTr("About this %1 box").arg(app.systemName)
onClicked: pageStack.push(infoPage)
}
SwitchDelegate {
Layout.fillWidth: true
text: qsTr("Networking")
checked: networkManger.manager.networkingEnabled
onClicked: networkManger.manager.enableNetworking(checked)
}
SwitchDelegate {
Layout.fillWidth: true
enabled: networkManger.manager.networkingEnabled
text: qsTr("Wireless network")
checked: networkManger.manager.wirelessEnabled
onClicked: {
networkManger.manager.enableWireless(checked)
}
}
Button {
Layout.fillWidth: true
Layout.leftMargin: app.margins
Layout.rightMargin: app.margins
text: qsTr("Trigger a wireless scan on the device.")
onClicked: networkManger.manager.performWifiScan()
}
}
}
}
Component {
id: infoPage
Page {
id: root
header: GuhHeader {
text: qsTr("Box information")
onBackPressed: pageStack.pop()
}
ColumnLayout {
anchors { left: parent.left; top: parent.top; right: parent.right }
MeaListItemDelegate {
Layout.fillWidth: true
progressive: false
text: qsTr("System UUID")
subText: networkManger.manager.modelNumber
}
MeaListItemDelegate {
Layout.fillWidth: true
progressive: false
text: qsTr("Manufacturer")
subText: networkManger.manager.manufacturer
}
MeaListItemDelegate {
Layout.fillWidth: true
progressive: false
text: qsTr("Software revision")
subText: networkManger.manager.softwareRevision
}
MeaListItemDelegate {
Layout.fillWidth: true
progressive: false
text: qsTr("Firmware revision")
subText: networkManger.manager.firmwareRevision
}
MeaListItemDelegate {
Layout.fillWidth: true
progressive: false
text: qsTr("Hardware revision")
subText: networkManger.manager.hardwareRevision
}
}
}
}
}

6
nymea-app/ui/connection/ConnectPage.qml
View File

@ -96,7 +96,7 @@ Page {
title: qsTr("Connect %1").arg(app.systemName)
model: ListModel {
ListElement { iconSource: "../images/network-vpn.svg"; text: qsTr("Manual connection"); page: "ManualConnectPage.qml" }
ListElement { iconSource: "../images/bluetooth.svg"; text: qsTr("Wireless setup"); page: "BluetoothDiscoveryPage.qml"; }
ListElement { iconSource: "../images/bluetooth.svg"; text: qsTr("Wireless setup"); page: "wifisetup/BluetoothDiscoveryPage.qml"; }
ListElement { iconSource: "../images/private-browsing.svg"; text: qsTr("Demo mode"); page: "" }
ListElement { iconSource: "../images/stock_application.svg"; text: qsTr("App settings"); page: "../appsettings/AppSettingsPage.qml" }
}
@ -104,7 +104,7 @@ Page {
if (index === 2) {
root.connectToHost("nymea://nymea.nymea.io:2222")
} else {
pageStack.push(model.get(index).page);
pageStack.push(model.get(index).page, {nymeaDiscovery: discovery});
}
}
}
@ -278,7 +278,7 @@ Page {
Layout.rightMargin: app.margins
visible: discovery.discoveryModel.count === 0
text: qsTr("Start wireless setup")
onClicked: pageStack.push(Qt.resolvedUrl("BluetoothDiscoveryPage.qml"))
onClicked: pageStack.push(Qt.resolvedUrl("wifisetup/BluetoothDiscoveryPage.qml"), {nymeaDiscovery: discovery})
}
Button {
Layout.fillWidth: true

150
nymea-app/ui/connection/BluetoothDiscoveryPage.qml → nymea-app/ui/connection/wifisetup/BluetoothDiscoveryPage.qml
View File

@ -1,80 +1,74 @@
import QtQuick 2.4
import QtQuick.Controls 2.1
import QtQuick.Layouts 1.2
import "../components"
import "../../components"
import Nymea 1.0
Page {
id: root
header: GuhHeader {
text: qsTr("Bluetooth discovery")
text: qsTr("Wireless Box setup")
onBackPressed: pageStack.pop()
}
Component.onCompleted: bluetoothDiscovery.start()
property var nymeaDiscovery: null
BluetoothDiscovery {
id: bluetoothDiscovery
discoveryEnabled: pageStack.currentItem === root
}
NetworkManagerController {
id: networkManager
}
function setupDevice(btDeviceInfo) {
bluetoothDiscovery.stop()
pageStack.push(connectingPageComponent, { bluetoothDeviceInfo: btDeviceInfo } )
networkManager.bluetoothDeviceInfo = btDeviceInfo
networkManager.connectDevice();
pageStack.push(connectingPageComponent)
}
Connections {
target: pageStack
onCurrentItemChanged: {
if (pageStack.currentItem === root) {
bluetoothDiscovery.start();
target: networkManager.manager
onInitializedChanged: {
if (networkManager.manager.initialized) {
if (networkManager.manager.currentConnection) {
print("***** pushing WirelessSetupPage with networkManager:", networkManager)
pageStack.replace(Qt.resolvedUrl("WirelessSetupPage.qml"), { networkManagerController: networkManager, nymeaDiscovery: root.nymeaDiscovery } )
} else {
var page = pageStack.replace(Qt.resolvedUrl("ConnectWiFiPage.qml"), { networkManagerController: networkManager } )
page.connected.connect(function() {
print("connected signal received")
pageStack.replace(page, Qt.resolvedUrl("WirelessSetupPage.qml", {NetworkManagerController: networkManager, nymeaDiscovery: root.nymeaDiscovery}))
})
}
} else {
pageStack.pop(root)
}
}
onConnectedChanged: {
if (!networkManager.manager.connected) {
pageStack.pop(root)
}
}
}
ColumnLayout {
anchors.fill: parent
spacing: app.margins
visible: bluetoothDiscovery.bluetoothAvailable && bluetoothDiscovery.bluetoothEnabled
RowLayout {
spacing: app.margins
Layout.leftMargin: app.margins
Layout.topMargin: app.margins
Layout.rightMargin: app.rightMargin
Layout.margins: app.margins
Label {
Layout.fillWidth: true
text: {
if (Qt.platform.os === "ios") {
if (bluetoothDiscovery.bluetoothAvailable && bluetoothDiscovery.bluetoothEnabled) {
return qsTr("Searching for %1 boxes via Bluetooth LE.").arg(app.systemName)
} if (bluetoothDiscovery.bluetoothAvailable && !bluetoothDiscovery.bluetoothEnabled) {
return qsTr("Uh oh! Bluetooth is not enabled. Please enable the Bluetooth on this device and restart the application.")
} else {
return qsTr("Uh oh! Bluetooth is not available. Please make sure Bluetooth is enabled on this device and restart the application.")
}
} else {
if (bluetoothDiscovery.bluetoothAvailable && bluetoothDiscovery.bluetoothEnabled) {
return qsTr("Searching for %1 boxes via Bluetooth LE.").arg(app.systemName)
} if (bluetoothDiscovery.bluetoothAvailable && !bluetoothDiscovery.bluetoothEnabled) {
return qsTr("Uh oh! Bluetooth is not enabled. Please enable the Bluetooth on this device.")
} else {
return qsTr("Uh oh! Bluetooth is not available. Please make sure Bluetooth is enabled on this device.")
}
}
}
text: qsTr("Searching for %1 boxes.").arg(app.systemName)
wrapMode: Text.WordWrap
}
BusyIndicator {
running: bluetoothDiscovery.discovering
}
}
ThinDivider {}
ListView {
@ -86,7 +80,7 @@ Page {
delegate: MeaListItemDelegate {
width: parent.width
iconName: Qt.resolvedUrl("../images/bluetooth.svg")
iconName: Qt.resolvedUrl("../../images/bluetooth.svg")
text: model.name
subText: model.address
@ -109,7 +103,7 @@ Page {
wrapMode: Text.WordWrap
maximumLineCount: 2
elide: Text.ElideRight
text: qsTr("Troubles finding your box? Try this!")
text: qsTr("Troubles finding your box?")
}
Button {
text: qsTr("Help")
@ -118,12 +112,35 @@ Page {
}
}
ColumnLayout {
anchors { left: parent.left; right: parent.right; verticalCenter: parent.verticalCenter; margins: app.margins }
visible: !bluetoothDiscovery.bluetoothAvailable || !bluetoothDiscovery.bluetoothEnabled
spacing: app.margins * 2
Label {
Layout.fillWidth: true
text: qsTr("Uh oh")
color: app.accentColor
font.pixelSize: app.largeFont
}
Label {
Layout.fillWidth: true
wrapMode: Text.WordWrap
text: !bluetoothDiscovery.bluetoothAvailable
? qsTr("Bluetooth doesn't seem to be available on this device. The wireless network setup requires a working Bluetooth connection.")
: qsTr("Bluetooth seems to be disabled. Please enable Bluetooth on your device in order to use the wireless network setup.")
}
}
Component {
id: helpPageComponent
Page {
id: helpPage
header: GuhHeader {
text: qsTr("Setup help")
text: qsTr("Wireless setup help")
onBackPressed: pageStack.pop()
}
@ -159,7 +176,7 @@ Page {
sourceSize.height: 540
fillMode: Image.PreserveAspectFit
Layout.alignment: Qt.AlignHCenter
source: "../images/rpi-setup.svg"
source: "../../images/rpi-setup.svg"
}
ThinDivider {}
Label {
@ -185,7 +202,7 @@ Page {
sourceSize.height: width
fillMode: Image.PreserveAspectFit
Layout.alignment: Qt.AlignHCenter
source: "../images/nymea-box-setup.svg"
source: "../../images/nymea-box-setup.svg"
}
}
}
@ -198,38 +215,13 @@ Page {
Page {
id: connectingPage
header: GuhHeader {
text: qsTr("Establish bluetooth connection")
text: qsTr("Connecting...")
onBackPressed: pageStack.pop()
}
property var bluetoothDeviceInfo
NetworkManagerControler {
id: networkManger
bluetoothDeviceInfo: connectingPage.bluetoothDeviceInfo
Component.onCompleted: networkManger.connectDevice()
}
Connections {
target: networkManger.manager
onInitializedChanged: {
if (networkManger.manager.initialized) {
pageStack.push(Qt.resolvedUrl("../WirelessControlerPage.qml"), { name: connectingPage.name, address: connectingPage.address, networkManger: networkManger } )
} else {
pageStack.pop(root)
}
}
onConnectedChanged: {
if (!networkManger.manager.connected) {
pageStack.pop(root)
}
}
}
ColumnLayout {
anchors.centerIn: parent
anchors { left: parent.left; right: parent.right; verticalCenter: parent.verticalCenter; margins: app.margins }
spacing: app.margins
BusyIndicator {
Layout.alignment: Qt.AlignHCenter
@ -238,14 +230,20 @@ Page {
Label {
id: workingMessage
Layout.fillWidth: true
Layout.alignment: Qt.AlignHCenter
text: networkManger.manager.statusText
text: networkManager.manager.statusText
horizontalAlignment: Text.AlignHCenter
wrapMode: Text.WordWrap
}
Label {
id: initializingMessage
Layout.fillWidth: true
Layout.alignment: Qt.AlignHCenter
text: networkManger.manager.initializing ? qsTr("Initialize services...") : ""
text: networkManager.manager.initializing ? qsTr("Initializing services...") : ""
horizontalAlignment: Text.AlignHCenter
wrapMode: Text.WordWrap
}
}
}

50
nymea-app/ui/connection/wifisetup/BoxInfoPage.qml Normal file
View File

@ -0,0 +1,50 @@
import QtQuick 2.4
import QtQuick.Controls 2.1
import QtQuick.Layouts 1.2
import "../../components"
import Nymea 1.0
Page {
id: root
header: GuhHeader {
text: qsTr("Box information")
onBackPressed: pageStack.pop()
}
property var networkManagerController: null
ColumnLayout {
anchors { left: parent.left; top: parent.top; right: parent.right }
MeaListItemDelegate {
Layout.fillWidth: true
progressive: false
text: qsTr("System UUID")
subText: networkManagerController.manager.modelNumber
}
MeaListItemDelegate {
Layout.fillWidth: true
progressive: false
text: qsTr("Manufacturer")
subText: networkManagerController.manager.manufacturer
}
MeaListItemDelegate {
Layout.fillWidth: true
progressive: false
text: qsTr("Software revision")
subText: networkManagerController.manager.softwareRevision
}
MeaListItemDelegate {
Layout.fillWidth: true
progressive: false
text: qsTr("Firmware revision")
subText: networkManagerController.manager.firmwareRevision
}
MeaListItemDelegate {
Layout.fillWidth: true
progressive: false
text: qsTr("Hardware revision")
subText: networkManagerController.manager.hardwareRevision
}
}
}

204
nymea-app/ui/connection/wifisetup/ConnectWiFiPage.qml Normal file
View File

@ -0,0 +1,204 @@
import QtQuick 2.4
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import "../../components"
import Nymea 1.0
Page {
id: root
property var networkManagerController: null
signal connected();
header: GuhHeader {
text: qsTr("Select wireless network")
onBackPressed: {
pageStack.pop();
}
HeaderButton {
imageSource: "../images/info.svg"
onClicked: {
pageStack.push(Qt.resolvedUrl("BoxInfoPage.qml"), {networkManagerController: root.networkManagerController})
}
}
HeaderButton {
imageSource: "../images/settings.svg"
onClicked: {
pageStack.push(Qt.resolvedUrl("NetworkSettingsPage.qml"), {networkManagerController: root.networkManagerController})
}
}
}
ColumnLayout {
anchors.fill: parent
ListView {
Layout.fillWidth: true
Layout.fillHeight: true
model: WirelessAccessPointsProxy {
accessPoints: networkManagerController.manager.accessPoints
}
clip: true
delegate: MeaListItemDelegate {
width: parent.width
text: model.ssid
enabled: !networkManagerController.manager.working
subText: model.hostAddress
iconColor: model.selectedNetwork ? app.accentColor : "#808080"
iconName: {
if (model.protected) {
if (model.signalStrength <= 25)
return Qt.resolvedUrl("../../images/nm-signal-25-secure.svg")
if (model.signalStrength <= 50)
return Qt.resolvedUrl("../../images/nm-signal-50-secure.svg")
if (model.signalStrength <= 75)
return Qt.resolvedUrl("../../images/nm-signal-75-secure.svg")
if (model.signalStrength <= 100)
return Qt.resolvedUrl("../../images/nm-signal-100-secure.svg")
} else {
if (model.signalStrength <= 25)
return Qt.resolvedUrl("../../images/nm-signal-25.svg")
if (model.signalStrength <= 50)
return Qt.resolvedUrl("../../images/nm-signal-50.svg")
if (model.signalStrength <= 75)
return Qt.resolvedUrl("../../images/nm-signal-75.svg")
if (model.signalStrength <= 100)
return Qt.resolvedUrl("../../images/nm-signal-100.svg")
}
}
onClicked: {
print("Connect to ", model.ssid, " --> ", model.macAddress)
if (model.selectedNetwork) {
pageStack.push(networkInformationPage, { ssid: model.ssid, macAddress: model.macAddress })
} else {
pageStack.push(authenticationPageComponent, { ssid: model.ssid, macAddress: model.macAddress })
}
}
}
}
}
Component {
id: authenticationPageComponent
Page {
id: authenticationPage
header: GuhHeader {
text: qsTr("Authenticate")
onBackPressed: pageStack.pop()
}
property string ssid
property string macAddress
Connections {
target: root.networkManagerController.manager
onCurrentConnectionChanged: {
if (root.networkManagerController.manager.currentConnection && root.networkManagerController.manager.currentConnection.ssid === authenticationPage.ssid) {
print("**** connected!")
root.connected();
}
}
onWirelessStatusChanged: {
print("Wireless status changed:", networkManagerController.manager.networkStatus)
if (networkManagerController.manager.wirelessStatus === WirelessSetupManager.WirelessStatusFailed) {
wrongPasswordText.visible = true
pageStack.pop(authenticationPage)
}
}
}
ColumnLayout {
anchors { left: parent.left; top: parent.top; right: parent.right; }
Label {
Layout.fillWidth: true
Layout.margins: app.margins
text: qsTr("Enter the password for %1").arg(authenticationPage.ssid)
wrapMode: Text.WordWrap
}
RowLayout {
Layout.leftMargin: app.margins; Layout.rightMargin: app.margins
TextField {
id: passwordTextField
Layout.fillWidth: true
property bool showPassword: false
echoMode: showPassword ? TextInput.Normal : TextInput.Password
}
ColorIcon {
Layout.preferredHeight: app.iconSize
Layout.preferredWidth: app.iconSize
name: "../images/eye.svg"
color: passwordTextField.showPassword ? app.accentColor : keyColor
MouseArea {
anchors.fill: parent
onClicked: passwordTextField.showPassword = !passwordTextField.showPassword
}
}
}
Label {
id: wrongPasswordText
text: qsTr("Sorry, the password is wrong. Please try again.")
Layout.fillWidth: true
Layout.leftMargin: app.margins
Layout.rightMargin: app.margins
color: "red"
visible: false
}
Button {
Layout.fillWidth: true
Layout.margins: app.margins
text: qsTr("OK")
enabled: passwordTextField.displayText.length >= 8
onClicked: {
root.networkManagerController.manager.connectWirelessNetwork(authenticationPage.ssid, passwordTextField.text)
pageStack.push(connectingWifiWaitPageComponent, {ssid: authenticationPage.ssid })
}
}
}
}
}
Component {
id: connectingWifiWaitPageComponent
Page {
id: connectingWifiWaitPage
property string ssid
ColumnLayout {
anchors { left: parent.left; right: parent.right; verticalCenter: parent.verticalCenter; margins: app.margins }
spacing: app.margins * 2
BusyIndicator {
Layout.alignment: Qt.AlignHCenter
}
Label {
Layout.fillWidth: true
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter
text: qsTr("Connecting the %1 box to %2").arg(app.systemName).arg(connectingWifiWaitPage.ssid)
}
}
}
}
}

44
nymea-app/ui/connection/wifisetup/NetworkSettingsPage.qml Normal file
View File

@ -0,0 +1,44 @@
import QtQuick 2.4
import QtQuick.Controls 2.1
import QtQuick.Layouts 1.2
import "../../components"
import Nymea 1.0
Page {
id: root
header: GuhHeader {
text: qsTr("Network settings")
onBackPressed: pageStack.pop()
}
property var networkManagerController: null
ColumnLayout {
anchors { left: parent.left; top: parent.top; right: parent.right }
SwitchDelegate {
Layout.fillWidth: true
text: qsTr("Networking")
checked: networkManagerController.manager.networkingEnabled
onClicked: networkManagerController.manager.enableNetworking(checked)
}
SwitchDelegate {
Layout.fillWidth: true
enabled: networkManagerController.manager.networkingEnabled
text: qsTr("Wireless network")
checked: networkManagerController.manager.wirelessEnabled
onClicked: {
networkManagerController.manager.enableWireless(checked)
}
}
Button {
Layout.fillWidth: true
Layout.leftMargin: app.margins
Layout.rightMargin: app.margins
text: qsTr("Trigger a wireless scan on the device.")
onClicked: networkManagerController.manager.performWifiScan()
}
}
}

138
nymea-app/ui/connection/wifisetup/WirelessSetupPage.qml Normal file
View File

@ -0,0 +1,138 @@
import QtQuick 2.4
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import "../../components"
import Nymea 1.0
Page {
id: root
property var networkManagerController: null
property var nymeaDiscovery: null
header: GuhHeader {
text: qsTr("Wireless network setup")
onBackPressed: {
pageStack.pop();
}
HeaderButton {
imageSource: "../images/info.svg"
onClicked: {
pageStack.push(Qt.resolvedUrl("BoxInfoPage.qml"), {networkManagerController: root.networkManagerController})
}
}
HeaderButton {
imageSource: "../images/settings.svg"
onClicked: {
pageStack.push(Qt.resolvedUrl("NetworkSettingsPage.qml"), {networkManagerController: root.networkManagerController})
}
}
}
Component.onCompleted: {
print("created with networkmanagercontroller:", root.networkManagerController)
updateConnectButton();
}
Connections {
target: root.networkManagerController.manager
onErrorOccurred: {
print("Error occurred", errorMessage)
var errorDialog = Qt.createComponent(Qt.resolvedUrl("../components/ErrorDialog.qml"));
var popup = errorDialog.createObject(app, {text: errorMessage})
popup.open()
}
onCurrentConnectionChanged: {
updateConnectButton();
}
}
Connections {
target: root.nymeaDiscovery.discoveryModel
onCountChanged: updateConnectButton();
}
function updateConnectButton() {
if (!root.networkManagerController.manager.currentConnection) {
connectButton.url = "";
return;
}
// FIXME: We should rather look for the UUID here, but nymea-networkmanager doesn't support getting us the nymea uuid (yet)
for (var i = 0; i < root.nymeaDiscovery.discoveryModel.count; i++) {
for (var j = 0; j < root.nymeaDiscovery.discoveryModel.get(i).connections.count; j++) {
if (root.nymeaDiscovery.discoveryModel.get(i).connections.get(j).url.toString().indexOf(root.networkManagerController.manager.currentConnection.hostAddress) >= 0) {
connectButton.url = root.nymeaDiscovery.discoveryModel.get(i).connections.get(j).url
return;
}
}
root.nymeaDiscovery.discoveryModel.get(i).connections.countChanged.connect(function() {
updateConnectButton();
})
}
connectButton.url = "";
}
ColumnLayout {
anchors { left: parent.left; top: parent.top; right: parent.right }
spacing: app.margins
ColorIcon {
Layout.preferredHeight: app.iconSize * 2
Layout.preferredWidth: height
Layout.alignment: Qt.AlignCenter
name: "../images/tick.svg"
color: app.accentColor
}
Label {
Layout.fillWidth: true
Layout.leftMargin: app.margins; Layout.rightMargin: app.margins
wrapMode: Text.WordWrap
text: root.networkManagerController.manager.currentConnection
? qsTr("Your %1 box is connected to %2").arg(app.systemName).arg(root.networkManagerController.manager.currentConnection.ssid)
: ""
}
Label {
Layout.fillWidth: true
Layout.leftMargin: app.margins; Layout.rightMargin: app.margins
text: qsTr("IP address: %1").arg(root.networkManagerController.manager.currentConnection.hostAddress)
elide: Text.ElideRight
}
Button {
id: connectButton
visible: url != ""
Layout.fillWidth: true
Layout.leftMargin: app.margins; Layout.rightMargin: app.margins
text: qsTr("Connect to box")
property string url
onClicked: {
engine.connection.connect(url)
}
}
Button {
Layout.fillWidth: true
Layout.leftMargin: app.margins; Layout.rightMargin: app.margins
text: qsTr("Change network")
onClicked: {
var page = pageStack.push(Qt.resolvedUrl("ConnectWiFiPage.qml"), {networkManagerController: root.networkManagerController})
page.connected.connect(function() {
pageStack.pop(root)
})
}
}
Button {
Layout.fillWidth: true
Layout.leftMargin: app.margins; Layout.rightMargin: app.margins
text: qsTr("Close wireless setup")
onClicked: {
pageStack.pop()
pageStack.pop()
}
}
}
}