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

3.3.6

Browse Source
This commit is contained in:
AriaLyy
2017-11-07 22:08:24 +08:00
parent 018b623830 c21574f3fa
commit ec1b504309
29 changed files with 185 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/arialyy/simple/download/FtpDownloadActivity.java
View File

@@ -38,8 +38,8 @@ public class FtpDownloadActivity extends BaseActivity<ActivityFtpDownloadBinding
//private final String URL = "ftp://192.168.1.9:21/下载/AriaPrj.zip";
//private final String URL = "ftp://192.168.1.9:21/下载/[电影天堂www.dy2018.com]赛车总动员3BD中英双字.mp4";
//private final String URL = "ftp://h:h@tv.dl1234.com:2199/付岩洞复仇者们05.mkv";
//private final String URL = "ftp://z:z@dygod18.com:21211/[电影天堂www.dy2018.com]xd联盟HD高清国粤双语中字.mkv";
private final String URL = "ftp://172.18.104.71:21/upload/AS.zip";
private final String URL = "ftp://z:z@dygod18.com:21211/[电影天堂www.dy2018.com]英格丽向西行BD中英双字.mp4";
//private final String URL = "ftp://172.18.104.71:21/upload/AS.zip";
@Override protected void init(Bundle savedInstanceState) {
super.init(savedInstanceState);
@@ -60,9 +60,8 @@ public class FtpDownloadActivity extends BaseActivity<ActivityFtpDownloadBinding
public void onClick(View view) {
switch (view.getId()) {
case R.id.start:
Aria.download(this).loadFtp(URL, true)
//.charSet("GBK")
.login("lao", "123456")
Aria.download(this).loadFtp(URL, true).charSet("gbk")
//.login("lao", "123456")
.setDownloadPath("/mnt/sdcard/").start();
break;
case R.id.stop:

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

@@ -28,6 +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.IEntity;
import com.arialyy.aria.util.CommonUtil;
import com.arialyy.simple.R;
@@ -206,11 +207,7 @@ public class DownloadAdapter extends AbsRVAdapter<AbsEntity, DownloadAdapter.Sim
@Override public void onClick(View v) {
mData.remove(entity);
notifyDataSetChanged();
if (isSimpleDownload(entity)) {
Aria.download(getContext()).load((DownloadEntity) entity).cancel(true);
} else {
Aria.download(getContext()).load((DownloadGroupEntity) entity).cancel(true);
}
cancel(entity);
}
});
//if (holder instanceof GroupHolder){
@@ -267,21 +264,58 @@ public class DownloadAdapter extends AbsRVAdapter<AbsEntity, DownloadAdapter.Sim
break;
}
}
}
private void start(AbsEntity entity) {
if (isSimpleDownload(entity)) {
Aria.download(getContext()).load((DownloadEntity) entity).start();
} else {
Aria.download(getContext()).load((DownloadGroupEntity) entity).start();
}
private void cancel(AbsEntity entity) {
switch (entity.getTaskType()) {
case AbsTaskEntity.D_FTP:
Aria.download(getContext())
.loadFtp((DownloadEntity) entity)
//.login("lao", "123456")
.cancel(true);
break;
case AbsTaskEntity.D_FTP_DIR:
break;
case AbsTaskEntity.D_HTTP:
Aria.download(getContext()).load((DownloadEntity) entity).cancel(true);
break;
case AbsTaskEntity.DG_HTTP:
Aria.download(getContext()).load((DownloadGroupEntity) entity).cancel(true);
break;
}
}
private void stop(AbsEntity entity) {
if (isSimpleDownload(entity)) {
private void start(AbsEntity entity) {
switch (entity.getTaskType()) {
case AbsTaskEntity.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:
break;
case AbsTaskEntity.D_HTTP:
Aria.download(getContext()).load((DownloadEntity) entity).start();
break;
case AbsTaskEntity.DG_HTTP:
Aria.download(getContext()).load((DownloadGroupEntity) entity).start();
break;
}
}
private void stop(AbsEntity entity) {
switch (entity.getTaskType()) {
case AbsTaskEntity.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:
break;
case AbsTaskEntity.D_HTTP:
Aria.download(getContext()).load((DownloadEntity) entity).stop();
} else {
break;
case AbsTaskEntity.DG_HTTP:
Aria.download(getContext()).load((DownloadGroupEntity) entity).stop();
}
break;
}
}

4
app/src/main/java/com/arialyy/simple/upload/FtpUploadActivity.java
View File

@@ -35,10 +35,10 @@ import com.arialyy.simple.databinding.ActivityFtpUploadBinding;
*/
public class FtpUploadActivity extends BaseActivity<ActivityFtpUploadBinding> {
private final String FILE_PATH = "/mnt/sdcard/Download/me.jpg";
private final String URL = "ftp://172.18.104.49:21/upload/测试";
private final String URL = "ftp://172.18.104.65:21/upload/测试";
@Override protected void init(Bundle savedInstanceState) {
setTile("FTP 文件上传");
setTile("D_FTP 文件上传");
super.init(savedInstanceState);
Aria.upload(this).register();
UploadEntity entity = Aria.upload(this).getUploadEntity(FILE_PATH);

2
app/src/main/java/com/arialyy/simple/upload/HttpUploadActivity.java
View File

@@ -42,7 +42,7 @@ public class HttpUploadActivity extends BaseActivity<ActivityUploadBinding> {
}
@Override protected void init(Bundle savedInstanceState) {
setTile("HTTP 上传");
setTile("D_HTTP 上传");
super.init(savedInstanceState);
Aria.upload(this).register();
}