Commit c4b4b7d9 authored by martin hou's avatar martin hou

Merge branch 'v20250816' into device-mgr

parents 6b841d87 41a29e60
...@@ -195,7 +195,7 @@ function Jensen(log, conn) { ...@@ -195,7 +195,7 @@ function Jensen(log, conn) {
{ {
// 应该要连续多次5秒的间隔才能算从休眠中恢复 // 应该要连续多次5秒的间隔才能算从休眠中恢复
// 这个状态很可能只是一次临时唤醒,我需要更准确的彻底恢复 // 这个状态很可能只是一次临时唤醒,我需要更准确的彻底恢复
if (typeof(self.onwakeup) == 'function') if (typeof(self.onwakeup) == 'function' && Boolean(current))
{ {
setTimeout(function() { setTimeout(function() {
let currentTime = new Date().getTime(); let currentTime = new Date().getTime();
...@@ -334,7 +334,7 @@ function Jensen(log, conn) { ...@@ -334,7 +334,7 @@ function Jensen(log, conn) {
current = 'cmd-' + cmd.command + '-' + cmd.index; current = 'cmd-' + cmd.command + '-' + cmd.index;
Logger.debug('jensen', 'sendNext', pid + '-command: ' + current + ', data bytes: ' + data.byteLength); Logger.debug('jensen', 'sendNext', pid + '-command: ' + current + ', data bytes: ' + data.byteLength);
self.timewait = cmd.command == TRANSFER_FILE || cmd.command == GET_FILE_BLOCK ? 1000 : 10; self.timewait = cmd.command == TRANSFER_FILE || cmd.command == GET_FILE_BLOCK ? 2000 : 10;
// self.timewait = 10000; // self.timewait = 10000;
console.log(pid + '-send', data); console.log(pid + '-send', data);
if (self.onprogress && cmd.command == TRANSFER_FILE) if (self.onprogress && cmd.command == TRANSFER_FILE)
......
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