Commit 2df424ff authored by martin hou's avatar martin hou

fix: 恢复为旧的文件传输方法实现

parent 21a1dc63
...@@ -1012,31 +1012,19 @@ Jensen.prototype.getFile = async function (filename, length, ondata, onprogress) ...@@ -1012,31 +1012,19 @@ Jensen.prototype.getFile = async function (filename, length, ondata, onprogress)
} }
}; };
// this.onreceive = onprogress; // this.onreceive = onprogress;
this.onprogress = null;
this.onreceive = null;
this._progress_report = {}; this._progress_report = {};
let self = this;
// try { onprogress(0); } catch(e) {}
this.onprogress = onprogress;
this.onreceive = function(recvBytes) this.onreceive = function(recvBytes)
{ {
let percent = Math.floor(recvBytes / length * 100); let percent = Math.floor(recvBytes / length * 100);
let k = 't' + percent; let k = 't' + percent;
if (percent % 5 == 0 && percent > 0 && percent < 100) if (percent % 5 == 0 && percent > 0 && percent < 100)
{ {
// Logger.info('jensen', 'file-transfer', percent); this._progress_report[k] && onprogress?.(recvBytes);
if (!(k in self._progress_report)) this._progress_report[k] = true;
{
Logger.debug('jensen', 'file-transfer', 'current: ' + percent + '%');
onprogress?.(recvBytes);
}
self._progress_report[k] = true;
} }
if (recvBytes >= length) if (percent == 100)
{ {
// Logger.debug('jensen', 'file-transfer', 'current: 100%, ' + recvBytes); onprogress?.(recvBytes);
if (!(k in self._progress_report)) onprogress?.(length);
self._progress_report[k] = true;
} }
} }
this.registerHandler(TRANSFER_FILE, handler); this.registerHandler(TRANSFER_FILE, handler);
......
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