Commit 326e3cda authored by Skye Yu's avatar Skye Yu

Merge branch 'cherry-pick-49eb6e93' into 'master'

rename and add log

See merge request !3
parents bc938d2b ebf14f90
......@@ -706,7 +706,7 @@ Jensen.prototype.getFile = async function (filename, length, ondata, onprogress)
let wakeLock = null;
let timer = null;
async function visibilitychange() {
function visibilitychange() {
let audio = document.getElementById('test_audio');
if (!audio) {
audio = document.createElement('audio');
......@@ -741,11 +741,12 @@ Jensen.prototype.getFile = async function (filename, length, ondata, onprogress)
}
}
function removeAudio() {
function clearEventAndTask() {
const audio = document.getElementById('test_audio');
audio && audio.pause() && audio.remove();
wakeLock && wakeLock.release();
timer && clearInterval(timer)
console.log('Clear event and task.');
}
visibilitychange();
......@@ -758,17 +759,17 @@ Jensen.prototype.getFile = async function (filename, length, ondata, onprogress)
flen += msg.body.length || msg.body.byteLength;
ondata(msg.body);
Logger.info('jensen', 'getFile length', `${length} ${flen}`)
removeAudio();
clearEventAndTask();
if (flen >= length) {
document.removeEventListener('visibilitychange', visibilitychange);
Logger.info('jensen', 'getFile', 'file download finish.')
removeAudio();
clearEventAndTask();
// return OK indicates all file blocks received
return 'OK';
}
} else {
document.removeEventListener('visibilitychange', visibilitychange);
removeAudio();
clearEventAndTask();
Logger.info('jensen', 'getFile', 'file download fail.')
ondata('fail');
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment