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

例子编写，bug fix

Browse Source
This commit is contained in:
AriaLyy
2017-03-01 17:17:44 +08:00
parent f107a9852b
commit 42c374e275
32 changed files with 484 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Aria/src/main/java/com/arialyy/aria/core/Aria.java
View File

@ -51,8 +51,7 @@ import com.arialyy.aria.core.upload.UploadTask;
* Aria.upload(this)
* .load(filePath) //文件路径，必填
* .setUploadUrl(uploadUrl) //上传路径，必填
* .setFileName(fileName) //文件名
* .setAttachment(fileKey) //服务器读取文件的key
* .setAttachment(fileKey) //服务器读取文件的key，必填
* .start();
* </code>
* </pre>

2
Aria/src/main/java/com/arialyy/aria/core/AriaManager.java
View File

@ -124,7 +124,7 @@ import java.util.Map;
UploadReceiver upload(Object obj) {
IReceiver receiver = mReceivers.get(getKey(false, obj));
if (receiver == null) {
receiver = putReceiver(true, obj);
receiver = putReceiver(false, obj);
}
return (receiver instanceof UploadReceiver) ? (UploadReceiver) receiver : null;
}

8
Aria/src/main/java/com/arialyy/aria/core/queue/pool/ExecutePool.java
View File

