Bram
/
BangleApps
forked from FOSS/BangleApps
1
0
Fork 0
Code Pull Requests Activity

Reassign to data, rather than separate settings

master
Rob Pilling 2024-09-30 08:46:46 +01:00
parent 0849edf198
commit 09bea87f18
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
apps/mtnclock/app.js
View File

@ -329,36 +329,20 @@ function readWeather() {
var weatherJson = require("Storage").readJSON('weather.json', 1); var weatherJson = require("Storage").readJSON('weather.json', 1);
// save updated weather data if available and it has been an hour since last updated // save updated weather data if available and it has been an hour since last updated
if (weatherJson && weatherJson.weather && weatherJson.weather.time && (data.time === undefined || (data.time + 3600000) < weatherJson.weather.time)) { if (weatherJson && weatherJson.weather && weatherJson.weather.time && (data.time === undefined || (data.time + 3600000) < weatherJson.weather.time)) {
const newSettings = { data.time = weatherJson.weather.time;
time: weatherJson.weather.time, data.temp = weatherJson.weather.temp;
temp: weatherJson.weather.temp, data.code = weatherJson.weather.code;
code: weatherJson.weather.code require("Storage").writeJSON('mtnclock.json', data);
};
require("Storage").writeJSON(
'mtnclock.json',
Object.assign(
require("Storage").readJSON('mtnclock.json', 1),
newSettings
)
);
} }
} }
const _GB = global.GB; const _GB = global.GB;
global.GB = (event) => { global.GB = (event) => {
if (event.t==="weather") { if (event.t==="weather") {
const newSettings = { data.temp = event.temp;
temp: event.temp, data.code = event.code;
code: event.code, data.time = Date.now();
time: Date.now() require("Storage").writeJSON('mtnclock.json', data);
};
require("Storage").writeJSON(
'mtnclock.json',
Object.assign(
require("Storage").readJSON('mtnclock.json', 1),
newSettings
)
);
setWeather(); setWeather();
} }
if (_GB) setTimeout(_GB, 0, event); if (_GB) setTimeout(_GB, 0, event);