diff --git a/apps/activityreminder/app.js b/apps/activityreminder/app.js index 4a82e33b6..1668e0dc9 100644 --- a/apps/activityreminder/app.js +++ b/apps/activityreminder/app.js @@ -1,3 +1,24 @@ +g.clear(); Bangle.loadWidgets(); Bangle.drawWidgets(); -eval(require("Storage").read("activityreminder.settings.js"))(()=>load()); + + +/* draw the alert */ +E.showPrompt("Innactivity detected",{ + title:"Activity reminder", + buttons : {"Ok": true,"Dismiss": false} +}).then(function(v) { + console.log(stepsArray); + if(v == true){ + stepsArray = stepsArray.slice(0, activityreminder.maxInnactivityMin - 3); + } + if(v == false){ + stepsArray = stepsArray.slice(0, activityreminder.maxInnactivityMin - activityreminder.dismissDelayMin); + } + load(); +}); + + +Bangle.buzz(); +setTimeout(load, 10000); + diff --git a/apps/activityreminder/boot.js b/apps/activityreminder/boot.js index 97d0d1d52..4504e4d09 100644 --- a/apps/activityreminder/boot.js +++ b/apps/activityreminder/boot.js @@ -7,6 +7,7 @@ global.activityreminder = Object.assign({ minSteps: 50, }, require("Storage").readJSON("activityreminder.json", true) || {}); +var stepsArray = []; if (global.activityreminder) { @@ -14,52 +15,30 @@ if (global.activityreminder) { activityreminder = Object.assign(activityreminder, { - stepsArray: [], run: function(){ var now = new Date(); var h = now.getHours(); + console.log(stepsArray); if(h >= activityreminder.startHour && h < activityreminder.endHour) { var health = Bangle.getHealthStatus("day"); - activityreminder.stepsArray.unshift(health.steps); - activityreminder.stepsArray = activityreminder.stepsArray.slice(0, activityreminder.maxInnactivityMin); + stepsArray.unshift(health.steps); + stepsArray = activityreminder.stepsArray.slice(0, activityreminder.maxInnactivityMin); } else{ - activityreminder.stepsArray = []; + stepsArray = []; } - if(activityreminder.stepsArray.length == activityreminder.maxInnactivityMin){ - if (activityreminder.stepsArray[0] - activityreminder.stepsArray[activityreminder.stepsArray.length-1] < activityreminder.minSteps) + if(stepsArray.length == activityreminder.maxInnactivityMin){ + if (stepsArray[0] - stepsArray[stepsArray.length-1] < activityreminder.minSteps) { - activityreminder.showAlert(); + load('authentiwatch.app.js'); } } - - - }, - - showAlert: function(){ - g.clear(); - Bangle.loadWidgets(); - Bangle.drawWidgets(); - E.showPrompt("Innactivity detected",{ - title:"Activity reminder", - buttons : {"Ok": true,"Dismiss": false} - }).then(function(v) { - if(v == true){ - activityreminder.stepsArray = activityreminder.stepsArray.slice(0, activityreminder.maxInnactivityMin - 3); - } - if(v == false){ - activityreminder.stepsArray = activityreminder.stepsArray.slice(0, activityreminder.maxInnactivityMin - activityreminder.dismissDelayMin); - } - load(); - }); - Bangle.buzz(); - setTimeout(load, 10000); - }, - } + } ); + setInterval(global.activityreminder.run, 2000); }