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

3.7.6

Browse Source
This commit is contained in:
laoyuyu
2019-11-19 20:03:25 +08:00
parent 846e6c0720
commit 1b54bfc4ac
15 changed files with 202 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,13 +95,13 @@ public class DownloadGroupActivity extends BaseActivity<ActivityDownloadGroupBin
mTaskId = Aria.download(this)
.loadGroup(mUrls)
.setDirPath(
Environment.getExternalStorageDirectory().getPath() + "/Download/group_test_2")
.setGroupAlias("任务组测试")
Environment.getExternalStorageDirectory().getPath() + "/Download/group_imgs")
.setGroupAlias("图片测试")
//.setSubFileName(getModule(GroupModule.class).getSubName2())
.setSubFileName(getModule(GroupModule.class).getSubName())
//.setSubFileName(getModule(GroupModule.class).getSubName())
.unknownSize()
.option(getHttpOption())
.setFileSize(114981416)
//.setFileSize(114981416)
//.updateUrls(temp)
.create();
getBinding().setStateStr(getString(R.string.stop));

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

@@ -32,8 +32,10 @@ public class GroupModule extends BaseModule {
public List<String> getUrls() {
List<String> urls = new ArrayList<>();
String[] str = getContext().getResources().getStringArray(R.array.group_urls_1);
Collections.addAll(urls, str);
urls.add("https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1574141924275&di=a7ea1497a4a2528a45ce7103bf61adf4&imgtype=0&src=http%3A%2F%2Fg.hiphotos.baidu.com%2Fimage%2Fpic%2Fitem%2Fc2cec3fdfc03924590b2a9b58d94a4c27d1e2500.jpg");
urls.add("https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1574141924272&di=7861479e7cb3cea98d585eaf108f056f&imgtype=0&src=http%3A%2F%2Fd.hiphotos.baidu.com%2Fimage%2Fpic%2Fitem%2F562c11dfa9ec8a13c0741f5afd03918fa0ecc01a.jpg");
//String[] str = getContext().getResources().getStringArray(R.array.group_urls_1);
//Collections.addAll(urls, str);
return urls;
}

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

@@ -28,6 +28,8 @@ import com.arialyy.annotations.Upload;
import com.arialyy.aria.core.Aria;
import com.arialyy.aria.core.common.FtpOption;
import com.arialyy.aria.core.inf.IEntity;
import com.arialyy.aria.core.processor.FtpInterceptHandler;
import com.arialyy.aria.core.processor.IFtpUploadInterceptor;
import com.arialyy.aria.core.task.UploadTask;
import com.arialyy.aria.core.upload.UploadEntity;
import com.arialyy.aria.util.ALog;
@@ -114,26 +116,27 @@ public class FtpUploadActivity extends BaseActivity<ActivityFtpUploadBinding> {
public void onClick(View view) {
switch (view.getId()) {
case R.id.start:
//if (mTaskId == -1) {
// mTaskId = Aria.upload(this)
// .loadFtp(mFilePath)
// .setUploadUrl(mUrl)
// .option(getOption())
// .create();
// getBinding().setStateStr(getString(R.string.stop));
// break;
//}
//if (Aria.upload(this).loadFtp(mTaskId).isRunning()) {
// Aria.upload(this).loadFtp(mTaskId).stop();
// getBinding().setStateStr(getString(R.string.resume));
//} else {
// Aria.upload(this)
// .loadFtp(mTaskId)
// .option(getOption())
// .resume();
// getBinding().setStateStr(getString(R.string.stop));
//}
upload();
if (mTaskId == -1) {
mTaskId = Aria.upload(this)
.loadFtp(mFilePath)
.setUploadUrl(mUrl)
.option(getOption())
.forceUpload()
.create();
getBinding().setStateStr(getString(R.string.stop));
break;
}
if (Aria.upload(this).loadFtp(mTaskId).isRunning()) {
Aria.upload(this).loadFtp(mTaskId).stop();
getBinding().setStateStr(getString(R.string.resume));
} else {
Aria.upload(this)
.loadFtp(mTaskId)
.option(getOption())
.resume();
getBinding().setStateStr(getString(R.string.stop));
}
//upload();
break;
case R.id.cancel:
Aria.upload(this).loadFtp(mTaskId).cancel();
@@ -168,6 +171,7 @@ public class FtpUploadActivity extends BaseActivity<ActivityFtpUploadBinding> {
private FtpOption getOption() {
FtpOption option = new FtpOption();
option.login(user, pwd);
option.setUploadInterceptor(new FtpUploadInterceptor());
return option;
}
@@ -236,4 +240,13 @@ public class FtpUploadActivity extends BaseActivity<ActivityFtpUploadBinding> {
}
}
}
private static class FtpUploadInterceptor implements IFtpUploadInterceptor {
@Override public FtpInterceptHandler onIntercept(UploadEntity entity, List<String> fileList) {
FtpInterceptHandler.Builder builder = new FtpInterceptHandler.Builder();
//builder.coverServerFile(); // 覆盖远端同名文件
builder.resetFileName("test.zip"); //修改上传到远端服务器的文件名
return builder.build();
}
}
}

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

@@ -37,7 +37,7 @@ public class UploadModule extends BaseViewModule {
LiveData<UploadEntity> getFtpInfo(Context context) {
String url = AppUtil.getConfigValue(context, FTP_URL_KEY, "ftp://9.9.9.50:2121/aa/你好");
String filePath = AppUtil.getConfigValue(context, FTP_PATH_KEY,
Environment.getExternalStorageDirectory().getPath() + "/Download/PaNTFS15562.zip");
Environment.getExternalStorageDirectory().getPath() + "/Download/Folx P58.zip");
UploadEntity entity = Aria.upload(context).getFirstUploadEntity(filePath);
if (entity != null) {