pull/216/head
parent
e5af50137b
commit
56e947e53d
|
@ -1010,7 +1010,7 @@ echo '</script>';
|
||||||
var tmptime = new Date();
|
var tmptime = new Date();
|
||||||
var tmpspeed = e.loaded*1000/(tmptime.getTime()-C_starttime.getTime());
|
var tmpspeed = e.loaded*1000/(tmptime.getTime()-C_starttime.getTime());
|
||||||
var remaintime = (totalsize-asize-e.loaded)/tmpspeed;
|
var remaintime = (totalsize-asize-e.loaded)/tmpspeed;
|
||||||
label.innerHTML=StartStr+'<?php echo getconstStr('Upload'); ?> ' +size_format(asize+e.loaded)+ ' / '+size_format(totalsize) + ' = ' + ((asize+e.loaded)*100/totalsize).toFixed(2) + '% <?php echo getconstStr('AverageSpeed'); ?>:'+size_format((asize+e.loaded-newstartsize)*1000/(tmptime.getTime()-StartTime.getTime()))+'/s <?php echo getconstStr('CurrentSpeed'); ?> '+size_format(tmpspeed)+'/s <?php echo getconstStr('Expect'); ?> '+remaintime.toFixed(1)+'s';
|
label.innerHTML=StartStr+'<?php echo getconstStr('Upload'); ?> ' +size_format(asize+e.loaded)+ ' / '+size_format(totalsize) + ' = ' + ((asize+e.loaded)*100/totalsize).toFixed(2) + '% <?php echo getconstStr('AverageSpeed'); ?>:'+size_format((asize+e.loaded-newstartsize)*1000/(tmptime.getTime()-StartTime.getTime()))+'/s<br><?php echo getconstStr('CurrentSpeed'); ?> '+size_format(tmpspeed)+'/s <?php echo getconstStr('Expect'); ?> '+remaintime.toFixed(1)+'s';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var C_starttime = new Date();
|
var C_starttime = new Date();
|
||||||
|
@ -1053,8 +1053,7 @@ echo '</script>';
|
||||||
}
|
}
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
EndTime=new Date();
|
EndTime=new Date();
|
||||||
MiddleStr = '<?php echo getconstStr('EndAt'); ?>:'+EndTime.toLocaleString()+' ';
|
MiddleStr = '<?php echo getconstStr('EndAt'); ?>:'+EndTime.toLocaleString()+'<br>;'; if (newstartsize==0) {
|
||||||
if (newstartsize==0) {
|
|
||||||
MiddleStr += '<?php echo getconstStr('AverageSpeed'); ?>:'+size_format(totalsize*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
|
MiddleStr += '<?php echo getconstStr('AverageSpeed'); ?>:'+size_format(totalsize*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
|
||||||
} else {
|
} else {
|
||||||
MiddleStr += '<?php echo getconstStr('ThisTime').getconstStr('AverageSpeed'); ?>:'+size_format((totalsize-newstartsize)*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
|
MiddleStr += '<?php echo getconstStr('ThisTime').getconstStr('AverageSpeed'); ?>:'+size_format((totalsize-newstartsize)*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
|
||||||
|
|
|
@ -1010,7 +1010,7 @@ echo '</script>';
|
||||||
var tmptime = new Date();
|
var tmptime = new Date();
|
||||||
var tmpspeed = e.loaded*1000/(tmptime.getTime()-C_starttime.getTime());
|
var tmpspeed = e.loaded*1000/(tmptime.getTime()-C_starttime.getTime());
|
||||||
var remaintime = (totalsize-asize-e.loaded)/tmpspeed;
|
var remaintime = (totalsize-asize-e.loaded)/tmpspeed;
|
||||||
label.innerHTML=StartStr+'<?php echo getconstStr('Upload'); ?> ' +size_format(asize+e.loaded)+ ' / '+size_format(totalsize) + ' = ' + ((asize+e.loaded)*100/totalsize).toFixed(2) + '% <?php echo getconstStr('AverageSpeed'); ?>:'+size_format((asize+e.loaded-newstartsize)*1000/(tmptime.getTime()-StartTime.getTime()))+'/s <?php echo getconstStr('CurrentSpeed'); ?> '+size_format(tmpspeed)+'/s <?php echo getconstStr('Expect'); ?> '+remaintime.toFixed(1)+'s';
|
label.innerHTML=StartStr+'<?php echo getconstStr('Upload'); ?> ' +size_format(asize+e.loaded)+ ' / '+size_format(totalsize) + ' = ' + ((asize+e.loaded)*100/totalsize).toFixed(2) + '% <?php echo getconstStr('AverageSpeed'); ?>:'+size_format((asize+e.loaded-newstartsize)*1000/(tmptime.getTime()-StartTime.getTime()))+'/s<br><?php echo getconstStr('CurrentSpeed'); ?> '+size_format(tmpspeed)+'/s <?php echo getconstStr('Expect'); ?> '+remaintime.toFixed(1)+'s';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var C_starttime = new Date();
|
var C_starttime = new Date();
|
||||||
|
@ -1053,7 +1053,7 @@ echo '</script>';
|
||||||
}
|
}
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
EndTime=new Date();
|
EndTime=new Date();
|
||||||
MiddleStr = '<?php echo getconstStr('EndAt'); ?>:'+EndTime.toLocaleString()+' ';
|
MiddleStr = '<?php echo getconstStr('EndAt'); ?>:'+EndTime.toLocaleString()+'<br>;';
|
||||||
if (newstartsize==0) {
|
if (newstartsize==0) {
|
||||||
MiddleStr += '<?php echo getconstStr('AverageSpeed'); ?>:'+size_format(totalsize*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
|
MiddleStr += '<?php echo getconstStr('AverageSpeed'); ?>:'+size_format(totalsize*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -1010,7 +1010,7 @@ echo '</script>';
|
||||||
var tmptime = new Date();
|
var tmptime = new Date();
|
||||||
var tmpspeed = e.loaded*1000/(tmptime.getTime()-C_starttime.getTime());
|
var tmpspeed = e.loaded*1000/(tmptime.getTime()-C_starttime.getTime());
|
||||||
var remaintime = (totalsize-asize-e.loaded)/tmpspeed;
|
var remaintime = (totalsize-asize-e.loaded)/tmpspeed;
|
||||||
label.innerHTML=StartStr+'<?php echo getconstStr('Upload'); ?> ' +size_format(asize+e.loaded)+ ' / '+size_format(totalsize) + ' = ' + ((asize+e.loaded)*100/totalsize).toFixed(2) + '% <?php echo getconstStr('AverageSpeed'); ?>:'+size_format((asize+e.loaded-newstartsize)*1000/(tmptime.getTime()-StartTime.getTime()))+'/s <?php echo getconstStr('CurrentSpeed'); ?> '+size_format(tmpspeed)+'/s <?php echo getconstStr('Expect'); ?> '+remaintime.toFixed(1)+'s';
|
label.innerHTML=StartStr+'<?php echo getconstStr('Upload'); ?> ' +size_format(asize+e.loaded)+ ' / '+size_format(totalsize) + ' = ' + ((asize+e.loaded)*100/totalsize).toFixed(2) + '% <?php echo getconstStr('AverageSpeed'); ?>:'+size_format((asize+e.loaded-newstartsize)*1000/(tmptime.getTime()-StartTime.getTime()))+'/s<br><?php echo getconstStr('CurrentSpeed'); ?> '+size_format(tmpspeed)+'/s <?php echo getconstStr('Expect'); ?> '+remaintime.toFixed(1)+'s';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var C_starttime = new Date();
|
var C_starttime = new Date();
|
||||||
|
@ -1053,8 +1053,7 @@ echo '</script>';
|
||||||
}
|
}
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
EndTime=new Date();
|
EndTime=new Date();
|
||||||
MiddleStr = '<?php echo getconstStr('EndAt'); ?>:'+EndTime.toLocaleString()+' ';
|
MiddleStr = '<?php echo getconstStr('EndAt'); ?>:'+EndTime.toLocaleString()+'<br>;'; if (newstartsize==0) {
|
||||||
if (newstartsize==0) {
|
|
||||||
MiddleStr += '<?php echo getconstStr('AverageSpeed'); ?>:'+size_format(totalsize*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
|
MiddleStr += '<?php echo getconstStr('AverageSpeed'); ?>:'+size_format(totalsize*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
|
||||||
} else {
|
} else {
|
||||||
MiddleStr += '<?php echo getconstStr('ThisTime').getconstStr('AverageSpeed'); ?>:'+size_format((totalsize-newstartsize)*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
|
MiddleStr += '<?php echo getconstStr('ThisTime').getconstStr('AverageSpeed'); ?>:'+size_format((totalsize-newstartsize)*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
|
||||||
|
|
Loading…
Reference in New Issue