FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Fix dates loading from file

pull/1818/head
Stiralbios 2022-05-12 10:30:11 +02:00
parent ffcf550bea
commit 689e6e7470
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
apps/activityreminder/boot.js
View File

@ -2,25 +2,21 @@ function run() {
if (isNotWorn()) return; if (isNotWorn()) return;
var now = new Date(); var now = new Date();
var h = now.getHours(); var h = now.getHours();
var doAlert = false;
var doSave = false;
var health = Bangle.getHealthStatus("day"); var health = Bangle.getHealthStatus("day");
if (h >= activityreminder_settings.startHour && h < activityreminder_settings.endHour) { if (h >= activityreminder_settings.startHour && h < activityreminder_settings.endHour) {
if (health.steps - activityreminder_data.stepsOnDate >= activityreminder_settings.minSteps) { if (health.steps - activityreminder_data.stepsOnDate >= activityreminder_settings.minSteps // more steps made than needed
|| health.steps < activityreminder_data.stepsOnDate) { // new day or reboot of the watch
activityreminder_data.stepsOnDate = health.steps; activityreminder_data.stepsOnDate = health.steps;
activityreminder_data.stepsDate = now; activityreminder_data.stepsDate = now;
doSave = true; activityreminder.saveData(activityreminder_data);
}
if(activityreminder.mustAlert(activityreminder_data, activityreminder_settings)){
load('activityreminder.app.js');
} }
doAlert = activityreminder.mustAlert(activityreminder_data, activityreminder_settings);
} }
if (doSave) {
activityreminder.saveData(activityreminder_data);
}
if (doAlert) {
load('activityreminder.app.js');
}
} }
function isNotWorn() { function isNotWorn() {
@ -32,7 +28,9 @@ const activityreminder = require("activityreminder");
activityreminder_settings = activityreminder.loadSettings(); activityreminder_settings = activityreminder.loadSettings();
if (activityreminder_settings.enabled) { if (activityreminder_settings.enabled) {
activityreminder_data = activityreminder.loadData(); activityreminder_data = activityreminder.loadData();
activityreminder.saveData(activityreminder_data); if(activityreminder_data.firstLoad){
activityreminder_data.firstLoad =false;
activityreminder.saveData(activityreminder_data);
}
setInterval(run, 60000); setInterval(run, 60000);
} }

24
apps/activityreminder/lib.js
View File

@ -22,20 +22,32 @@ exports.saveData = function (data) {
exports.loadData = function () { exports.loadData = function () {
var health = Bangle.getHealthStatus("day"); var health = Bangle.getHealthStatus("day");
return Object.assign({ var data = Object.assign({
firstLoad: true,
stepsDate: new Date(), stepsDate: new Date(),
stepsOnDate: health.steps, stepsOnDate: health.steps,
okDate: new Date(1970, 1, 1), okDate: new Date(1970),
dismissDate: new Date(1970, 1, 1), dismissDate: new Date(1970),
pauseDate: new Date(1970, 1, 1), pauseDate: new Date(1970),
}, },
storage.readJSON("activityreminder.data.json") || {}); storage.readJSON("activityreminder.data.json") || {});
if(typeof(data.stepsDate) == "string")
data.stepsDate = new Date(data.stepsDate);
if(typeof(data.okDate) == "string")
data.okDate = new Date(data.okDate);
if(typeof(data.dismissDate) == "string")
data.dismissDate = new Date(data.dismissDate);
if(typeof(data.stepsDate) == "string")
data.pauseDate = new Date(data.pauseDate);
return data;
}; };
exports.mustAlert = function(activityreminder_data, activityreminder_settings) { exports.mustAlert = function(activityreminder_data, activityreminder_settings) {
var now = new Date(); var now = new Date();
if ((now - activityreminder_data.stepsDate) / 60000 > activityreminder_settings.maxInnactivityMin) { // inactivity detected if ((now - activityreminder_data.stepsDate) / 60000 > activityreminder_settings.maxInnactivityMin) { // inactivity detected
if ((now - activityreminder_settings.okDate) / 60000 > 3 && // last alert was more than 3 min ago if ((now - activityreminder_settings.okDate) / 60000 > 3 && // last alert anwsered with ok was more than 3 min ago
(now - activityreminder_settings.dismissDate) / 60000 > activityreminder_settings.dismissDelayMin && // last alert was more than dismissDelayMin ago (now - activityreminder_settings.dismissDate) / 60000 > activityreminder_settings.dismissDelayMin && // last alert was more than dismissDelayMin ago
(now - activityreminder_settings.pauseDate) / 60000 > activityreminder_settings.pauseDelayMin) { // last alert was more than pauseDelayMin ago (now - activityreminder_settings.pauseDate) / 60000 > activityreminder_settings.pauseDelayMin) { // last alert was more than pauseDelayMin ago
return true; return true;