Commit ebf14f90 authored by Skye Yu's avatar Skye Yu Committed by Skye Yu

rename and add log


(cherry picked from commit 49eb6e93)
parent bc938d2b
...@@ -706,7 +706,7 @@ Jensen.prototype.getFile = async function (filename, length, ondata, onprogress) ...@@ -706,7 +706,7 @@ Jensen.prototype.getFile = async function (filename, length, ondata, onprogress)
let wakeLock = null; let wakeLock = null;
let timer = null; let timer = null;
async function visibilitychange() { function visibilitychange() {
let audio = document.getElementById('test_audio'); let audio = document.getElementById('test_audio');
if (!audio) { if (!audio) {
audio = document.createElement('audio'); audio = document.createElement('audio');
...@@ -741,11 +741,12 @@ Jensen.prototype.getFile = async function (filename, length, ondata, onprogress) ...@@ -741,11 +741,12 @@ Jensen.prototype.getFile = async function (filename, length, ondata, onprogress)
} }
} }
function removeAudio() { function clearEventAndTask() {
const audio = document.getElementById('test_audio'); const audio = document.getElementById('test_audio');
audio && audio.pause() && audio.remove(); audio && audio.pause() && audio.remove();
wakeLock && wakeLock.release(); wakeLock && wakeLock.release();
timer && clearInterval(timer) timer && clearInterval(timer)
console.log('Clear event and task.');
} }
visibilitychange(); visibilitychange();
...@@ -758,17 +759,17 @@ Jensen.prototype.getFile = async function (filename, length, ondata, onprogress) ...@@ -758,17 +759,17 @@ Jensen.prototype.getFile = async function (filename, length, ondata, onprogress)
flen += msg.body.length || msg.body.byteLength; flen += msg.body.length || msg.body.byteLength;
ondata(msg.body); ondata(msg.body);
Logger.info('jensen', 'getFile length', `${length} ${flen}`) Logger.info('jensen', 'getFile length', `${length} ${flen}`)
removeAudio(); clearEventAndTask();
if (flen >= length) { if (flen >= length) {
document.removeEventListener('visibilitychange', visibilitychange); document.removeEventListener('visibilitychange', visibilitychange);
Logger.info('jensen', 'getFile', 'file download finish.') Logger.info('jensen', 'getFile', 'file download finish.')
removeAudio(); clearEventAndTask();
// return OK indicates all file blocks received // return OK indicates all file blocks received
return 'OK'; return 'OK';
} }
} else { } else {
document.removeEventListener('visibilitychange', visibilitychange); document.removeEventListener('visibilitychange', visibilitychange);
removeAudio(); clearEventAndTask();
Logger.info('jensen', 'getFile', 'file download fail.') Logger.info('jensen', 'getFile', 'file download fail.')
ondata('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