lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-05-03 12:18:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!594 StreamProgress进度条添加总大小值回调

Browse Source 
Merge pull request !594 from 追风/v5-dev
This commit is contained in:
Looly 2022-04-10 07:29:19 +00:00 committed by Gitee
commit e4f713a162
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-core/src/main/java/cn/hutool/core/io/StreamProgress.java
View File

@ -17,7 +17,7 @@ public interface StreamProgress {
*
* @param progressSize 已经进行的大小
*/
void progress(long progressSize);
void progress(long contentLength, long progressSize);
/**
* 结束

2
hutool-core/src/main/java/cn/hutool/core/io/copy/ChannelCopier.java
View File

@ -107,7 +107,7 @@ public class ChannelCopier extends IoCopier<ReadableByteChannel, WritableByteCha
numToRead -= read;
total += read;
if (null != progress) {
progress.progress(total);
progress.progress(this.count, total);
}
}

2
hutool-core/src/main/java/cn/hutool/core/io/copy/ReaderWriterCopier.java
View File

@ -108,7 +108,7 @@ public class ReaderWriterCopier extends IoCopier<Reader, Writer> {
numToRead -= read;
total += read;
if (null != progress) {
progress.progress(total);
progress.progress(this.count, total);
}
}

2
hutool-core/src/main/java/cn/hutool/core/io/copy/StreamCopier.java
View File

@ -107,7 +107,7 @@ public class StreamCopier extends IoCopier<InputStream, OutputStream> {
numToRead -= read;
total += read;
if (null != progress) {
progress.progress(total);
progress.progress(this.count, total);
}
}

10
hutool-http/src/test/java/cn/hutool/http/DownloadTest.java
View File

@ -54,9 +54,9 @@ public class DownloadTest {
}
@Override
public void progress(long progressSize) {
public void progress(long contentLength, long progressSize) {
long speed = progressSize / (System.currentTimeMillis() - time) * 1000;
Console.log("已下载：{}, 速度：{}/s", FileUtil.readableFileSize(progressSize), FileUtil.readableFileSize(speed));
Console.log("总大小:{}, 已下载：{}, 速度：{}/s", FileUtil.readableFileSize(contentLength), FileUtil.readableFileSize(progressSize), FileUtil.readableFileSize(speed));
}
@Override
@ -87,7 +87,7 @@ public class DownloadTest {
}
@Override
public void progress(long progressSize) {
public void progress(long contentLength, long progressSize) {
System.out.println("download size:" + progressSize);
}
@ -121,8 +121,8 @@ public class DownloadTest {
}
@Override
public void progress(long progressSize) {
System.out.println("download size:" + progressSize);
public void progress(long contentLength, long progressSize) {
System.out.println("contentLength:" + contentLength + "download size:" + progressSize);
}
@Override