Merge pull request #1891 from Stiralbios/master

[ActivityReminder] Detect if not worn + better experience for people using the app at night

apps/activityreminder/ChangeLog

@@ -3,3 +3,4 @@
 0.03: Do not alarm while charging
 0.04: Obey system quiet mode
 0.05: Battery optimisation, add the pause option, bug fixes
+0.06: Add a temperature threshold to detect (and not alert) if the BJS isn't worn. Better support for the peoples using the app at night

apps/activityreminder/README.md

@@ -11,4 +11,5 @@ Different settings can be personalized:
 - Dismiss delay: Delay added before the next alert if the alert is dismissed. From 5 to 60 min
 - Pause delay: Same as Dismiss delay but longer (usefull for meetings and such). From 30 to 240 min
 - Min steps: Minimal amount of steps to count as an activity
+- Temp Threshold: Temperature threshold to determine if the watch is worn
 

apps/activityreminder/boot.js

@@ -2,17 +2,17 @@ function run() {
     if (isNotWorn()) return;
     let now = new Date();
     let h = now.getHours();
-    let health = Bangle.getHealthStatus("day");
 
-    if (h >= activityreminder_settings.startHour && h < activityreminder_settings.endHour) {
+    if (isDuringAlertHours(h)) {
+        let health = Bangle.getHealthStatus("day");
         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.stepsDate = now;
             activityreminder.saveData(activityreminder_data);
             /* todo in a futur release 
-            add settimer to trigger like 10 secs after the stepsDate + minSteps
-            cancel all other timers of this app
+            Add settimer to trigger like 30 secs after going in this part cause the person have been walking 
+            (pass some argument to run() to handle long walks and not triggering so often)
             */
         }
         
@@ -24,22 +24,42 @@ function run() {
 }
 
 function isNotWorn() {
-    // todo in a futur release check temperature and mouvement in a futur release 
-    return Bangle.isCharging();
+    return (Bangle.isCharging() || activityreminder_settings.tempThreshold >= E.getTemperature());
 }
 
+function isDuringAlertHours(h) {
+    if(activityreminder_settings.startHour < activityreminder_settings.endHour){ // not passing through midnight
+        return (h >= activityreminder_settings.startHour && h < activityreminder_settings.endHour)
+    } else{ // passing through midnight
+        return (h >= activityreminder_settings.startHour || h < activityreminder_settings.endHour)
+    }
+}
+
+Bangle.on('midnight', function() {
+    /*
+    Usefull trick to have the app working smothly for people using it at night 
+    */
+    let now = new Date();
+    let h = now.getHours();
+    if (activityreminder_settings.enabled && isDuringAlertHours(h)){
+        // updating only the steps and keeping the original stepsDate on purpose 
+        activityreminder_data.stepsOnDate = 0;
+        activityreminder.saveData(activityreminder_data);
+    }
+});
+
 const activityreminder = require("activityreminder");
 const activityreminder_settings = activityreminder.loadSettings();
 if (activityreminder_settings.enabled) {
     const activityreminder_data = activityreminder.loadData();
     if(activityreminder_data.firstLoad){
-        activityreminder_data.firstLoad =false;
+        activityreminder_data.firstLoad = false;
         activityreminder.saveData(activityreminder_data);
     }
     setInterval(run, 60000);
     /* todo in a futur release 
     increase setInterval time to something that is still sensible (5 mins ?)
-    add settimer to trigger like 10 secs after the stepsDate + minSteps
-    cancel all other timers of this app
+    when we added a settimer
     */
 }
+

apps/activityreminder/lib.js

@@ -8,7 +8,8 @@ exports.loadSettings = function () {
         maxInnactivityMin: 30,
         dismissDelayMin: 15,
         pauseDelayMin: 120,
-        minSteps: 50
+        minSteps: 50,
+        tempThreshold: 27
     }, storage.readJSON("activityreminder.s.json", true) || {});
 };
 

apps/activityreminder/metadata.json

@@ -3,7 +3,7 @@
   "name": "Activity Reminder",
   "shortName":"Activity Reminder",
   "description": "A reminder to take short walks for the ones with a sedentary lifestyle",
-  "version":"0.05",
+  "version":"0.06",
   "icon": "app.png",
   "type": "app",
   "tags": "tool,activity",

apps/activityreminder/settings.js

@@ -55,7 +55,7 @@
     },
     'Pause delay': {
       value: settings.pauseDelayMin,
-      min: 30, max: 240,
+      min: 30, max: 240, step: 5,
       onchange: v => {
         settings.pauseDelayMin = v;
         activityreminder.writeSettings(settings);
@@ -66,11 +66,20 @@
     },
     'Min steps': {
       value: settings.minSteps,
-      min: 10, max: 500,
+      min: 10, max: 500, step: 10, 
       onchange: v => {
         settings.minSteps = v;
         activityreminder.writeSettings(settings);
       }
+    },
+    'Temp Threshold': {
+      value: settings.tempThreshold,
+      min: 20, max: 40, step: 0.5,
+      format: v => v + "°C",
+      onchange: v => {
+        settings.tempThreshold = v;
+        activityreminder.writeSettings(settings);
+      }
     }
   });
 })