mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-03-04 04:23:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

OffroadAlert: read alert keys in constructor (#20408)

Browse Source
This commit is contained in:
Dean Lee
2021-03-20 04:30:51 +08:00
committed by GitHub
parent bf3c7e6afa
commit c9ac15bb96
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
selfdrive/ui/qt/widgets/offroad_alerts.cc
View File

@@ -59,6 +59,13 @@ OffroadAlert::OffroadAlert(QWidget* parent) : QFrame(parent) {
}
)");
main_layout->setMargin(50);
QFile inFile("../controls/lib/alerts_offroad.json");
bool ret = inFile.open(QIODevice::ReadOnly | QIODevice::Text);
assert(ret);
QJsonDocument doc = QJsonDocument::fromJson(inFile.readAll());
assert(!doc.isNull());
alert_keys = doc.object().keys();
}
void OffroadAlert::refresh() {
@@ -109,20 +116,7 @@ void OffroadAlert::refresh() {
void OffroadAlert::parse_alerts() {
alerts.clear();
// TODO: only read this once
QFile inFile("../controls/lib/alerts_offroad.json");
inFile.open(QIODevice::ReadOnly | QIODevice::Text);
QByteArray data = inFile.readAll();
inFile.close();
QJsonDocument doc = QJsonDocument::fromJson(data);
if (doc.isNull()) {
qDebug() << "Parse failed";
}
QJsonObject json = doc.object();
for (const QString &key : json.keys()) {
for (const QString &key : alert_keys) {
std::vector<char> bytes = Params().read_db_bytes(key.toStdString().c_str());
if (bytes.size()) {

2
selfdrive/ui/qt/widgets/offroad_alerts.hpp
View File

@@ -3,6 +3,7 @@
#include <QFrame>
#include <QStackedWidget>
#include <QPushButton>
#include <QStringList>
struct Alert {
QString text;
@@ -15,6 +16,7 @@ class OffroadAlert : public QFrame {
public:
explicit OffroadAlert(QWidget *parent = 0);
QVector<Alert> alerts;
QStringList alert_keys;
bool updateAvailable;
private: