Skip to content

Commit 641e33b

Browse files
author
ghc
committed
调整callback为interface形式的listener
1 parent 8239962 commit 641e33b

18 files changed

Lines changed: 424 additions & 185 deletions

‎EvolvingNet/src/main/java/com/codingcoderscode/evolving/net/request/CCDownloadRequest.java‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
import android.os.Looper;
77
import android.text.TextUtils;
88

9-
import com.codingcoderscode.evolving.net.CCRxNetManager;
109
import com.codingcoderscode.evolving.net.cache.mode.CCCMode;
1110
import com.codingcoderscode.evolving.net.request.api.CCNetApiService;
1211
import com.codingcoderscode.evolving.net.request.base.CCRequest;
13-
import com.codingcoderscode.evolving.net.request.callback.CCDownloadFileWritterCallback;
12+
import com.codingcoderscode.evolving.net.request.callback.CCDownloadFileWriteListener;
1413
import com.codingcoderscode.evolving.net.request.exception.CCUnExpectedException;
1514
import com.codingcoderscode.evolving.net.request.exception.NoEnoughSpaceException;
1615
import com.codingcoderscode.evolving.net.request.exception.NoResponseBodyDataException;
@@ -49,7 +48,7 @@
4948
public class CCDownloadRequest<T> extends CCRequest<T, CCDownloadRequest<T>> {
5049

5150
//进度回调
52-
//private CCDownloadProgressCallback ccDownloadProgressCallback;
51+
//private CCDownloadProgressListener ccDownloadProgressCallback;
5352
//下载文件的本地保存路径
5453
private String fileSavePath;
5554
//下载文件的本地名称，含后缀
@@ -85,7 +84,7 @@ public class CCDownloadRequest<T> extends CCRequest<T, CCDownloadRequest<T>> {
8584
//网络下载速度，实时速度 单位：b/s
8685
private long downloadNetworkSpeed = 0L;
8786

88-
private CCDownloadFileWritterCallback ccDownloadFileWritterCallback;
87+
private CCDownloadFileWriteListener CCDownloadFileWriteListener;
8988

9089
private final int DEFAULT_BUFFER_SIZE = 8 * 1024;
9190

@@ -158,8 +157,8 @@ public Publisher<CCBaseResponse<T>> apply(Call<ResponseBody> responseBodyCall) t
158157
}
159158
}
160159

