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

任务组bug修复，修复子任务下载完成后重新下载的问题

Browse Source
This commit is contained in:
AriaLyy
2017-07-18 16:18:15 +08:00
parent b8a86890a7
commit 489f44c0f9
27 changed files with 226 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/arialyy/simple/download/group/DownloadGroupActivity.java
View File

@@ -30,6 +30,7 @@ import com.arialyy.frame.util.show.T;
import com.arialyy.simple.R;
import com.arialyy.simple.base.BaseActivity;
import com.arialyy.simple.databinding.ActivityDownloadGroupBinding;
import com.arialyy.simple.widget.SubStateLinearLayout;
import java.util.List;
/**
@@ -40,6 +41,7 @@ public class DownloadGroupActivity extends BaseActivity<ActivityDownloadGroupBin
@Bind(R.id.start) Button mStart;
@Bind(R.id.stop) Button mStop;
@Bind(R.id.cancel) Button mCancel;
@Bind(R.id.child_list) SubStateLinearLayout mChildList;
List<String> mUrls;
@Override protected void init(Bundle savedInstanceState) {
@@ -50,6 +52,7 @@ public class DownloadGroupActivity extends BaseActivity<ActivityDownloadGroupBin
DownloadGroupTaskEntity entity = Aria.download(this).getDownloadGroupTask(mUrls);
if (entity != null && entity.getEntity() != null) {
DownloadGroupEntity groupEntity = entity.getEntity();
mChildList.addData(groupEntity.getSubTask());
getBinding().setFileSize(groupEntity.getConvertFileSize());
if (groupEntity.getFileSize() == 0) {
getBinding().setProgress(0);
@@ -69,7 +72,8 @@ public class DownloadGroupActivity extends BaseActivity<ActivityDownloadGroupBin
case R.id.start:
Aria.download(this)
.load(mUrls)
.setDownloadDirPath(Environment.getExternalStorageDirectory().getPath() + "/Download/group_test_3")
.setDownloadDirPath(
Environment.getExternalStorageDirectory().getPath() + "/Download/group_test_3")
.setGroupAlias("任务组测试")
.setSubTaskFileName(getModule(GroupModule.class).getSubName())
.start();
@@ -99,6 +103,7 @@ public class DownloadGroupActivity extends BaseActivity<ActivityDownloadGroupBin
@DownloadGroup.onTaskRunning() protected void running(DownloadGroupTask task) {
getBinding().setProgress(task.getPercent());
getBinding().setSpeed(task.getConvertSpeed());
mChildList.updateChildProgress(task.getEntity().getSubTask());
}
@DownloadGroup.onTaskResume() void taskResume(DownloadGroupTask task) {

20
app/src/main/java/com/arialyy/simple/download/multi_download/DownloadAdapter.java
View File

@@ -21,7 +21,6 @@ import android.content.Context;
import android.content.res.Resources;
import android.view.View;
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.TextView;
import butterknife.Bind;
import com.arialyy.aria.core.Aria;
@@ -34,7 +33,7 @@ import com.arialyy.simple.R;
import com.arialyy.simple.base.adapter.AbsHolder;
import com.arialyy.simple.base.adapter.AbsRVAdapter;
import com.arialyy.simple.widget.HorizontalProgressBarWithNumber;
import com.arialyy.simple.widget.NoScrollListView;
import com.arialyy.simple.widget.SubStateLinearLayout;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -156,6 +155,9 @@ public class DownloadAdapter extends AbsRVAdapter<AbsEntity, DownloadAdapter.Sim
holder.speed.setText(entity.getConvertSpeed());
holder.fileSize.setText(covertCurrentSize(progress) + "/" + CommonUtil.formatFileSize(size));
holder.progress.setProgress(current);
//if (holder instanceof GroupHolder){
// handleSubChild((GroupHolder) holder, entity);
//}
}
@SuppressLint("SetTextI18n")
@@ -209,11 +211,17 @@ public class DownloadAdapter extends AbsRVAdapter<AbsEntity, DownloadAdapter.Sim
}
}
});
//if (holder instanceof GroupHolder){
// handleSubChild((GroupHolder) holder, entity);
//}
}
private void handleSubChild(GroupHolder holder, final AbsEntity entity){
if (holder.childList.getVisibility() == View.GONE) return;
private void handleSubChild(GroupHolder holder, final AbsEntity entity) {
if (holder.childList.getSubData().size() > 0){
holder.childList.updateChildProgress(((DownloadGroupEntity)entity).getSubTask());
}else {
holder.childList.addData(((DownloadGroupEntity)entity).getSubTask());
}
}
private boolean isSimpleDownload(AbsEntity entity) {
@@ -287,7 +295,7 @@ public class DownloadAdapter extends AbsRVAdapter<AbsEntity, DownloadAdapter.Sim
}
class GroupHolder extends SimpleHolder {
@Bind(R.id.child_list) LinearLayout childList;
@Bind(R.id.child_list) SubStateLinearLayout childList;
GroupHolder(View itemView) {
super(itemView);