@ -47,12 +47,12 @@ public class ExecutePool<TASK extends ITask> implements IPool<TASK> {
@Override public boolean putTask(TASK task) {
synchronized (LOCK) {
if (task == null) {
Log.e(TAG, "下载任务不能为空！！");
Log.e(TAG, "任务不能为空！！");
return false;
}
String url = task.getKey();
if (mExecuteQueue.contains(task)) {
Log.e(TAG, "队列中已经包含了该任务，任务下载链接【" + url + "】");
Log.e(TAG, "队列中已经包含了该任务，任务key【" + url + "】");
return false;
} else {
if (mExecuteQueue.size() >= mSize) {
@ -144,7 +144,7 @@ public class ExecutePool<TASK extends ITask> implements IPool<TASK> {
@Override public TASK getTask(String downloadUrl) {
synchronized (LOCK) {
if (TextUtils.isEmpty(downloadUrl)) {
Log.e(TAG, "请传入有效的下载链接");
Log.e(TAG, "请传入有效的任务key");
return null;
}
String key = CommonUtil.keyToHashKey(downloadUrl);
@ -168,7 +168,7 @@ public class ExecutePool<TASK extends ITask> implements IPool<TASK> {
@Override public boolean removeTask(String downloadUrl) {
synchronized (LOCK) {
if (TextUtils.isEmpty(downloadUrl)) {
Log.e(TAG, "请传入有效的下载链接");
Log.e(TAG, "请传入有效的任务key");
return false;
}
String key = CommonUtil.keyToHashKey(downloadUrl);

8
Aria/src/main/java/com/arialyy/aria/core/upload/UploadReceiver.java
View File

@ -16,6 +16,7 @@
package com.arialyy.aria.core.upload;
import android.support.annotation.NonNull;
import android.util.Log;
import com.arialyy.aria.core.AriaManager;
import com.arialyy.aria.core.command.AbsCmd;
import com.arialyy.aria.core.command.CmdFactory;
@ -29,6 +30,8 @@ import com.arialyy.aria.util.CommonUtil;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* Created by Aria.Lao on 2017/2/6.
@ -50,6 +53,11 @@ public class UploadReceiver implements IReceiver<UploadEntity> {
if (entity == null) {
entity = new UploadEntity();
}
String regex = "[/|\\\\|//]";
Pattern p = Pattern.compile(regex);
String[] strs = p.split(filePath);
String fileName = strs[strs.length - 1];
entity.setFileName(fileName);
entity.setFilePath(filePath);
return new UploadTarget(entity, targetName);
}

6
Aria/src/main/java/com/arialyy/aria/core/upload/UploadTask.java
View File

@ -41,11 +41,11 @@ public class UploadTask implements ITask {
}
@Override public String getKey() {
return null;
return mUploadEntity.getFilePath();
}
@Override public boolean isRunning() {
return false;
return mUtil.isRunning();
}
public UploadEntity getUploadEntity() {
@ -197,7 +197,7 @@ public class UploadTask implements ITask {
*/
private void sendInState2Target(int state) {
if (outHandler.get() != null) {
outHandler.get().obtainMessage(state, task).sendToTarget();
outHandler.get().obtainMessage(state, task.get()).sendToTarget();
}
}

28
Aria/src/main/java/com/arialyy/aria/core/upload/UploadUtil.java
View File

@ -1,3 +1,18 @@
/*
* Copyright (C) 2016 AriaLyy(https://github.com/AriaLyy/Aria)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.arialyy.aria.core.upload;
import android.util.Log;
@ -21,7 +36,7 @@ import java.util.UUID;
* Created by Aria.Lao on 2017/2/9.
* 上传工具
*/
public class UploadUtil implements Runnable {
final class UploadUtil implements Runnable {
private static final String TAG = "UploadUtil";
private final String BOUNDARY = UUID.randomUUID().toString(); // 边界标识 随机生成
private final String PREFIX = "--", LINE_END = "\r\n";
@ -35,7 +50,7 @@ public class UploadUtil implements Runnable {
private boolean isCancel = false;
private boolean isRunning = false;
public UploadUtil(UploadTaskEntity taskEntity, IUploadListener listener) {
UploadUtil(UploadTaskEntity taskEntity, IUploadListener listener) {
mTaskEntity = taskEntity;
CheckUtil.checkUploadEntity(taskEntity.uploadEntity);
mUploadEntity = taskEntity.uploadEntity;
@ -51,7 +66,7 @@ public class UploadUtil implements Runnable {
new Thread(this).start();
}
public void cancel(){
public void cancel() {
isCancel = true;
isRunning = false;
}
@ -96,16 +111,13 @@ public class UploadUtil implements Runnable {
mListener.onStart(uploadFile.length());
addFilePart(mTaskEntity.attachment, uploadFile);
Log.d(TAG, finish() + "");
} catch (MalformedURLException e) {
e.printStackTrace();
fail();
} catch (IOException e) {
e.printStackTrace();
fail();
}
}
public boolean isRunning() {
boolean isRunning() {
return isRunning;
}
@ -200,8 +212,6 @@ public class UploadUtil implements Runnable {
}
reader.close();
mHttpConn.disconnect();
} else {
throw new IOException("Server returned non-OK status: " + status);
}
mWriter.flush();

13
app/src/main/AndroidManifest.xml
View File

@ -13,10 +13,8 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme.NoActionBar">
<!--android:name=".activity.SingleTaskActivity"-->
<!--android:name=".MainActivity"-->
<activity
android:name=".upload"
android:name=".MainActivity"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@ -25,10 +23,11 @@
</intent-filter>
</activity>
<activity android:name=".single_task.SingleTaskActivity"/>
<activity android:name=".multi_task.MultiTaskActivity"/>
<activity android:name=".fragment_task.FragmentActivity"/>
<activity android:name=".multi_task.DownloadActivity"/>
<activity android:name=".upload.UploadActivity"/>
<activity android:name=".download.SingleTaskActivity"/>
<activity android:name=".download.multi_download.MultiTaskActivity"/>
<activity android:name=".download.fragment_download.FragmentActivity"/>
<activity android:name=".download.multi_download.MultiDownloadActivity"/>
</application>
</manifest>

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

@ -1,114 +1,37 @@
/*
* Copyright (C) 2016 AriaLyy(https://github.com/AriaLyy/Aria)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.arialyy.simple;
import android.Manifest;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.view.Gravity;
import android.view.View;
import android.widget.Button;
import butterknife.Bind;
import com.arialyy.frame.permission.OnPermissionCallback;
import com.arialyy.frame.permission.PermissionManager;
import com.arialyy.frame.util.show.T;
import butterknife.OnClick;
import com.arialyy.simple.base.BaseActivity;
import com.arialyy.simple.databinding.ActivityMainBinding;
import com.arialyy.simple.dialog_task.DownloadDialog;
import com.arialyy.simple.fragment_task.FragmentActivity;
import com.arialyy.simple.multi_task.MultiTaskActivity;
import com.arialyy.simple.notification.SimpleNotification;
import com.arialyy.simple.pop_task.DownloadPopupWindow;
import com.arialyy.simple.single_task.SingleTaskActivity;
import com.arialyy.simple.download.DownloadActivity;
import com.arialyy.simple.upload.UploadActivity;
/**
* Created by Lyy on 2016/10/13.
* Created by Aria.Lao on 2017/3/1.
*/
public class MainActivity extends BaseActivity<ActivityMainBinding> {
@Bind(R.id.toolbar) Toolbar mBar;
@Bind(R.id.single_task) Button mSigleBt;
@Bind(R.id.multi_task) Button mMultiBt;
@Bind(R.id.dialog_task) Button mDialogBt;
@Bind(R.id.pop_task) Button mPopBt;
@Override protected void init(Bundle savedInstanceState) {
super.init(savedInstanceState);
mBar.setTitle("Aria Demo");
}
@Override protected int setLayoutId() {
return R.layout.activity_main;
}
@Override protected void init(Bundle savedInstanceState) {
super.init(savedInstanceState);
setSupportActionBar(mBar);
mBar.setTitle("多线程多任务下载");
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
setEnable(true);
} else { //6.0处理
boolean hasPermission = PermissionManager.getInstance()
.checkPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE);
if (hasPermission) {
setEnable(true);
} else {
setEnable(false);
PermissionManager.getInstance().requestPermission(this, new OnPermissionCallback() {
@Override public void onSuccess(String... permissions) {
setEnable(true);
}
@Override public void onFail(String... permissions) {
T.showShort(MainActivity.this, "没有文件读写权限");
setEnable(false);
}
}, Manifest.permission.WRITE_EXTERNAL_STORAGE);
}
}
@OnClick(R.id.download) public void downloadDemo() {
startActivity(new Intent(this, DownloadActivity.class));
}
private void setEnable(boolean enable) {
mSigleBt.setEnabled(enable);
mMultiBt.setEnabled(enable);
mDialogBt.setEnabled(enable);
mPopBt.setEnabled(enable);
}
public void onClick(View view) {
switch (view.getId()) {
case R.id.single_task:
startActivity(new Intent(this, SingleTaskActivity.class));
break;
case R.id.multi_task:
startActivity(new Intent(this, MultiTaskActivity.class));
break;
case R.id.dialog_task:
DownloadDialog dialog = new DownloadDialog(this);
dialog.show();
break;
case R.id.pop_task:
DownloadPopupWindow pop = new DownloadPopupWindow(this);
//pop.showAsDropDown(mRootView);
pop.showAtLocation(mRootView, Gravity.CENTER_VERTICAL, 0, 0);
break;
case R.id.fragment_task:
startActivity(new Intent(this, FragmentActivity.class));
break;
case R.id.notification:
SimpleNotification notification = new SimpleNotification(this);
notification.start();
break;
}
@OnClick(R.id.upload) public void uploadDemo() {
startActivity(new Intent(this, UploadActivity.class));
}
}

111
app/src/main/java/com/arialyy/simple/download/DownloadActivity.java Normal file
View File

@ -0,0 +1,111 @@
/*
* Copyright (C) 2016 AriaLyy(https://github.com/AriaLyy/Aria)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.arialyy.simple.download;
import android.Manifest;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.view.Gravity;
import android.view.View;
import android.widget.Button;
import butterknife.Bind;
import com.arialyy.frame.permission.OnPermissionCallback;
import com.arialyy.frame.permission.PermissionManager;
import com.arialyy.frame.util.show.T;
import com.arialyy.simple.R;
import com.arialyy.simple.base.BaseActivity;
import com.arialyy.simple.databinding.ActivityDownloadMeanBinding;
import com.arialyy.simple.download.fragment_download.FragmentActivity;
import com.arialyy.simple.download.multi_download.MultiTaskActivity;
/**
* Created by Lyy on 2016/10/13.
*/
public class DownloadActivity extends BaseActivity<ActivityDownloadMeanBinding> {
@Bind(R.id.toolbar) Toolbar mBar;
@Bind(R.id.single_task) Button mSigleBt;
@Bind(R.id.multi_task) Button mMultiBt;
@Bind(R.id.dialog_task) Button mDialogBt;
@Bind(R.id.pop_task) Button mPopBt;
@Override protected int setLayoutId() {
return R.layout.activity_download_mean;
}
@Override protected void init(Bundle savedInstanceState) {
super.init(savedInstanceState);
setSupportActionBar(mBar);
mBar.setTitle("多线程多任务下载");
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
setEnable(true);
} else { //6.0处理
boolean hasPermission = PermissionManager.getInstance()
.checkPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE);
if (hasPermission) {
setEnable(true);
} else {
setEnable(false);
PermissionManager.getInstance().requestPermission(this, new OnPermissionCallback() {
@Override public void onSuccess(String... permissions) {
setEnable(true);
}
@Override public void onFail(String... permissions) {
T.showShort(DownloadActivity.this, "没有文件读写权限");
setEnable(false);
}
}, Manifest.permission.WRITE_EXTERNAL_STORAGE);
}
}
}
private void setEnable(boolean enable) {
mSigleBt.setEnabled(enable);
mMultiBt.setEnabled(enable);
mDialogBt.setEnabled(enable);
mPopBt.setEnabled(enable);
}
public void onClick(View view) {
switch (view.getId()) {
case R.id.single_task:
startActivity(new Intent(this, SingleTaskActivity.class));
break;
case R.id.multi_task:
startActivity(new Intent(this, MultiTaskActivity.class));
break;
case R.id.dialog_task:
DownloadDialog dialog = new DownloadDialog(this);
dialog.show();
break;
case R.id.pop_task:
DownloadPopupWindow pop = new DownloadPopupWindow(this);
//pop.showAsDropDown(mRootView);
pop.showAtLocation(mRootView, Gravity.CENTER_VERTICAL, 0, 0);
break;
case R.id.fragment_task:
startActivity(new Intent(this, FragmentActivity.class));
break;
case R.id.notification:
SimpleNotification notification = new SimpleNotification(this);
notification.start();
break;
}
}
}

2
app/src/main/java/com/arialyy/simple/dialog_task/DownloadDialog.java → app/src/main/java/com/arialyy/simple/download/DownloadDialog.java
View File

@ -1,4 +1,4 @@
package com.arialyy.simple.dialog_task;
package com.arialyy.simple.download;
import android.content.Context;
import android.os.Environment;

5
app/src/main/java/com/arialyy/simple/module/DownloadModule.java → app/src/main/java/com/arialyy/simple/download/DownloadModule.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.arialyy.simple.module;
package com.arialyy.simple.download;
import android.content.BroadcastReceiver;
import android.content.Context;
@ -29,8 +29,7 @@ import com.arialyy.frame.util.AndroidUtils;
import com.arialyy.frame.util.StringUtil;
import com.arialyy.frame.util.show.L;
import com.arialyy.simple.R;
import com.arialyy.simple.multi_task.FileListEntity;
import com.arialyy.simple.single_task.SingleTaskActivity;
import com.arialyy.simple.download.multi_download.FileListEntity;
import com.arialyy.simple.base.BaseModule;
import java.io.File;
import java.util.ArrayList;

2
app/src/main/java/com/arialyy/simple/pop_task/DownloadPopupWindow.java → app/src/main/java/com/arialyy/simple/download/DownloadPopupWindow.java
View File

@ -1,4 +1,4 @@
package com.arialyy.simple.pop_task;
package com.arialyy.simple.download;
import android.content.Context;
import android.graphics.Color;

2
app/src/main/java/com/arialyy/simple/notification/SimpleNotification.java → app/src/main/java/com/arialyy/simple/download/SimpleNotification.java
View File

@ -1,4 +1,4 @@
package com.arialyy.simple.notification;
package com.arialyy.simple.download;
import android.app.NotificationManager;
import android.content.Context;

2
app/src/main/java/com/arialyy/simple/single_task/SingleTaskActivity.java → app/src/main/java/com/arialyy/simple/download/SingleTaskActivity.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.arialyy.simple.single_task;
package com.arialyy.simple.download;
import android.content.BroadcastReceiver;
import android.content.Context;

2
app/src/main/java/com/arialyy/simple/fragment_task/DownloadFragment.java → app/src/main/java/com/arialyy/simple/download/fragment_download/DownloadFragment.java
View File

@ -1,4 +1,4 @@
package com.arialyy.simple.fragment_task;
package com.arialyy.simple.download.fragment_download;
import android.os.Bundle;
import android.os.Environment;

2
app/src/main/java/com/arialyy/simple/fragment_task/FragmentActivity.java → app/src/main/java/com/arialyy/simple/download/fragment_download/FragmentActivity.java
View File

@ -1,4 +1,4 @@
package com.arialyy.simple.fragment_task;
package com.arialyy.simple.download.fragment_download;
import com.arialyy.simple.R;
import com.arialyy.simple.base.BaseActivity;

2
app/src/main/java/com/arialyy/simple/multi_task/DownloadAdapter.java → app/src/main/java/com/arialyy/simple/download/multi_download/DownloadAdapter.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.arialyy.simple.multi_task;
package com.arialyy.simple.download.multi_download;
import android.content.Context;
import android.content.res.Resources;

2
app/src/main/java/com/arialyy/simple/multi_task/DownloadNumDialog.java → app/src/main/java/com/arialyy/simple/download/multi_download/DownloadNumDialog.java
View File

@ -15,7 +15,7 @@
*/
package com.arialyy.simple.multi_task;
package com.arialyy.simple.download.multi_download;
import android.annotation.SuppressLint;
import android.os.Bundle;

2
app/src/main/java/com/arialyy/simple/multi_task/FileListAdapter.java → app/src/main/java/com/arialyy/simple/download/multi_download/FileListAdapter.java
View File

@ -1,4 +1,4 @@
package com.arialyy.simple.multi_task;
package com.arialyy.simple.download.multi_download;
import android.content.Context;
import android.view.View;

2
app/src/main/java/com/arialyy/simple/multi_task/FileListEntity.java → app/src/main/java/com/arialyy/simple/download/multi_download/FileListEntity.java
View File

@ -1,4 +1,4 @@
package com.arialyy.simple.multi_task;
package com.arialyy.simple.download.multi_download;
/**
* Created by AriaL on 2017/1/6.

15
app/src/main/java/com/arialyy/simple/multi_task/DownloadActivity.java → app/src/main/java/com/arialyy/simple/download/multi_download/MultiDownloadActivity.java
View File

@ -1,26 +1,28 @@
package com.arialyy.simple.multi_task;
package com.arialyy.simple.download.multi_download;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import butterknife.Bind;
import com.arialyy.aria.core.Aria;
import com.arialyy.aria.core.download.DownloadTask;
import com.arialyy.frame.util.show.L;
import com.arialyy.simple.R;
import com.arialyy.simple.base.BaseActivity;
import com.arialyy.simple.databinding.ActivityDownloadBinding;
import com.arialyy.simple.databinding.ActivityMultiDownloadBinding;
/**
* Created by AriaL on 2017/1/6.
*/
public class DownloadActivity extends BaseActivity<ActivityDownloadBinding> {
@Bind(R.id.list) RecyclerView mList;
private DownloadAdapter mAdapter;
public class MultiDownloadActivity extends BaseActivity<ActivityMultiDownloadBinding> {
@Bind(R.id.list) RecyclerView mList;
@Bind(R.id.toolbar) Toolbar mBar;
private DownloadAdapter mAdapter;
@Override protected int setLayoutId() {
return R.layout.activity_download;
return R.layout.activity_multi_download;
}
@Override protected void init(Bundle savedInstanceState) {
@ -28,6 +30,7 @@ public class DownloadActivity extends BaseActivity<ActivityDownloadBinding> {
mAdapter = new DownloadAdapter(this, Aria.download(this).getTaskList());
mList.setLayoutManager(new LinearLayoutManager(this));
mList.setAdapter(mAdapter);
mBar.setTitle("多任务下载");
}
@Override protected void dataCallback(int result, Object data) {

6
app/src/main/java/com/arialyy/simple/multi_task/MultiTaskActivity.java → app/src/main/java/com/arialyy/simple/download/multi_download/MultiTaskActivity.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.arialyy.simple.multi_task;
package com.arialyy.simple.download.multi_download;
import android.content.Intent;
import android.os.Bundle;
@ -28,7 +28,7 @@ import com.arialyy.aria.core.download.DownloadTask;
import com.arialyy.simple.R;
import com.arialyy.simple.base.BaseActivity;
import com.arialyy.simple.databinding.ActivityMultiBinding;
import com.arialyy.simple.module.DownloadModule;
import com.arialyy.simple.download.DownloadModule;
import java.util.ArrayList;
import java.util.List;
@ -65,7 +65,7 @@ public class MultiTaskActivity extends BaseActivity<ActivityMultiBinding> {
Aria.download(this).stopAllTask();
break;
case R.id.turn:
startActivity(new Intent(this, DownloadActivity.class));
startActivity(new Intent(this, MultiDownloadActivity.class));
break;
}
}

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

@ -1,71 +0,0 @@
package com.arialyy.simple;
import android.view.View;
import android.widget.ProgressBar;
import butterknife.Bind;
import com.arialyy.aria.core.upload.IUploadListener;
import com.arialyy.aria.core.upload.UploadEntity;
import com.arialyy.aria.core.upload.UploadTaskEntity;
import com.arialyy.aria.core.upload.UploadUtil;
import com.arialyy.simple.base.BaseActivity;
import com.arialyy.simple.databinding.ActivityUploadBinding;
import com.arialyy.simple.widget.HorizontalProgressBarWithNumber;
/**
* Created by Aria.Lao on 2017/2/9.
*/
public class upload extends BaseActivity<ActivityUploadBinding> {
@Bind(R.id.pb) HorizontalProgressBarWithNumber mPb;
@Override protected int setLayoutId() {
return R.layout.activity_upload;
}
public void onClick(View view) {
UploadEntity entity = new UploadEntity();
entity.setFilePath("/sdcard/Download/test.zip");
entity.setFileName("test.pdf");
UploadTaskEntity taskEntity = new UploadTaskEntity(entity);
taskEntity.uploadUrl = "http://172.18.104.189:8080/upload/sign_file";
taskEntity.attachment = "file";
UploadUtil util = new UploadUtil(taskEntity, new IUploadListener() {
long fileSize = 0;
@Override public void onPre() {
}
@Override public void onStart(long fileSize) {
this.fileSize = fileSize;
}
@Override public void onResume(long resumeLocation) {
}
@Override public void onStop(long stopLocation) {
}
@Override public void onProgress(long currentLocation) {
int p = (int) (currentLocation * 100 / fileSize);
mPb.setProgress(p);
}
@Override public void onCancel() {
}
@Override public void onComplete() {
}
@Override public void onFail() {
}
});
util.start();
}
}

115
app/src/main/java/com/arialyy/simple/upload/UploadActivity.java Normal file
View File

@ -0,0 +1,115 @@
package com.arialyy.simple.upload;
import android.os.Handler;
import android.os.Message;
import butterknife.Bind;
import butterknife.OnClick;
import com.arialyy.aria.core.Aria;
import com.arialyy.aria.core.upload.UploadTask;
import com.arialyy.frame.util.FileUtil;
import com.arialyy.frame.util.show.L;
import com.arialyy.frame.util.show.T;
import com.arialyy.simple.R;
import com.arialyy.simple.base.BaseActivity;
import com.arialyy.simple.databinding.ActivityUploadMeanBinding;
import com.arialyy.simple.widget.HorizontalProgressBarWithNumber;
import java.lang.ref.WeakReference;
/**
* Created by Aria.Lao on 2017/2/9.
*/
public class UploadActivity extends BaseActivity<ActivityUploadMeanBinding> {
@Bind(R.id.pb) HorizontalProgressBarWithNumber mPb;
private static final int START = 0;
private static final int STOP = 1;
private static final int CANCEL = 2;
private static final int RUNNING = 3;
private static final int COMPLETE = 4;
private static final String FILE_PATH = "/sdcard/Download/test.zip";
private Handler mHandler = new Handler() {
@Override public void handleMessage(Message msg) {
super.handleMessage(msg);
UploadTask task = (UploadTask) msg.obj;
switch (msg.what) {
case START:
getBinding().setFileSize(FileUtil.formatFileSize(task.getFileSize()));
break;
case STOP:
mPb.setProgress(0);
break;
case CANCEL:
mPb.setProgress(0);
break;
case RUNNING:
int p = (int) (task.getCurrentProgress() * 100 / task.getFileSize());
L.d(TAG, "p ==> " + p);
mPb.setProgress(p);
break;
case COMPLETE:
T.showShort(UploadActivity.this, "上传完成");
break;
}
}
};
@Override protected int setLayoutId() {
return R.layout.activity_upload_mean;
}
@OnClick(R.id.upload) void upload() {
Aria.upload(this)
.load(FILE_PATH)
.setUploadUrl("http://172.18.104.50:8080/UploadActivity/sign_file")
.setAttachment("file")
.start();
}
@OnClick(R.id.stop) void stop() {
Aria.upload(this).load(FILE_PATH).stop();
}
@OnClick(R.id.remove) void remove() {
Aria.upload(this).load(FILE_PATH).cancel();
}
@Override protected void onResume() {
super.onResume();
Aria.upload(this).addSchedulerListener(new UploadListener(mHandler));
}
static class UploadListener extends Aria.UploadSchedulerListener {
WeakReference<Handler> handler;
UploadListener(Handler handler) {
this.handler = new WeakReference<>(handler);
}
@Override public void onTaskStart(UploadTask task) {
super.onTaskStart(task);
handler.get().obtainMessage(START, task).sendToTarget();
}
@Override public void onTaskStop(UploadTask task) {
super.onTaskStop(task);
handler.get().obtainMessage(STOP, task).sendToTarget();
}
@Override public void onTaskCancel(UploadTask task) {
super.onTaskCancel(task);
handler.get().obtainMessage(CANCEL, task).sendToTarget();
}
@Override public void onTaskRunning(UploadTask task) {
super.onTaskRunning(task);
handler.get().obtainMessage(RUNNING, task).sendToTarget();
}
@Override public void onTaskComplete(UploadTask task) {
super.onTaskComplete(task);
handler.get().obtainMessage(COMPLETE, task).sendToTarget();
}
}
}

69
app/src/main/res/layout/activity_download_mean.xml Normal file
View File

@ -0,0 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical"
>
<include layout="@layout/layout_bar"/>
<Button
android:id="@+id/single_task"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="onClick"
android:text="单任务下载"
style="?buttonBarButtonStyle"
/>
<Button
android:id="@+id/multi_task"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="onClick"
android:text="多任务下载"
style="?buttonBarButtonStyle"
/>
<Button
android:id="@+id/dialog_task"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="onClick"
android:text="在dialog中使用"
style="?buttonBarButtonStyle"
/>
<Button
android:id="@+id/pop_task"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="onClick"
android:text="在popupwindow中使用"
style="?buttonBarButtonStyle"
/>
<Button
android:id="@+id/fragment_task"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="onClick"
android:text="在Fragment中使用"
style="?buttonBarButtonStyle"
/>
<Button
android:id="@+id/notification"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="onClick"
android:text="在Notification中使用"
style="?buttonBarButtonStyle"
/>
</LinearLayout>
</layout>

2
app/src/main/res/layout/activity_fragment.xml
View File

@ -8,7 +8,7 @@
>
<fragment
android:id="@+id/fragment1"
android:name="com.arialyy.simple.fragment_task.DownloadFragment"
android:name="com.arialyy.simple.download.fragment_download.DownloadFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>

51
app/src/main/res/layout/activity_main.xml
View File

@ -1,69 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical"
>
<include layout="@layout/layout_bar"/>
<Button
android:id="@+id/single_task"
android:id="@+id/download"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="onClick"
android:text="单任务下载"
android:text="下载 demo"
style="?buttonBarButtonStyle"
/>
<Button
android:id="@+id/multi_task"
android:id="@+id/upload"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="onClick"
android:text="多任务下载"
android:text="上传 demo"
style="?buttonBarButtonStyle"
/>
<Button
android:id="@+id/dialog_task"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="onClick"
android:text="在dialog中使用"
style="?buttonBarButtonStyle"
/>
<Button
android:id="@+id/pop_task"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="onClick"
android:text="在popupwindow中使用"
style="?buttonBarButtonStyle"
/>
<Button
android:id="@+id/fragment_task"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="onClick"
android:text="在Fragment中使用"
style="?buttonBarButtonStyle"
/>
<Button
android:id="@+id/notification"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="onClick"
android:text="在Notification中使用"
style="?buttonBarButtonStyle"
/>
</LinearLayout>
</layout>

3
app/src/main/res/layout/activity_download.xml → app/src/main/res/layout/activity_multi_download.xml
View File

@ -9,10 +9,13 @@
tools:context="com.example.arial.test.MainActivity"
>
<include layout="@layout/layout_bar"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/toolbar"
/>
</RelativeLayout>

2
app/src/main/res/layout/activity_single.xml
View File

@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context="com.arialyy.simple.single_task.SingleTaskActivity"
tools:context="com.arialyy.simple.download.SingleTaskActivity"
>
<android.support.design.widget.AppBarLayout

31
app/src/main/res/layout/activity_upload.xml
View File

@ -1,31 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
>
<include layout="@layout/layout_bar"/>
<com.arialyy.simple.widget.HorizontalProgressBarWithNumber
android:id="@+id/pb"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_margin="16dp"
android:max="100"
style="?android:attr/progressBarStyleHorizontal"
/>
<Button
android:id="@+id/single_task"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="onClick"
android:text="上传"
style="?buttonBarButtonStyle"
/>
</LinearLayout>
</layout>

97
app/src/main/res/layout/activity_upload_mean.xml Normal file
View File

@ -0,0 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<variable
name="fileSize"
type="String"
/>
<variable
name="speed"
type="String"
/>
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
>
<include layout="@layout/layout_bar"/>
<RelativeLayout
android:id="@+id/top_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/toolbar"
>
<com.arialyy.simple.widget.HorizontalProgressBarWithNumber
android:id="@+id/pb"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_margin="16dp"
android:layout_toLeftOf="@+id/size"
android:max="100"
style="?android:attr/progressBarStyleHorizontal"
/>
<TextView
android:id="@+id/size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="16dp"
android:text="@{fileSize}"
/>
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
>
<TextView
android:id="@+id/speed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:text="@{speed}"
/>
<Button
android:id="@+id/upload"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="上传"
style="?buttonBarButtonStyle"
/>
<Button
android:id="@+id/stop"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="停止"
style="?buttonBarButtonStyle"
/>
<Button
android:id="@+id/remove"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="删除"
style="?buttonBarButtonStyle"
/>
</LinearLayout>
</LinearLayout>
</layout>

2
app/src/main/res/layout/content_single.xml
View File

@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="com.arialyy.simple.single_task.SingleTaskActivity"
tools:context="com.arialyy.simple.download.SingleTaskActivity"
tools:showIn="@layout/activity_single"
>