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

loader 重构

Browse Source
This commit is contained in:
laoyuyu
2020-01-01 14:43:52 +08:00
parent 1e237d795d bfc2cff5b0
commit 102d3ba0f6
170 changed files with 2862 additions and 21661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/assets/aria_config.xml
View File

@@ -44,7 +44,7 @@
<threadNum value="3"/>
<!--设置下载队列最大任务数， 默认为2-->
<maxTaskNum value="3"/>
<maxTaskNum value="1"/>
<!--设置下载失败，重试次数，默认为10-->
<reTryNum value="5"/>

1
app/src/main/java/com/arialyy/simple/MainActivity.java
View File

@@ -29,7 +29,6 @@ import androidx.lifecycle.ViewModelProviders;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.arialyy.aria.core.AriaManager;
import com.arialyy.frame.permission.OnPermissionCallback;
import com.arialyy.frame.permission.PermissionManager;
import com.arialyy.frame.util.show.T;

5
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 = "lao", passw = "123456";
private String user = "boamax\\update", passw = "2020&suzhou";
@Override protected void init(Bundle savedInstanceState) {
super.init(savedInstanceState);
@@ -124,7 +124,8 @@ public class FtpDownloadActivity extends BaseActivity<ActivityFtpDownloadBinding
private FtpOption getFtpOption() {
FtpOption option = new FtpOption();
option.login(user, passw);
option.setConnectionMode(FtpConnectionMode.DATA_CONNECTION_MODE_ACTIVITY);
option.setServerIdentifier(FtpOption.FTPServerIdentifier.SYST_NT);
//option.setConnectionMode(FtpConnectionMode.DATA_CONNECTION_MODE_ACTIVITY);
return option;
}

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

@@ -48,7 +48,8 @@ public class FtpDownloadModule extends BaseViewModule {
*/
LiveData<DownloadEntity> getFtpDownloadInfo(Context context) {
//String url = AppUtil.getConfigValue(context, FTP_URL_KEY, ftpDefUrl);
String url = "ftp://9.9.9.72:2121/Cyberduck-6.9.4.30164.zip";
//String url = "ftp://9.9.9.72:2121/Cyberduck-6.9.4.30164.zip";
String url = "ftp://58.210.178.52:21/battery1.0.0.apk";
String filePath = AppUtil.getConfigValue(context, FTP_PATH_KEY, ftpDefPath);
singDownloadInfo = Aria.download(context).getFirstDownloadEntity(url);

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

@@ -20,6 +20,7 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.StatFs;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
@@ -32,7 +33,6 @@ import androidx.lifecycle.ViewModelProviders;
import com.arialyy.annotations.Download;
import com.arialyy.aria.core.Aria;
import com.arialyy.aria.core.common.HttpOption;
import com.arialyy.aria.core.common.RequestEnum;
import com.arialyy.aria.core.download.DownloadEntity;
import com.arialyy.aria.core.inf.IEntity;
import com.arialyy.aria.core.listener.ISchedulers;
@@ -40,16 +40,13 @@ import com.arialyy.aria.core.processor.IHttpFileLenAdapter;
import com.arialyy.aria.core.task.DownloadTask;
import com.arialyy.aria.util.ALog;
import com.arialyy.aria.util.CommonUtil;
import com.arialyy.aria.util.FileUtil;
import com.arialyy.frame.util.show.T;
import com.arialyy.simple.R;
import com.arialyy.simple.base.BaseActivity;
import com.arialyy.simple.common.ModifyPathDialog;
import com.arialyy.simple.common.ModifyUrlDialog;
import com.arialyy.simple.databinding.ActivitySingleBinding;
import com.arialyy.simple.util.AppUtil;
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -275,9 +272,9 @@ public class SingleTaskActivity extends BaseActivity<ActivitySingleBinding> {
.load(mTaskId)
.stop();
} else {
mTaskId = Aria.download(this).load(mTaskId)
Aria.download(this).load(mTaskId)
//.updateUrl(mUrl)
.reStart();
.resume();
}
break;
case R.id.cancel:

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

@@ -54,6 +54,13 @@ public class GroupModule extends BaseModule {
return names;
}
List<String> getSubName1() {
List<String> names = new ArrayList<>();
String[] str = getContext().getResources().getStringArray(R.array.group_names);
Collections.addAll(names, str);
return names;
}
List<String> getSubName2() {
List<String> taskSubFile;
taskSubFile = new ArrayList<>();

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

@@ -43,7 +43,7 @@ public class HttpUploadActivity extends BaseActivity<ActivityUploadBinding> {
//private final String FILE_PATH = "/mnt/sdcard/ggsg14.apk";
private final String FILE_PATH =
Environment.getExternalStorageDirectory().getPath() + "/Download/PaNTFS15562.zip";
Environment.getExternalStorageDirectory().getPath() + "/Download/QQMusic-import-1.2.1.zip";
private UploadEntity mEntity;
@Override protected int setLayoutId() {
@@ -82,7 +82,7 @@ public class HttpUploadActivity extends BaseActivity<ActivityUploadBinding> {
.setParam("params", "bbbbbbbb");
Aria.upload(HttpUploadActivity.this).load(FILE_PATH)
//.setUploadUrl("http://lib-test.xzxyun.com:8042/Api/upload?data={\"type\":\"1\",\"fileType\":\".apk\"}")
.setUploadUrl("http://9.9.9.205:5000/upload/")
.setUploadUrl("http://9.9.12.210:5000/upload/")
//.setTempUrl("http://192.168.1.6:8080/upload/sign_file/").setAttachment("file")
//.addHeader("iplanetdirectorypro", "11a09102fb934ad0bc206f9c611d7933")
.option(option)