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

修复普通下载任务、组合任务共享执行队列、缓存池的问题

Browse Source 
修复组合任务启动失败时，`DownloadGroupEntity`的状态变为执行中的问题
fix bug https://github.com/AriaLyy/Aria/issues/441
This commit is contained in:
laoyuyu
2019-08-05 19:29:32 +08:00
parent 1fb9f13dae
commit 558c9e1223
18 changed files with 164 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/assets/aria_config.xml
View File

@@ -113,7 +113,7 @@
<dGroup>
<!--组合任务下载队列最大任务数， 默认为2-->
<maxTaskNum value="1"/>
<maxTaskNum value="2"/>
<!--设置下载失败，重试次数，默认为10-->
<reTryNum value="1"/>
@@ -131,7 +131,7 @@
<!-- =============================以下为子任务的配置====================================-->
<!--能同时下载的子任务最大任务数，默认3-->
<subMaxTaskNum value="1"/>
<subMaxTaskNum value="5"/>
<!--子任务下载失败时的重试次数，默认为5-->
<subReTryNum value="5"/>

8
app/src/main/java/com/arialyy/simple/core/download/multi_download/MultiDownloadActivity.java
View File

@@ -76,7 +76,7 @@ public class MultiDownloadActivity extends BaseActivity<ActivityMultiDownloadBin
Log.d(TAG, task.getTaskName() + ", " + task.getState());
}
@Download.onWait void onWait(DownloadTask task){
@Download.onWait void onWait(DownloadTask task) {
mAdapter.updateState(task.getEntity());
}
@@ -139,8 +139,10 @@ public class MultiDownloadActivity extends BaseActivity<ActivityMultiDownloadBin
}
@DownloadGroup.onTaskFail void groupTaskFail(DownloadGroupTask task) {
ALog.d(TAG, String.format("group【%s】fail", task.getTaskName()));
mAdapter.updateState(task.getEntity());
if (task != null) {
ALog.d(TAG, String.format("group【%s】fail", task.getTaskName()));
mAdapter.updateState(task.getEntity());
}
}
@DownloadGroup.onTaskComplete void groupTaskComplete(DownloadGroupTask task) {

21
app/src/main/res/values/strings.xml
View File

@@ -106,16 +106,13 @@
</string-array>
<string-array name="group_urls">
<!--<item>https://res5.d.cn/5a6a3384c1b2be1a65d84b914e6a6fef697637578b6db2eb1056d50b09cf1dcf289d4045df7ef95746e498e3d6a848ab84c89b77aa60194e2c48e5a7cb748265.apk</item>-->
<!--<item>https://res5.d.cn/5a6a3384c1b2be1a52034c72752e8475414630ebc69318b84ef584115ebf5eaaab945ae07b7fe3596afc72a7940ff328d4a9553f6ae92d6c09ba4bfb533137f6.apk</item>-->
<!--<item>https://res5.d.cn/5a6a3384c1b2be1a426f06bfc69034d69c44ae1a01da180cab8e59bd1a5e1a784bac46ba0c64579d14f0e80a4ce4f068af89b0369a393456f4f449a8829cad5c.apk</item>-->
<item>http://static.gaoshouyou.com/d/12/0d/7f120f50c80d2e7b8c4ba24ece4f9cdd.apk</item>
<!--<item>http://static.ilongyuan.cn/rayark/RayarkFZ_2.0.7.apk</item>-->
<item>https://downs.muzhiwan.com/2019/06/19/com.and.games505.TerrariaPaid5d0a074e451c0.gpk</item>
<item>https://downs.muzhiwan.com/2017/03/28/com.xyzstudio_58da07426e959.apk</item>
</string-array>
<string-array name="group_urls_1">
<item>http://hzdown.muzhiwan.com/2017/05/08/nl.noio.kingdom_59104935e56f0.apk</item>
<item>https://atom-installer.github.com/v1.13.0/AtomSetup.exe1</item>
<!--<item>https://atom-installer.github.com/v1.13.0/AtomSetup.exe1</item>-->
<item>http://hzdown.muzhiwan.com/2017/09/05/com.mir.iphone.empire83jie.mzw_59ae6d5a3638d.apk</item>
</string-array>
@@ -125,8 +122,8 @@
</string-array>
<string-array name="group_urls_3">
<item>http://apk500.bce.baidu-mgame.com/game/883000/883227/20170828102306_oem_5502845.apk?r=1</item>
<item>http://static.gaoshouyou.com/d/92/12/5592a647b8126755647abbe8074fde39.apk</item>
<item>https://downs.muzhiwan.com/2019/07/23/com.amazid.me_5d36bade614d9.apk</item>
<item>https://downs.muzhiwan.com/2019/07/30/com.counter.terrorist.attack.fps.sniper.fight_5d3fe8f0a7edf.apk</item>
</string-array>
<string-array name="group_url4">
@@ -135,8 +132,8 @@
</string-array>
<string-array name="group_names">
<item>王者荣耀.apk</item>
<item>战斗吧剑灵.apk</item>
<item>泰拉瑞亚.apk</item>
<item>疯狂屁股.apk</item>
<!--<item>天魔幻想.apk</item>-->
</string-array>
@@ -151,8 +148,8 @@
</string-array>
<string-array name="group_names_3">
<item>部落冲突.apk</item>
<item>城堡争霸.apk</item>
<item>神奇的绳索英雄.apk</item>
<item>自由火力反击.apk</item>
</string-array>
</resources>