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

添加onWait注解，修复自动添加等待任务的bug

Browse Source
This commit is contained in:
e
2018-01-31 19:52:51 +08:00
parent b191bb2470
commit 1f3bd90b3b
37 changed files with 255 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,6 +122,10 @@ public class SingleTaskActivity extends BaseActivity<ActivitySingleBinding> {
return true;
}
@Download.onWait void onWait(DownloadTask task){
Log.d(TAG, "wait ==> " + task.getDownloadEntity().getFileName());
}
@Download.onPre protected void onPre(DownloadTask task) {
setBtState(false);
}
@@ -230,7 +234,8 @@ public class SingleTaskActivity extends BaseActivity<ActivitySingleBinding> {
//.setRequestMode(RequestEnum.POST)
.setDownloadPath(Environment.getExternalStorageDirectory().getPath() + "/ggsg1.apk")
.resetState()
.start();
//.start();
.add();
}
@Override protected void onDestroy() {

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

@@ -17,16 +17,13 @@ package com.arialyy.simple.download.group;
import android.os.Bundle;
import android.os.Environment;
import android.support.design.widget.FloatingActionButton;
import android.view.View;
import butterknife.Bind;
import com.arialyy.annotations.DownloadGroup;
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.manager.TEManager;
import com.arialyy.frame.util.show.L;
import com.arialyy.frame.util.show.T;
import com.arialyy.simple.R;
@@ -66,8 +63,6 @@ public class DownloadGroupActivity extends BaseActivity<ActivityDownloadGroupBin
showPopupWindow(position);
}
});
}
private void showPopupWindow(int position) {
@@ -111,6 +106,10 @@ public class DownloadGroupActivity extends BaseActivity<ActivityDownloadGroupBin
}
}
@DownloadGroup.onWait void taskWait(DownloadGroupTask task) {
L.d(TAG, task.getTaskName() + "wait");
}
@DownloadGroup.onPre() protected void onPre(DownloadGroupTask task) {
L.d(TAG, "group pre");
}
@@ -162,5 +161,4 @@ public class DownloadGroupActivity extends BaseActivity<ActivityDownloadGroupBin
T.showShort(this, "任务组下载完成");
L.d(TAG, "任务组下载完成");
}
}

3
app/src/main/java/com/arialyy/simple/download/multi_download/MultiDownloadActivity.java
View File

@@ -76,13 +76,16 @@ public class MultiDownloadActivity extends BaseActivity<ActivityMultiDownloadBin
@Download.onPre void onPre(DownloadTask task) {
mAdapter.updateState(task.getEntity());
Log.d(TAG, task.getTaskName() + ", " + task.getState());
}
@Download.onTaskStart void taskStart(DownloadTask task) {
Log.d(TAG, task.getTaskName() + ", " + task.getState());
mAdapter.updateState(task.getEntity());
}
@Download.onTaskResume void taskResume(DownloadTask task) {
Log.d(TAG, task.getTaskName() + ", " + task.getState());
mAdapter.updateState(task.getEntity());
}

4
app/src/main/java/com/arialyy/simple/download/multi_download/MultiTaskActivity.java
View File

@@ -78,6 +78,10 @@ public class MultiTaskActivity extends BaseActivity<ActivityMultiBinding> {
}
}
@Download.onWait void taskWait(DownloadTask task){
Log.d(TAG, "wait ==> " + task.getDownloadEntity().getFileName());
}
@Download.onTaskStart void taskStart(DownloadTask task) {
mAdapter.updateBtState(task.getKey(), false);
}

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

@@ -34,7 +34,7 @@ import com.arialyy.simple.databinding.ActivityFtpUploadBinding;
* Ftp 文件上传demo
*/
public class FtpUploadActivity extends BaseActivity<ActivityFtpUploadBinding> {
private final String FILE_PATH = "/mnt/sdcard/Download/me.jpg";
private final String FILE_PATH = "/mnt/sdcard/gg.zip";
private final String URL = "ftp://192.168.1.2:21/upload/测试";
@Override protected void init(Bundle savedInstanceState) {
@@ -56,7 +56,7 @@ public class FtpUploadActivity extends BaseActivity<ActivityFtpUploadBinding> {
public void onClick(View view) {
switch (view.getId()) {
case R.id.start:
Aria.upload(this).loadFtp(FILE_PATH).setUploadUrl(URL).login("lao", "123456").start();
Aria.upload(this).loadFtp(FILE_PATH).setUploadUrl(URL).login("lao", "123456").add();
break;
case R.id.stop:
Aria.upload(this).loadFtp(FILE_PATH).stop();
@@ -67,6 +67,10 @@ public class FtpUploadActivity extends BaseActivity<ActivityFtpUploadBinding> {
}
}
@Upload.onWait void onWait(UploadTask task){
Log.d(TAG, task.getTaskName() + "_wait");
}
@Upload.onPre public void onPre(UploadTask task) {
getBinding().setFileSize(task.getConvertFileSize());
}

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

@@ -17,6 +17,7 @@
package com.arialyy.simple.upload;
import android.os.Bundle;
import android.util.Log;
import butterknife.Bind;
import butterknife.OnClick;
import com.arialyy.annotations.Upload;
@@ -63,6 +64,7 @@ public class HttpUploadActivity extends BaseActivity<ActivityUploadBinding> {
Aria.upload(this).load(FILE_PATH).cancel();
}
@Upload.onPre public void onPre(UploadTask task) {
}