161-
if (getCcDownloadFileWritterCallback() != null) {
162-
getCcDownloadFileWritterCallback().onWriteToDisk(retrofitResponse.body(), headers, getCcNetCallback());
160+
if (getCCDownloadFileWriteListener() != null) {
161+
getCCDownloadFileWriteListener().onWriteToDisk(retrofitResponse.body(), headers, getCCNetResultListener());
163162
} else {
164163
onWriteToDisk(retrofitResponse.body());
165164
}
@@ -259,16 +258,16 @@ private void onWriteToDisk(ResponseBody responseBody) throws Exception {
259258

260259
lastUpdateTime = nowTime;
261260

262-
if (getCcNetCallback() != null) {
261+
if (getCCNetResultListener() != null) {
263262

264-
getCcNetCallback().onProgressSave(getReqTag(), downloadedProgress, downloadNetworkSpeed, downloadedSize, fileSize);
263+
getCCNetResultListener().onProgressSave(getReqTag(), downloadedProgress, downloadNetworkSpeed, downloadedSize, fileSize);
265264

266265
requireNonNullUICallbackHandler();
267266

268267
uiCallbackHandler.post(new Runnable() {
269268
@Override
270269
public void run() {
271-
getCcNetCallback().onProgress(getReqTag(), downloadedProgress, downloadNetworkSpeed, downloadedSize, fileSize);
270+
getCCNetResultListener().onProgress(getReqTag(), downloadedProgress, downloadNetworkSpeed, downloadedSize, fileSize);
272271
}
273272
});
274273
}
@@ -392,18 +391,18 @@ public CCDownloadRequest<T> setSupportRage(boolean supportRage) {
392391
return this;
393392
}
394393

395-
public CCDownloadFileWritterCallback getCcDownloadFileWritterCallback() {
396-
return ccDownloadFileWritterCallback;
394+
public CCDownloadFileWriteListener getCCDownloadFileWriteListener() {
395+
return CCDownloadFileWriteListener;
397396
}
398397

399398
/**
400399
* 设置自定义的文件本地写入回调
401400
*
402-
* @param ccDownloadFileWritterCallback
401+
* @param CCDownloadFileWriteListener
403402
* @return
404403
*/
405-
public CCDownloadRequest<T> setCcDownloadFileWritterCallback(CCDownloadFileWritterCallback ccDownloadFileWritterCallback) {
406-
this.ccDownloadFileWritterCallback = ccDownloadFileWritterCallback;
404+
public CCDownloadRequest<T> setCCDownloadFileWriteListener(CCDownloadFileWriteListener CCDownloadFileWriteListener) {
405+
this.CCDownloadFileWriteListener = CCDownloadFileWriteListener;
407406
return this;
408407
}
409408
}

‎EvolvingNet/src/main/java/com/codingcoderscode/evolving/net/request/CCMultiDownladRequest.java‎

Lines changed: 47 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package com.codingcoderscode.evolving.net.request;
22

3-
import com.codingcoderscode.evolving.net.CCRxNetManager;
43
import com.codingcoderscode.evolving.net.cache.mode.CCCMode;
54
import com.codingcoderscode.evolving.net.request.api.CCNetApiService;
65
import com.codingcoderscode.evolving.net.request.base.CCRequest;
7-
import com.codingcoderscode.evolving.net.request.callback.CCNetCallback;
6+
import com.codingcoderscode.evolving.net.request.callback.CCNetResultListener;
87
import com.codingcoderscode.evolving.net.request.canceler.CCCanceler;
98
import com.codingcoderscode.evolving.net.request.comparator.CCDownloadTaskComparator;
109
import com.codingcoderscode.evolving.net.request.entity.CCDownloadTask;
@@ -52,7 +51,7 @@ public class CCMultiDownladRequest<T> extends CCRequest<T, CCMultiDownladRequest
5251
//已经存在的任务数量
5352
private AtomicInteger existTaskCount;
5453
//下载状态回调
55-
private CCNetCallback ccNetCallback;
54+
private CCNetResultListener CCNetResultListener;
5655
//最大重试次数
5756
private final int DEFAULT_RETRY_COUNT = 3;
5857

@@ -152,8 +151,8 @@ private void onCreateAndStartTask() throws Exception {
152151

153152
NoEnoughSpaceException noEnoughSpaceException = new NoEnoughSpaceException("write failed: ENOSPC (No space left on device)");
154153

155-
if (ccNetCallback != null) {
156-
ccNetCallback.onRequestFail(toDownloadTask, noEnoughSpaceException);
154+
if (CCNetResultListener != null) {
155+
CCNetResultListener.onRequestFail(toDownloadTask, noEnoughSpaceException);
157156
}
158157

159158
return;
@@ -209,8 +208,8 @@ private void onCreateAndStartTask() throws Exception {
209208

210209
this.existTaskCount.getAndDecrement();
211210

212-
if (ccNetCallback != null) {
213-
ccNetCallback.onRequestFail(toDownloadTask, e);
211+
if (CCNetResultListener != null) {
212+
CCNetResultListener.onRequestFail(toDownloadTask, e);
214213
}
215214

216215
}
@@ -477,7 +476,7 @@ public int getCacheSaveMode() {
477476
return CCCMode.SaveMode.MODE_NONE;
478477
}
479478

480-
private static class MultiDownloadNetCallback<M> extends CCNetCallback {
479+
private static class MultiDownloadNetCallback<M> implements CCNetResultListener {
481480

482481
private CCMultiDownladRequest<M> multiDownladRequest;
483482

@@ -487,7 +486,27 @@ public MultiDownloadNetCallback(CCMultiDownladRequest<M> multiDownladRequest) {
487486

488487
@Override
489488
public <T> void onStartRequest(Object reqTag, CCCanceler canceler) {
490-
multiDownladRequest.ccNetCallback.onStartRequest(reqTag, canceler);
489+
multiDownladRequest.CCNetResultListener.onStartRequest(reqTag, canceler);
490+
}
491+
492+
@Override
493+
public <T> void onDiskCacheQuerySuccess(Object reqTag, T response) {
494+
495+
}
496+
497+
@Override
498+
public <T> void onDiskCacheQueryFail(Object reqTag, Throwable t) {
499+
500+
}
501+
502+
@Override
503+
public <T> void onNetSuccess(Object reqTag, T response) {
504+
505+
}
506+
507+
@Override
508+
public <T> void onNetFail(Object reqTag, Throwable t) {
509+
491510
}
492511

493512
@Override
@@ -498,8 +517,8 @@ public <T> void onRequestSuccess(Object reqTag, T response, int dataSourceMode)
498517
multiDownladRequest.existTaskCount.getAndDecrement();
499518
}
500519

501-
if (multiDownladRequest.ccNetCallback != null) {
502-
multiDownladRequest.ccNetCallback.onRequestSuccess(reqTag, response, dataSourceMode);
520+
if (multiDownladRequest.CCNetResultListener != null) {
521+
multiDownladRequest.CCNetResultListener.onRequestSuccess(reqTag, response, dataSourceMode);
503522
}
504523
}
505524

@@ -517,41 +536,46 @@ public <T> void onRequestFail(Object reqTag, Throwable t) {
517536
multiDownladRequest.existTaskCount.getAndDecrement();
518537
}
519538

520-
if (multiDownladRequest.ccNetCallback != null) {
521-
multiDownladRequest.ccNetCallback.onRequestFail(reqTag, t);
539+
if (multiDownladRequest.CCNetResultListener != null) {
540+
multiDownladRequest.CCNetResultListener.onRequestFail(reqTag, t);
522541
}
523542
}
524543

525544
@Override
526545
public <T> void onRequestComplete(Object reqTag) {
527-
if (multiDownladRequest.ccNetCallback != null) {
528-
multiDownladRequest.ccNetCallback.onRequestComplete(reqTag);
546+
if (multiDownladRequest.CCNetResultListener != null) {
547+
multiDownladRequest.CCNetResultListener.onRequestComplete(reqTag);
529548
}
530549
}
531550

532551
@Override
533552
public <T> void onProgress(Object reqTag, int progress, long netSpeed, long completedSize, long fileSize) {
534-
if (multiDownladRequest.ccNetCallback != null) {
535-
multiDownladRequest.ccNetCallback.onProgress(reqTag, progress, netSpeed, completedSize, fileSize);
553+
if (multiDownladRequest.CCNetResultListener != null) {
554+
multiDownladRequest.CCNetResultListener.onProgress(reqTag, progress, netSpeed, completedSize, fileSize);
536555
}
537556
}
538557

539558
@Override
540559
public <T> void onProgressSave(Object reqTag, int progress, long netSpeed, long completedSize, long fileSize) {
541-
if (multiDownladRequest.ccNetCallback != null) {
542-
multiDownladRequest.ccNetCallback.onProgressSave(reqTag, progress, netSpeed, completedSize, fileSize);
560+
if (multiDownladRequest.CCNetResultListener != null) {
561+
multiDownladRequest.CCNetResultListener.onProgressSave(reqTag, progress, netSpeed, completedSize, fileSize);
543562
}
544563
}
564+
565+
@Override
566+
public void onIntervalCallback() {
567+
568+
}
545569
}
546570

547571
@SuppressWarnings("unchecked")
548-
public CCMultiDownladRequest<T> setCCNetCallback(CCNetCallback ccNetCallback) {
549-
this.ccNetCallback = ccNetCallback;
572+
public CCMultiDownladRequest<T> setCCNetCallback(CCNetResultListener CCNetResultListener) {
573+
this.CCNetResultListener = CCNetResultListener;
550574
return this;
551575
}
552576

553-
public CCNetCallback getCcNetCallback() {
554-
return ccNetCallback;
577+
public CCNetResultListener getCCNetResultListener() {
578+
return CCNetResultListener;
555579
}
556580

557581
public int getMaxTaskCount() {

‎EvolvingNet/src/main/java/com/codingcoderscode/evolving/net/request/CCUploadRequest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import android.text.TextUtils;
44

5-
import com.codingcoderscode.evolving.net.CCRxNetManager;
65
import com.codingcoderscode.evolving.net.cache.mode.CCCMode;
76
import com.codingcoderscode.evolving.net.request.api.CCNetApiService;
87
import com.codingcoderscode.evolving.net.request.base.CCRequest;
@@ -43,7 +42,7 @@
4342

4443
public class CCUploadRequest<T> extends CCRequest<T, CCUploadRequest<T>> {
4544

46-
//private CCUploadProgressCallback ccUploadProgressCallback;
45+
//private CCUploadProgressListener ccUploadProgressCallback;
4746

4847
private Map<String, Object> txtParamMap;
4948

@@ -86,7 +85,7 @@ public void subscribe(FlowableEmitter<Call<ResponseBody>> e) throws Exception {
8685

8786
uploadFile = new File(fileValue.getUrl());
8887

89-
requestBody = new CCSimpleUploadRequestBody(entry.getKey(), MediaType.parse(fileValue.getMimeType()), uploadFile, getCcNetCallback());
88+
requestBody = new CCSimpleUploadRequestBody(entry.getKey(), MediaType.parse(fileValue.getMimeType()), uploadFile, getCCNetResultListener());
9089

9190
partBody = MultipartBody.Part.createFormData(entry.getKey(), uploadFile.getName(), requestBody);
9291

0 commit comments

Comments
 (0)