tt/Aria
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug https://github.com/AriaLyy/Aria/issues/695

Browse Source
This commit is contained in:
laoyuyu
2020-06-26 15:53:28 +08:00
parent 9a174311d9
commit 023f648d07
10 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
PublicComponent/src/main/java/com/arialyy/aria/core/loader/SubLoader.java
View File

@@ -106,7 +106,7 @@ public final class SubLoader implements ILoader, ILoaderVisitor {
}
record = recordHandler.getRecord(wrapper.getEntity().getFileSize());
if (record == null){
if (record == null) {
ALog.d(TAG, "子任务记录为空");
sendFailState(false);
return;
@@ -168,9 +168,9 @@ public final class SubLoader implements ILoader, ILoaderVisitor {
for (IThreadTask iThreadTask : mTask) {
iThreadTask.call();
}
} else {
ALog.e(TAG, "子任务的线程任务为空");
return;
}
ALog.e(TAG, "子任务的线程任务为空");
} catch (Exception e) {
e.printStackTrace();
}
@@ -263,9 +263,9 @@ public final class SubLoader implements ILoader, ILoaderVisitor {
}
if (needGetInfo) {
infoTask.run();
} else {
handlerTask();
return;
}
handlerTask();
}
/**

34
PublicComponent/src/main/java/com/arialyy/aria/core/task/ThreadTask.java
View File

@@ -402,16 +402,18 @@ public class ThreadTask implements IThreadTask, IThreadTaskObserver {
if (mTaskWrapper.getRequestType() == ITaskWrapper.M3U8_VOD) {
writeConfig(false, 0);
retryM3U8Peer(needRetry);
} else {
if (mTaskWrapper.isSupportBP()) {
writeConfig(false, subCurrentLocation);
retryBlockTask(needRetry && mConfig.startThreadNum != 1);
} else {
ALog.e(TAG, String.format("任务【%s】执行失败", getFileName()));
ErrorHelp.saveError("", ALog.getExceptionString(ex));
sendFailMsg(null, needRetry);
}
return;
}
if (mTaskWrapper.isSupportBP()) {
writeConfig(false, subCurrentLocation);
retryBlockTask(needRetry);
return;
}
ALog.e(TAG, String.format("任务【%s】执行失败", getFileName()));
ErrorHelp.saveError("", ALog.getExceptionString(ex));
sendFailMsg(null, needRetry);
}
/**
@@ -432,9 +434,9 @@ public class ThreadTask implements IThreadTask, IThreadTaskObserver {
FileUtil.deleteFile(mConfig.tempFile);
FileUtil.createFile(mConfig.tempFile);
ThreadTaskManager.getInstance().retryThread(this);
} else {
sendFailMsg(null, false);
return;
}
sendFailMsg(null, false);
}
/**
@@ -454,10 +456,10 @@ public class ThreadTask implements IThreadTask, IThreadTaskObserver {
mFailTimes++;
handleBlockRecord();
ThreadTaskManager.getInstance().retryThread(this);
} else {
ALog.e(TAG, String.format("任务【%s】执行失败", getFileName()));
sendFailMsg(null, needRetry);
return;
}
ALog.e(TAG, String.format("任务【%s】执行失败", getFileName()));
sendFailMsg(null, needRetry);
}
/**
@@ -509,10 +511,8 @@ public class ThreadTask implements IThreadTask, IThreadTaskObserver {
b.putBoolean(IThreadStateManager.DATA_RETRY, needRetry);
if (e != null) {
b.putSerializable(IThreadStateManager.DATA_ERROR_INFO, e);
updateState(IThreadStateManager.STATE_FAIL, b);
} else {
updateState(IThreadStateManager.STATE_FAIL, b);
}
updateState(IThreadStateManager.STATE_FAIL, b);
}
/**