Use this.interval insntead of interval.
parent
ceaae5614d
commit
8036d976b3
|
|
@ -37,7 +37,6 @@ exports.load = function() {
|
||||||
// info used for drawing...
|
// info used for drawing...
|
||||||
var hrm = "--";
|
var hrm = "--";
|
||||||
var alt = "--";
|
var alt = "--";
|
||||||
var interval = null;
|
|
||||||
// callbacks (needed for easy removal of listeners)
|
// callbacks (needed for easy removal of listeners)
|
||||||
function batteryUpdateHandler() { bangleItems[0].emit("redraw"); }
|
function batteryUpdateHandler() { bangleItems[0].emit("redraw"); }
|
||||||
function stepUpdateHandler() { bangleItems[1].emit("redraw"); }
|
function stepUpdateHandler() { bangleItems[1].emit("redraw"); }
|
||||||
|
|
@ -49,12 +48,6 @@ exports.load = function() {
|
||||||
bangleItems[3].emit("redraw");
|
bangleItems[3].emit("redraw");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
function deleteInterval(inter){
|
|
||||||
if(inter){
|
|
||||||
clearInterval(inter);
|
|
||||||
}
|
|
||||||
delete inter;
|
|
||||||
}
|
|
||||||
// actual items
|
// actual items
|
||||||
var items = [{
|
var items = [{
|
||||||
name: "Bangle",
|
name: "Bangle",
|
||||||
|
|
@ -64,16 +57,8 @@ exports.load = function() {
|
||||||
get : () => ({
|
get : () => ({
|
||||||
text : E.getBattery() + "%",
|
text : E.getBattery() + "%",
|
||||||
img : atob(Bangle.isCharging() ? "GBiBAAABgAADwAAHwAAPgACfAAHOAAPkBgHwDwP4Hwf8Pg/+fB//OD//kD//wD//4D//8D//4B//QB/+AD/8AH/4APnwAHAAACAAAA==" : "GBiBAAAAAAAAAAAAAAAAAAAAAD//+P///IAAAr//Ar//Ar//A7//A7//A7//A7//Ar//AoAAAv///D//+AAAAAAAAAAAAAAAAAAAAA==") }),
|
img : atob(Bangle.isCharging() ? "GBiBAAABgAADwAAHwAAPgACfAAHOAAPkBgHwDwP4Hwf8Pg/+fB//OD//kD//wD//4D//8D//4B//QB/+AD/8AH/4APnwAHAAACAAAA==" : "GBiBAAAAAAAAAAAAAAAAAAAAAD//+P///IAAAr//Ar//Ar//A7//A7//A7//A7//Ar//AoAAAv///D//+AAAAAAAAAAAAAAAAAAAAA==") }),
|
||||||
show : function() {
|
show : function() { this.interval = setInterval(()=>this.emit('redraw'), 60000); Bangle.on("charging", batteryUpdateHandler); batteryUpdateHandler(); },
|
||||||
deleteInterval(interval);
|
hide : function() { clearInterval(this.interval); delete this.interval; Bangle.removeListener("charging", batteryUpdateHandler); },
|
||||||
interval = setInterval(()=>this.emit('redraw'), 60000);
|
|
||||||
Bangle.on("charging", batteryUpdateHandler);
|
|
||||||
batteryUpdateHandler();
|
|
||||||
},
|
|
||||||
hide : function() {
|
|
||||||
deleteInterval(interval);
|
|
||||||
Bangle.removeListener("charging", batteryUpdateHandler);
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
{ name : "Steps", get : () => ({
|
{ name : "Steps", get : () => ({
|
||||||
text : Bangle.getHealthStatus("day").steps,
|
text : Bangle.getHealthStatus("day").steps,
|
||||||
|
|
@ -95,8 +80,8 @@ exports.load = function() {
|
||||||
bangleItems.push({ name : "Altitude", get : () => ({
|
bangleItems.push({ name : "Altitude", get : () => ({
|
||||||
text : alt,
|
text : alt,
|
||||||
img : atob("GBiBAAAAAAAAAAAAAAAAAAAAAAACAAAGAAAPAAEZgAOwwAPwQAZgYAwAMBgAGBAACDAADGAABv///////wAAAAAAAAAAAAAAAAAAAA==") }),
|
img : atob("GBiBAAAAAAAAAAAAAAAAAAAAAAACAAAGAAAPAAEZgAOwwAPwQAZgYAwAMBgAGBAACDAADGAABv///////wAAAAAAAAAAAAAAAAAAAA==") }),
|
||||||
show : function() { deleteInterval(interval); interval = setInterval(altUpdateHandler, 60000); alt = "--"; altUpdateHandler(); },
|
show : function() { this.interval = setInterval(altUpdateHandler, 60000); alt = "--"; altUpdateHandler(); },
|
||||||
hide : function() { deleteInterval(interval); },
|
hide : function() { clearInterval(this.interval); delete this.interval; },
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue