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

重构任务实体，移除任务实体保存数据库的操作

Browse Source
This commit is contained in:
laoyuyu
2019-01-16 22:09:21 +08:00
parent 40c210c751
commit 7f52271ee5
118 changed files with 1397 additions and 1418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/arialyy/simple/DbTestActivity.java
View File

@@ -4,8 +4,8 @@ import android.os.Bundle;
import android.util.Log;
import android.view.View;
import com.arialyy.aria.core.download.DTaskWrapper;
import com.arialyy.aria.core.download.DownloadEntity;
import com.arialyy.aria.core.download.DownloadTaskEntity;
import com.arialyy.aria.core.inf.AbsEntity;
import com.arialyy.aria.orm.DbEntity;
import com.arialyy.simple.base.BaseActivity;
@@ -40,7 +40,7 @@ public class DbTestActivity extends BaseActivity<ActivityDbTestBinding> {
private void searchAll(){
long startT = System.currentTimeMillis();
//List<DownloadTaskEntity> data = DownloadEntity.findRelationData(DownloadEntity.class);
//List<DTaskWrapper> data = DownloadEntity.findRelationData(DownloadEntity.class);
long endT = System.currentTimeMillis();
Log.d(TAG, "search_time=" + (endT - startT));
@@ -58,7 +58,7 @@ public class DbTestActivity extends BaseActivity<ActivityDbTestBinding> {
entity.setFileName("ssssssssssssssssss");
entity.setDownloadPath(key);
DownloadTaskEntity dte = new DownloadTaskEntity();
DTaskWrapper dte = new DTaskWrapper();
dte.setUrl(url);
dte.setKey(key);
dte.setEntity(entity);

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

@@ -25,7 +25,7 @@ import com.arialyy.aria.core.Aria;
import com.arialyy.aria.core.download.DownloadEntity;
import com.arialyy.aria.core.download.DownloadGroupEntity;
import com.arialyy.aria.core.download.DownloadGroupTask;
import com.arialyy.aria.core.download.DownloadGroupTaskEntity;
import com.arialyy.aria.core.download.DGTaskWrapper;
import com.arialyy.frame.util.show.L;
import com.arialyy.frame.util.show.T;
import com.arialyy.simple.R;
@@ -48,7 +48,7 @@ public class DownloadGroupActivity extends BaseActivity<ActivityDownloadGroupBin
Aria.download(this).register();
setTitle("任务组");
mUrls = getModule(GroupModule.class).getUrls();
DownloadGroupTaskEntity entity = Aria.download(this).getGroupTask(mUrls);
DGTaskWrapper entity = Aria.download(this).getGroupTask(mUrls);
if (entity != null && entity.getEntity() != null) {
DownloadGroupEntity groupEntity = entity.getEntity();
mChildList.addData(groupEntity.getSubEntities());
@@ -183,7 +183,7 @@ public class DownloadGroupActivity extends BaseActivity<ActivityDownloadGroupBin
//Log.e(TAG, "gHash = "
// + groupTask.getEntity().getSubEntities().get(0).hashCode()
// + "; subHash = "
// + groupTask.getTaskEntity().getSubTaskEntities().get(0).getEntity().hashCode() +
// + groupTask.getTaskWrapper().getSubTaskEntities().get(0).getEntity().hashCode() +
// "; subHash = " + subEntity.hashCode());
//int percent = subEntity.getPercent();
////如果你打开了速度单位转换配置，将可以通过以下方法获取带单位的下载速度，如：1 mb/s

4
app/src/main/java/com/arialyy/simple/download/group/FTPDirDownloadActivity.java
View File

@@ -23,7 +23,7 @@ import com.arialyy.annotations.DownloadGroup;
import com.arialyy.aria.core.Aria;
import com.arialyy.aria.core.download.DownloadGroupEntity;
import com.arialyy.aria.core.download.DownloadGroupTask;
import com.arialyy.aria.core.download.DownloadGroupTaskEntity;
import com.arialyy.aria.core.download.DGTaskWrapper;
import com.arialyy.frame.util.show.L;
import com.arialyy.frame.util.show.T;
import com.arialyy.simple.R;
@@ -43,7 +43,7 @@ public class FTPDirDownloadActivity extends BaseActivity<ActivityDownloadGroupBi
super.init(savedInstanceState);
Aria.download(this).register();
setTitle("FTP文件夹下载");
DownloadGroupTaskEntity entity = Aria.download(this).getFtpDirTask(dir);
DGTaskWrapper entity = Aria.download(this).getFtpDirTask(dir);
if (entity != null && entity.getEntity() != null) {
DownloadGroupEntity groupEntity = entity.getEntity();
mChildList.addData(groupEntity.getSubEntities());

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

@@ -28,7 +28,7 @@ import com.arialyy.aria.core.Aria;
import com.arialyy.aria.core.download.DownloadEntity;
import com.arialyy.aria.core.download.DownloadGroupEntity;
import com.arialyy.aria.core.inf.AbsEntity;
import com.arialyy.aria.core.inf.AbsTaskEntity;
import com.arialyy.aria.core.inf.AbsTaskWrapper;
import com.arialyy.aria.core.inf.IEntity;
import com.arialyy.aria.util.CommonUtil;
import com.arialyy.simple.R;
@@ -269,18 +269,18 @@ public class DownloadAdapter extends AbsRVAdapter<AbsEntity, DownloadAdapter.Sim
private void cancel(AbsEntity entity) {
switch (entity.getTaskType()) {
case AbsTaskEntity.D_FTP:
case AbsTaskWrapper.D_FTP:
Aria.download(getContext())
.loadFtp((DownloadEntity) entity)
//.login("lao", "123456")
.cancel(true);
break;
case AbsTaskEntity.D_FTP_DIR:
case AbsTaskWrapper.D_FTP_DIR:
break;
case AbsTaskEntity.D_HTTP:
case AbsTaskWrapper.D_HTTP:
Aria.download(getContext()).load((DownloadEntity) entity).cancel(true);
break;
case AbsTaskEntity.DG_HTTP:
case AbsTaskWrapper.DG_HTTP:
Aria.download(getContext()).load((DownloadGroupEntity) entity).cancel(true);
break;
}
@@ -288,16 +288,16 @@ public class DownloadAdapter extends AbsRVAdapter<AbsEntity, DownloadAdapter.Sim
private void start(AbsEntity entity) {
switch (entity.getTaskType()) {
case AbsTaskEntity.D_FTP:
case AbsTaskWrapper.D_FTP:
//Aria.download(getContext()).loadFtp((DownloadEntity) entity).login("lao", "123456").start();
Aria.download(getContext()).loadFtp((DownloadEntity) entity).charSet("GBK").start();
break;
case AbsTaskEntity.D_FTP_DIR:
case AbsTaskWrapper.D_FTP_DIR:
break;
case AbsTaskEntity.D_HTTP:
case AbsTaskWrapper.D_HTTP:
Aria.download(getContext()).load((DownloadEntity) entity).start();
break;
case AbsTaskEntity.DG_HTTP:
case AbsTaskWrapper.DG_HTTP:
Aria.download(getContext()).loadGroup((DownloadGroupEntity) entity).start();
break;
}
@@ -305,16 +305,16 @@ public class DownloadAdapter extends AbsRVAdapter<AbsEntity, DownloadAdapter.Sim
private void stop(AbsEntity entity) {
switch (entity.getTaskType()) {
case AbsTaskEntity.D_FTP:
case AbsTaskWrapper.D_FTP:
//Aria.download(getContext()).loadFtp((DownloadEntity) entity).login("lao", "123456").stop();
Aria.download(getContext()).loadFtp((DownloadEntity) entity).charSet("GBK").stop();
break;
case AbsTaskEntity.D_FTP_DIR:
case AbsTaskWrapper.D_FTP_DIR:
break;
case AbsTaskEntity.D_HTTP:
case AbsTaskWrapper.D_HTTP:
Aria.download(getContext()).load((DownloadEntity) entity).stop();
break;
case AbsTaskEntity.DG_HTTP:
case AbsTaskWrapper.DG_HTTP:
Aria.download(getContext()).loadGroup((DownloadGroupEntity) entity).stop();
break;
}

8
app/src/main/java/com/arialyy/simple/test/AnyRunActivity.java
View File

@@ -1,17 +1,13 @@
package com.arialyy.simple.test;
import android.os.Bundle;
import android.os.Environment;
import android.util.Log;
import android.view.View;
import com.arialyy.aria.core.Aria;
import com.arialyy.aria.core.download.DownloadEntity;
import com.arialyy.aria.core.download.DownloadTaskEntity;
import com.arialyy.aria.util.ALog;
import com.arialyy.aria.core.download.DTaskWrapper;
import com.arialyy.simple.R;
import com.arialyy.simple.base.BaseActivity;
import com.arialyy.simple.databinding.ActivityTestBinding;
import java.util.List;
/**
* Created by laoyuyu on 2018/4/13.
@@ -46,7 +42,7 @@ public class AnyRunActivity extends BaseActivity<ActivityTestBinding> {
mBar.setVisibility(View.GONE);
module = new AnyRunnModule(this);
urls = getResources().getStringArray(R.array.group_urls);
DownloadTaskEntity entity = Aria.download(this).getDownloadTask(URL);
DTaskWrapper entity = Aria.download(this).getDownloadTask(URL);
Log.d(TAG, entity + "");
}