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

stopw: only show milliseconds for the first second

pull/2697/head
Rob Pilling 2023-04-19 08:37:41 +01:00
parent 9cb21ceb0f
commit 1893345d37
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/clkinfostopw/clkinfo.js
View File

@ -2,6 +2,7 @@
var durationOnPause = "---";
var redrawInterval;
var startTime;
var over1s = false;
var _a = (require("Storage").readJSON("clkinfostopw.setting.json", true) || {}).format, format = _a === void 0 ? 0 : _a;
var unqueueRedraw = function () {
if (redrawInterval)
@ -11,13 +12,26 @@
var queueRedraw = function () {
var _this = this;
unqueueRedraw();
redrawInterval = setInterval(function () { return _this.emit('redraw'); }, 1000);
redrawInterval = setInterval(function () {
if (startTime) {
if (!over1s && Date.now() - startTime > 1000) {
over1s = true;
changeInterval(redrawInterval, 1000);
}
}
else {
unqueueRedraw();
}
_this.emit('redraw');
}, 100);
};
var pad2 = function (s) { return ('0' + s.toFixed(0)).slice(-2); };
var duration = function (start) {
var seconds = (Date.now() - start) / 1000;
if (seconds < 60)
if (seconds <= 1)
return seconds.toFixed(1);
if (seconds < 60)
return seconds.toFixed(0);
var mins = seconds / 60;
seconds %= 60;
if (mins < 60)
@ -56,10 +70,10 @@
if (startTime) {
durationOnPause = duration(startTime);
startTime = undefined;
unqueueRedraw();
}
else {
queueRedraw.call(this);
over1s = false;
startTime = Date.now();
}
}

21
apps/clkinfostopw/clkinfo.ts
View File

@ -2,6 +2,7 @@
let durationOnPause = "---";
let redrawInterval: number | undefined;
let startTime: number | undefined;
let over1s = false;
let { format = StopWatchFormat.HMS }: StopWatchSettings
= require("Storage").readJSON("clkinfostopw.setting.json", true) || {};
@ -12,7 +13,17 @@
const queueRedraw = function(this: ClockInfo.MenuItem) {
unqueueRedraw();
redrawInterval = setInterval(() => this.emit('redraw'), 1000);
redrawInterval = setInterval(() => {
if (startTime) {
if (!over1s && Date.now() - startTime > 1000) {
over1s = true;
changeInterval(redrawInterval, 1000);
}
} else {
unqueueRedraw();
}
this.emit('redraw')
}, 100);
};
const pad2 = (s: number) => ('0' + s.toFixed(0)).slice(-2);
@ -20,8 +31,10 @@
const duration = (start: number) => {
let seconds = (Date.now() - start) / 1000;
if (seconds < 60)
if (seconds <= 1)
return seconds.toFixed(1);
if (seconds < 60)
return seconds.toFixed(0);
let mins = seconds / 60;
seconds %= 60;
@ -64,10 +77,10 @@
run: function() { // tapped
if (startTime) {
durationOnPause = duration(startTime);
startTime = undefined;
unqueueRedraw();
startTime = undefined; // this also unqueues the redraw
} else {
queueRedraw.call(this);
over1s = false;
startTime = Date.now();
}
}