添加没有网络也会重试的开关;修复多次删除记录的bug

This commit is contained in:
laoyuyu
2018-05-14 20:57:08 +08:00
parent 2d133901de
commit c7fb5f2633
27 changed files with 211 additions and 91 deletions

View File

@@ -192,6 +192,12 @@ class Configuration {
* 通用任务配置
*/
abstract static class BaseTaskConfig extends BaseConfig {
/**
* 设置写文件buff大小该数值大小不能小于2048数值变小下载速度会变慢
*/
int buffSize = 8192;
/**
* 进度刷新间隔默认1秒
*/
@@ -231,6 +237,16 @@ class Configuration {
*/
String queueMod = "wait";
/**
* 断网的时候是否重试,{@code true}断网也重试;{@code false}断网不重试,直接走失败的回调
*/
boolean notNetRetry = false;
/**
* 设置IO流读取时间单位为毫秒默认20000毫秒该时间不能少于10000毫秒
*/
int iOTimeOut = 20 * 1000;
public long getUpdateInterval() {
return updateInterval;
}
@@ -303,20 +319,43 @@ class Configuration {
saveKey("connectTimeOut", String.valueOf(connectTimeOut));
return this;
}
public boolean isNotNetRetry() {
return notNetRetry;
}
public BaseTaskConfig setNotNetRetry(boolean notNetRetry) {
this.notNetRetry = notNetRetry;
saveKey("notNetRetry", String.valueOf(notNetRetry));
return this;
}
public int getIOTimeOut() {
return iOTimeOut;
}
public BaseTaskConfig setIOTimeOut(int iOTimeOut) {
this.iOTimeOut = iOTimeOut;
saveKey("iOTimeOut", String.valueOf(iOTimeOut));
return this;
}
public int getBuffSize() {
return buffSize;
}
public BaseTaskConfig setBuffSize(int buffSize) {
this.buffSize = buffSize;
saveKey("buffSize", String.valueOf(buffSize));
return this;
}
}
/**
* 下载配置
*/
public static class DownloadConfig extends BaseTaskConfig {
/**
* 设置IO流读取时间单位为毫秒默认20000毫秒该时间不能少于10000毫秒
*/
int iOTimeOut = 20 * 1000;
/**
* 设置写文件buff大小该数值大小不能小于2048数值变小下载速度会变慢
*/
int buffSize = 8192;
/**
* 设置https ca 证书信息path 为assets目录下的CA证书完整路径
*/
@@ -343,10 +382,6 @@ class Configuration {
return this;
}
public int getIOTimeOut() {
return iOTimeOut;
}
public int getMaxSpeed() {
return maxSpeed;
}
@@ -363,22 +398,6 @@ class Configuration {
saveKey("threadNum", String.valueOf(threadNum));
}
public DownloadConfig setIOTimeOut(int iOTimeOut) {
this.iOTimeOut = iOTimeOut;
saveKey("iOTimeOut", String.valueOf(iOTimeOut));
return this;
}
public int getBuffSize() {
return buffSize;
}
public DownloadConfig setBuffSize(int buffSize) {
this.buffSize = buffSize;
saveKey("buffSize", String.valueOf(buffSize));
return this;
}
public String getCaPath() {
return caPath;
}

View File

@@ -68,10 +68,11 @@ public class UploadTask extends AbsNormalTask<UploadTaskEntity> {
}
@Override public void cancel() {
if (!mUtil.isRunning()) {
if (mUtil.isRunning()) {
mUtil.cancel();
} else {
mListener.onCancel();
}
mUtil.cancel();
}
@Override public String getTaskName() {