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

修复ftp组件出现的问题

Browse Source
This commit is contained in:
laoyuyu
2019-10-14 20:00:06 +08:00
parent 9f673503c1
commit ce408c0d5c
18 changed files with 122 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,7 @@ public class FtpDownloadActivity extends BaseActivity<ActivityFtpDownloadBinding
private String mUrl, mFilePath;
private FtpDownloadModule mModule;
private long mTaskId;
private String user = "tester", passw = "password";
private String user = "lao", passw = "123456";
@Override protected void init(Bundle savedInstanceState) {
super.init(savedInstanceState);
@@ -96,9 +96,8 @@ public class FtpDownloadActivity extends BaseActivity<ActivityFtpDownloadBinding
mTaskId = Aria.download(this).loadFtp(mUrl)
.setFilePath(mFilePath, true)
.option()
//.login("lao", "123456")
.login(user, passw)
.asFtps()
//.asFtps()
.controller(ControllerType.CREATE_CONTROLLER)
.create();
getBinding().setStateStr(getString(R.string.stop));
@@ -112,8 +111,8 @@ public class FtpDownloadActivity extends BaseActivity<ActivityFtpDownloadBinding
.loadFtp(mTaskId)
.option()
.login(user, passw)
.asFtps()
.setProtocol(ProtocolType.SSL)
//.asFtps()
//.setProtocol(ProtocolType.SSL)
.controller(ControllerType.TASK_CONTROLLER)
.resume();
getBinding().setStateStr(getString(R.string.stop));

4
app/src/main/java/com/arialyy/simple/core/download/FtpDownloadModule.java
View File

@@ -33,7 +33,7 @@ public class FtpDownloadModule extends BaseViewModule {
private final String FTP_URL_KEY = "FTP_URL_KEY";
private final String FTP_PATH_KEY = "FTP_PATH_KEY";
private final String ftpDefUrl = "ftp://9.9.9.50:22/Cyberduck-6.9.4.30164.zip";
private final String ftpDefUrl = "ftp://9.9.9.50:2121/Cyberduck-6.9.4.30164.zip";
private final String ftpDefPath =
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getPath();
@@ -43,6 +43,8 @@ public class FtpDownloadModule extends BaseViewModule {
/**
* xx
* 单任务下载的信息
*
*
*/
LiveData<DownloadEntity> getFtpDownloadInfo(Context context) {
String url = AppUtil.getConfigValue(context, FTP_URL_KEY, ftpDefUrl);

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

@@ -35,10 +35,11 @@ import com.arialyy.simple.widget.SubStateLinearLayout;
* Created by lyy on 2017/7/6.
*/
public class FTPDirDownloadActivity extends BaseActivity<ActivityDownloadGroupBinding> {
private static final String dir = "ftp://9.9.9.205:2121/upload/测试";
private static final String dir = "ftp://9.9.9.50:2121/upload/测试";
private SubStateLinearLayout mChildList;
private long mTaskId = -1;
private String user = "lao", pwd = "123456";
@Override protected void init(Bundle savedInstanceState) {
super.init(savedInstanceState);
@@ -78,7 +79,7 @@ public class FTPDirDownloadActivity extends BaseActivity<ActivityDownloadGroupBi
Environment.getExternalStorageDirectory().getPath() + "/Download/ftp_dir")
.setGroupAlias("ftp文件夹下载")
.option()
.login("8L8e", "8guD")
.login(user, pwd)
.controller(ControllerType.CREATE_CONTROLLER)
.create();
getBinding().setStateStr(getString(R.string.stop));
@@ -91,7 +92,7 @@ public class FTPDirDownloadActivity extends BaseActivity<ActivityDownloadGroupBi
Aria.download(this)
.loadFtpDir(mTaskId)
.option()
.login("8L8e", "8guD")
.login(user, pwd)
.controller(ControllerType.TASK_CONTROLLER)
.resume();
getBinding().setStateStr(getString(R.string.stop));
@@ -144,6 +145,8 @@ public class FTPDirDownloadActivity extends BaseActivity<ActivityDownloadGroupBi
@DownloadGroup.onTaskComplete() void taskComplete(DownloadGroupTask task) {
getBinding().setProgress(100);
mChildList.updateChildProgress(task.getEntity().getSubEntities());
getBinding().setStateStr(getString(R.string.re_start));
getBinding().setSpeed("");
T.showShort(this, "任务组下载完成");
L.d(TAG, "任务组下载完成");
}

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

@@ -25,12 +25,12 @@ import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProviders;
import com.arialyy.annotations.Upload;
import com.arialyy.aria.core.Aria;
import com.arialyy.aria.core.processor.FtpInterceptHandler;
import com.arialyy.aria.core.processor.IFtpUploadInterceptor;
import com.arialyy.aria.core.common.controller.ControllerType;
import com.arialyy.aria.core.inf.IEntity;
import com.arialyy.aria.core.upload.UploadEntity;
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;
import com.arialyy.aria.util.CommonUtil;
import com.arialyy.frame.util.FileUtil;
@@ -53,6 +53,7 @@ public class FtpUploadActivity extends BaseActivity<ActivityFtpUploadBinding> {
private String mUrl;
private UploadModule mModule;
private long mTaskId = -1;
private String user = "lao", pwd = "123456";
@Override protected void init(Bundle savedInstanceState) {
setTile("D_FTP 文件上传");
@@ -117,20 +118,8 @@ public class FtpUploadActivity extends BaseActivity<ActivityFtpUploadBinding> {
mTaskId = Aria.upload(this)
.loadFtp(mFilePath)
.setUploadUrl(mUrl)
.setUploadInterceptor(
new 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();
}
})
.option()
.login("8L8e", "8guD")
.login(user, pwd)
.controller(ControllerType.CREATE_CONTROLLER)
.create();
getBinding().setStateStr(getString(R.string.stop));
@@ -143,7 +132,7 @@ public class FtpUploadActivity extends BaseActivity<ActivityFtpUploadBinding> {
Aria.upload(this)
.loadFtp(mTaskId)
.option()
.login("8L8e", "8guD")
.login(user, pwd)
.controller(ControllerType.TASK_CONTROLLER)
.resume();
getBinding().setStateStr(getString(R.string.stop));

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

@@ -35,9 +35,9 @@ public class UploadModule extends BaseViewModule {
* 获取Ftp上传信息
*/
LiveData<UploadEntity> getFtpInfo(Context context) {
String url = AppUtil.getConfigValue(context, FTP_URL_KEY, "ftp://9.9.9.205:2121/aa/你好");
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() + "/AriaPrj.rar");
Environment.getExternalStorageDirectory().getPath() + "/Download/PaNTFS15562.zip");
UploadEntity entity = Aria.upload(context).getFirstUploadEntity(filePath);
if (entity != null) {