mirror of
https://github.com/Crocmagnon/buzzer.git
synced 2024-11-25 01:18:06 +01:00
Display playing status & remaining time before sleep in web view
This commit is contained in:
parent
7730389b60
commit
828ca9742b
3 changed files with 30 additions and 2 deletions
|
@ -16,6 +16,10 @@
|
||||||
<div class="w3-margin w3-center w3-card w3-padding-24">
|
<div class="w3-margin w3-center w3-card w3-padding-24">
|
||||||
<button onclick="play()" class="w3-button w3-blue w3-xlarge w3-ripple">Jouer le son</button>
|
<button onclick="play()" class="w3-button w3-blue w3-xlarge w3-ripple">Jouer le son</button>
|
||||||
<button onclick="stop()" class="w3-button w3-blue w3-xlarge w3-ripple">Stop</button>
|
<button onclick="stop()" class="w3-button w3-blue w3-xlarge w3-ripple">Stop</button>
|
||||||
|
<p class="w3-opacity">
|
||||||
|
<span id="playingStatus" class="w3-hide">Lecture en cours.</span>
|
||||||
|
Temps restant avant veille : <span id="remainingTimeBeforeSleep">01:00:00</span>.
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="w3-margin w3-center w3-card w3-padding-24">
|
<div class="w3-margin w3-center w3-card w3-padding-24">
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
const GLOBAL_TIMEOUT = 10000;
|
const GLOBAL_TIMEOUT = 3500;
|
||||||
let connectionOk = true;
|
let connectionOk = true;
|
||||||
let statusTimeout = null;
|
let statusTimeout = null;
|
||||||
let selectedFile = "";
|
let selectedFile = "";
|
||||||
|
@ -66,6 +66,16 @@ function handleStatus(data) {
|
||||||
document.getElementById("volume-current").innerText = data.volume.current;
|
document.getElementById("volume-current").innerText = data.volume.current;
|
||||||
document.getElementById("volume-increase").disabled = !data.volume.canIncrease;
|
document.getElementById("volume-increase").disabled = !data.volume.canIncrease;
|
||||||
document.getElementById("volume-decrease").disabled = !data.volume.canDecrease;
|
document.getElementById("volume-decrease").disabled = !data.volume.canDecrease;
|
||||||
|
|
||||||
|
document.getElementById("remainingTimeBeforeSleep").innerText = secondsToHumanDuration(data.remainingSecondsBeforeSleep);
|
||||||
|
|
||||||
|
const playingStatus = document.getElementById("playingStatus");
|
||||||
|
if (data.playing) {
|
||||||
|
playingStatus.classList.remove("w3-hide");
|
||||||
|
} else {
|
||||||
|
playingStatus.classList.add("w3-hide");
|
||||||
|
}
|
||||||
|
|
||||||
statusTimeout = setTimeout(loadStatus, GLOBAL_TIMEOUT);
|
statusTimeout = setTimeout(loadStatus, GLOBAL_TIMEOUT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -112,6 +122,11 @@ function handleError(error) {
|
||||||
statusTimeout = setTimeout(loadStatus, GLOBAL_TIMEOUT);
|
statusTimeout = setTimeout(loadStatus, GLOBAL_TIMEOUT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function secondsToHumanDuration(seconds) {
|
||||||
|
console.log({seconds});
|
||||||
|
return new Date(seconds * 1000).toISOString().slice(11, 19);
|
||||||
|
}
|
||||||
|
|
||||||
(() => {
|
(() => {
|
||||||
loadStatus().then(() => listFiles());
|
loadStatus().then(() => listFiles());
|
||||||
statusTimeout = setTimeout(loadStatus, GLOBAL_TIMEOUT);
|
statusTimeout = setTimeout(loadStatus, GLOBAL_TIMEOUT);
|
||||||
|
|
|
@ -28,7 +28,7 @@ void onStatus(AsyncWebServerRequest *request)
|
||||||
Serial.println("Status");
|
Serial.println("Status");
|
||||||
AsyncResponseStream *response = request->beginResponseStream("application/json");
|
AsyncResponseStream *response = request->beginResponseStream("application/json");
|
||||||
|
|
||||||
StaticJsonDocument<96> root;
|
StaticJsonDocument<128> root;
|
||||||
String file = preferences.getString(SELECTED_FILE, "");
|
String file = preferences.getString(SELECTED_FILE, "");
|
||||||
root["files"]["selected"] = file.c_str();
|
root["files"]["selected"] = file.c_str();
|
||||||
|
|
||||||
|
@ -38,6 +38,15 @@ void onStatus(AsyncWebServerRequest *request)
|
||||||
volume["canDecrease"] = currentVolume > 0;
|
volume["canDecrease"] = currentVolume > 0;
|
||||||
volume["canIncrease"] = currentVolume < 21;
|
volume["canIncrease"] = currentVolume < 21;
|
||||||
|
|
||||||
|
if (!audio.isRunning())
|
||||||
|
{
|
||||||
|
root["remainingSecondsBeforeSleep"] = (DEEP_SLEEP_DELAY_MS - (millis() - lastActionTime)) / 1000;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
root["remainingSecondsBeforeSleep"] = DEEP_SLEEP_DELAY_MS / 1000;
|
||||||
|
}
|
||||||
|
root["playing"] = audio.isRunning();
|
||||||
|
|
||||||
serializeJson(root, *response);
|
serializeJson(root, *response);
|
||||||
request->send(response);
|
request->send(response);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue