Update app.js
parent
ff0c54c265
commit
1b4349c449
|
|
@ -3,6 +3,9 @@
|
|||
let digits = [];
|
||||
let drawTimeout;
|
||||
let extrasTimeout;
|
||||
let onLock;
|
||||
let onTap;
|
||||
let onTwist;
|
||||
let fontName="";
|
||||
let settings = require('Storage').readJSON("contourclock.json", true) || {};
|
||||
if (settings.fontIndex==undefined) {
|
||||
|
|
@ -25,16 +28,11 @@
|
|||
}
|
||||
require("FontTeletext10x18Ascii").add(Graphics);
|
||||
|
||||
let queueDraw = function() {
|
||||
if (drawTimeout) clearTimeout(drawTimeout);
|
||||
drawTimeout = setTimeout(draw, interval - (Date.now() % interval));
|
||||
};
|
||||
let drawExtras = function() { //draw date, day of the week and widgets
|
||||
let date = new Date();
|
||||
g.setFont("Teletext10x18Ascii");
|
||||
if (settings.weekday)
|
||||
g.setFontAlign(0,1).drawString(require("locale").dow(date).toUpperCase(),g.getWidth()/2,g.getHeight()-18);
|
||||
// Draw Date
|
||||
if (settings.date)
|
||||
g.setFontAlign(0,1).drawString(require('locale').date(date,1),g.getWidth()/2,g.getHeight());
|
||||
require("widget_utils").show();
|
||||
|
|
@ -44,9 +42,7 @@
|
|||
require("widget_utils").hide();
|
||||
};
|
||||
let draw = function() {
|
||||
//drawTimeout = undefined;
|
||||
let date = new Date();
|
||||
print ("drawing time at:" +date.getHours()+":"+date.getMinutes()+":"+date.getSeconds());
|
||||
g.reset();
|
||||
if ((!settings.hideWhenLocked) || (!Bangle.isLocked())) drawExtras();
|
||||
else require("widget_utils").hide();
|
||||
|
|
@ -54,7 +50,7 @@
|
|||
if (drawTimeout) clearTimeout(drawTimeout);
|
||||
drawTimeout = setTimeout(draw, interval - (Date.now() % interval));
|
||||
};
|
||||
|
||||
if (settings.hideWhenLocked) {
|
||||
let onLock = locked => {
|
||||
if (!locked) {
|
||||
require("widget_utils").show();
|
||||
|
|
@ -76,7 +72,6 @@
|
|||
if (extrasTimeout) clearTimeout(extrasTimeout);
|
||||
extrasTimeout = setTimeout(hideExtras, 5000);
|
||||
};
|
||||
if (settings.hideWhenLocked) {
|
||||
Bangle.on('lock', onLock);
|
||||
if (settings.tapToShow) Bangle.on('tap', onTap);
|
||||
if (settings.twistToShow) Bangle.on('twist', onTwist);
|
||||
|
|
@ -92,7 +87,9 @@
|
|||
g.clear();
|
||||
}});
|
||||
g.clear();
|
||||
if (settings.widgets) {
|
||||
Bangle.loadWidgets();
|
||||
Bangle.drawWidgets();
|
||||
}
|
||||
draw();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue