mirror/react-native-update
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/re/react-native-pushy.git synced 2025-10-31 21:33:12 +08:00
Code Issues Packages Projects Releases Wiki Activity GitHub Gitee

Unify download progress event

Browse Source
This commit is contained in:
sunnylqm
2020-08-09 00:08:30 +08:00
parent a4a372f17e
commit 6abb2c7a5d
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
android/src/main/java/cn/reactnative/modules/update/DownloadTask.java
View File

@@ -41,6 +41,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
final int DOWNLOAD_CHUNK_SIZE = 4096; final int DOWNLOAD_CHUNK_SIZE = 4096;
Context context; Context context;
String hash;
DownloadTask(Context context) { DownloadTask(Context context) {
this.context = context; this.context = context;
@@ -69,7 +70,10 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
} }
} }
private void downloadFile(String url, File writePath) throws IOException { private void downloadFile(DownloadTaskParams param) throws IOException {
String url = param.url;
File writePath = param.zipFilePath;
this.hash = param.hash;
OkHttpClient client = new OkHttpClient(); OkHttpClient client = new OkHttpClient();
Request request = new Request.Builder().url(url) Request request = new Request.Builder().url(url)
.build(); .build();
@@ -92,21 +96,17 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
} }
long bytesRead = 0; long bytesRead = 0;
long totalRead = 0; long received = 0;
double lastProgressValue=0;
while ((bytesRead = source.read(sink.buffer(), DOWNLOAD_CHUNK_SIZE)) != -1) { while ((bytesRead = source.read(sink.buffer(), DOWNLOAD_CHUNK_SIZE)) != -1) {
totalRead += bytesRead; received += bytesRead;
sink.emit(); sink.emit();
if (UpdateContext.DEBUG) { if (UpdateContext.DEBUG) {
Log.d("RNUpdate", "Progress " + totalRead + "/" + contentLength); Log.d("RNUpdate", "Progress " + received + "/" + contentLength);
}
double progress = Math.round(((double) totalRead * 100) / contentLength);
if ((progress != lastProgressValue) || (totalRead == contentLength)) {
lastProgressValue = progress;
publishProgress(new long[]{(long)progress,totalRead, contentLength});
} }
publishProgress(new long[]{received, contentLength});
} }
if (totalRead != contentLength) { if (received != contentLength) {
throw new Error("Unexpected eof while reading ppk"); throw new Error("Unexpected eof while reading ppk");
} }
sink.writeAll(source); sink.writeAll(source);
@@ -121,10 +121,10 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
protected void onProgressUpdate(long[]... values) { protected void onProgressUpdate(long[]... values) {
super.onProgressUpdate(values); super.onProgressUpdate(values);
WritableMap params = Arguments.createMap(); WritableMap params = Arguments.createMap();
params.putDouble("progress", (values[0][0])); params.putDouble("received", (values[0][0]));
params.putDouble("totalRead", (values[0][1])); params.putDouble("total", (values[0][1]));
params.putDouble("contentLength", (values[0][2])); params.putDouble("hashname", this.hash);
sendEvent("progress", params); sendEvent("RCTPushyDownloadProgress", params);
} }
@@ -238,7 +238,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
} }
private void doDownload(DownloadTaskParams param) throws IOException { private void doDownload(DownloadTaskParams param) throws IOException {
downloadFile(param.url, param.zipFilePath); downloadFile(param);
ZipInputStream zis = new ZipInputStream(new BufferedInputStream(new FileInputStream(param.zipFilePath))); ZipInputStream zis = new ZipInputStream(new BufferedInputStream(new FileInputStream(param.zipFilePath)));
ZipEntry ze; ZipEntry ze;
@@ -295,7 +295,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
} }
private void doPatchFromApk(DownloadTaskParams param) throws IOException, JSONException { private void doPatchFromApk(DownloadTaskParams param) throws IOException, JSONException {
downloadFile(param.url, param.zipFilePath); downloadFile(param);
ZipInputStream zis = new ZipInputStream(new BufferedInputStream(new FileInputStream(param.zipFilePath))); ZipInputStream zis = new ZipInputStream(new BufferedInputStream(new FileInputStream(param.zipFilePath)));
ZipEntry ze; ZipEntry ze;
@@ -371,7 +371,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
} }
private void doPatchFromPpk(DownloadTaskParams param) throws IOException, JSONException { private void doPatchFromPpk(DownloadTaskParams param) throws IOException, JSONException {
downloadFile(param.url, param.zipFilePath); downloadFile(param);
ZipInputStream zis = new ZipInputStream(new BufferedInputStream(new FileInputStream(param.zipFilePath))); ZipInputStream zis = new ZipInputStream(new BufferedInputStream(new FileInputStream(param.zipFilePath)));
ZipEntry ze; ZipEntry ze;

6
lib/index.d.ts vendored
View File

@@ -55,3 +55,9 @@ export function setCustomEndpoints({
backUps?: string[]; backUps?: string[];
backupQueryUrl?: string; backupQueryUrl?: string;
}): void; }): void;
interface ProgressEvent {
received: number;
total: number;
}