ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build with older Qt

pull/238/head
Michael Zanetti 2019-12-16 11:16:26 +01:00
parent 9b07216768
commit 4e70f0f5f8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libnymea-core/jsonrpc/systemhandler.cpp
View File

@ -252,7 +252,7 @@ SystemHandler::SystemHandler(Platform *platform, QObject *parent):
});
connect(m_platform->systemController(), &PlatformSystemController::timeConfigurationChanged, this, [this](){
QVariantMap params;
params.insert("time", QDateTime::currentDateTime().toSecsSinceEpoch());
params.insert("time", QDateTime::currentDateTime().toMSecsSinceEpoch() / 1000);
params.insert("timeZone", QTimeZone::systemTimeZoneId());
params.insert("automaticTimeAvailable", m_platform->systemController()->automaticTimeAvailable());
params.insert("automaticTime", m_platform->systemController()->automaticTime());
@ -374,7 +374,7 @@ JsonReply *SystemHandler::GetTime(const QVariantMap &params) const
QVariantMap returns;
returns.insert("automaticTimeAvailable", m_platform->systemController()->automaticTimeAvailable());
returns.insert("automaticTime", m_platform->systemController()->automaticTime());
returns.insert("time", QDateTime::currentDateTime().toSecsSinceEpoch());
returns.insert("time", QDateTime::currentDateTime().toMSecsSinceEpoch() / 1000);
returns.insert("timeZone", QTimeZone::systemTimeZoneId());
return createReply(returns);
}
@ -392,7 +392,7 @@ JsonReply *SystemHandler::SetTime(const QVariantMap &params) const
handled = true;
}
if (!automaticTime && params.contains("time")) {
QDateTime time = QDateTime::fromSecsSinceEpoch(params.value("time").toUInt());
QDateTime time = QDateTime::fromMSecsSinceEpoch(params.value("time").toLongLong() * 1000);
if (!m_platform->systemController()->setTime(time)) {
returns.insert("success", false);
return createReply(returns);