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

Merge branch 'master' of github.com:AriaLyy/Aria

Browse Source
This commit is contained in:
laoyuyu
2020-05-16 16:19:18 +08:00
parent dcde3f07b8 b109726c7c
commit e64f3b1240
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
PublicComponent/src/main/java/com/arialyy/aria/core/loader/GroupSubThreadStateManager.java
View File

@@ -22,6 +22,8 @@ import android.os.Message;
import com.arialyy.aria.core.TaskRecord; import com.arialyy.aria.core.TaskRecord;
import com.arialyy.aria.core.inf.IThreadStateManager; import com.arialyy.aria.core.inf.IThreadStateManager;
import com.arialyy.aria.core.listener.IEventListener;
import com.arialyy.aria.exception.AriaException;
import com.arialyy.aria.util.ALog; import com.arialyy.aria.util.ALog;
import com.arialyy.aria.util.CommonUtil; import com.arialyy.aria.util.CommonUtil;
import com.arialyy.aria.util.FileUtil; import com.arialyy.aria.util.FileUtil;
@@ -53,7 +55,7 @@ public class GroupSubThreadStateManager implements IThreadStateManager {
/** /**
* @param handler 任务事件 * @param handler 任务事件
*/ */
public GroupSubThreadStateManager(Handler handler, String key) { public GroupSubThreadStateManager(Handler handler,String key) {
mHandler = handler; mHandler = handler;
mKey = key; mKey = key;
} }
@@ -101,7 +103,7 @@ public class GroupSubThreadStateManager implements IThreadStateManager {
(AriaException) b.getSerializable(DATA_ERROR_INFO));*/ (AriaException) b.getSerializable(DATA_ERROR_INFO));*/
quitLooper(); quitLooper();
} }
sendMessageFromMsg(msg); //sendMessageFromMsg(msg);
break; break;
case STATE_COMPLETE: case STATE_COMPLETE:
mCompleteNum.getAndIncrement(); mCompleteNum.getAndIncrement();
@@ -131,6 +133,9 @@ public class GroupSubThreadStateManager implements IThreadStateManager {
//mListener.onComplete(); //mListener.onComplete();
} }
quitLooper(); quitLooper();
}else if (isFail()) {
sendMessageFromMsg(msg);
quitLooper();
} }
break; break;
case STATE_RUNNING: case STATE_RUNNING:
@@ -210,7 +215,7 @@ public class GroupSubThreadStateManager implements IThreadStateManager {
// String.format("isFail; stopNum: %s, cancelNum: %s, failNum: %s, completeNum: %s", mStopNum, // String.format("isFail; stopNum: %s, cancelNum: %s, failNum: %s, completeNum: %s", mStopNum,
// mCancelNum, mFailNum, mCompleteNum)); // mCancelNum, mFailNum, mCompleteNum));
return mCompleteNum.get() != mThreadNum return mCompleteNum.get() != mThreadNum
&& (mFailNum.get() == mThreadNum || mFailNum.get() + mCompleteNum.get() == mThreadNum); && (mFailNum.get() == mThreadNum || mFailNum.get() + mCompleteNum.get() == mThreadNum);
} }
/** /**
@@ -292,7 +297,7 @@ public class GroupSubThreadStateManager implements IThreadStateManager {
File targetFile = new File(mTaskRecord.filePath); File targetFile = new File(mTaskRecord.filePath);
if (targetFile.exists() && targetFile.length() > mTaskRecord.fileLength) { if (targetFile.exists() && targetFile.length() > mTaskRecord.fileLength) {
ALog.e(TAG, String.format("任务【%s】分块文件合并失败，下载长度超出文件真实长度，downloadLen: %s，fileSize: %s", ALog.e(TAG, String.format("任务【%s】分块文件合并失败，下载长度超出文件真实长度，downloadLen: %s，fileSize: %s",
targetFile.getName(), targetFile.length(), mTaskRecord.fileLength)); targetFile.getName(), targetFile.length(), mTaskRecord.fileLength));
return false; return false;
} }
return true; return true;