QoL Fixes and Changes
This commit is contained in:
parent
b8201398e1
commit
93995959d0
1 changed files with 905 additions and 229 deletions
|
|
@ -13,6 +13,7 @@
|
|||
#include <chrono>
|
||||
#ifdef Q_OS_ANDROID
|
||||
#include "wifihelper.h"
|
||||
#include <QJniObject>
|
||||
#endif
|
||||
|
||||
class RequestWorker : public QObject
|
||||
|
|
@ -45,8 +46,8 @@ public:
|
|||
void setStatus(const QString &newStatus);
|
||||
|
||||
signals:
|
||||
void requestFailed();
|
||||
void networkReply(int distance, float rate_of_fill, int expected_to_fill);
|
||||
void requestFailed(QString request_response_string);
|
||||
void networkReply(int distance, float rate_of_fill, int expected_to_fill, QString data);
|
||||
void statusChanged();
|
||||
void playMedia();
|
||||
void connectionText(QString text, bool errored = false);
|
||||
|
|
@ -57,6 +58,7 @@ public slots:
|
|||
void start();
|
||||
void stop();
|
||||
private slots:
|
||||
QString getRequestResponseString(QNetworkReply *rep, QString rep_data = "");
|
||||
void pollWiFi();
|
||||
void gotWiFiSSID(QString ssid);
|
||||
void playAlarm();
|
||||
|
|
@ -64,6 +66,9 @@ private slots:
|
|||
void requestFinished(QNetworkReply *rep);
|
||||
private:
|
||||
QString m_status;
|
||||
#ifdef Q_OS_ANDROID
|
||||
QJniObject *m_androidMediaPlayer = nullptr;
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif // REQUESTWORKER_H
|
||||
|
|
|
|||
Loading…
Reference in a new issue