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

fix bug https://github.com/AriaLyy/Aria/issues/646

Browse Source
This commit is contained in:
laoyuyu
2020-04-18 11:30:55 +08:00
parent 0476c3a941
commit 1f2ac36580
45 changed files with 733 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@
<!-- http://aria.laoyuyu.me/aria_doc/api/use_broadcast.html -->
<useBroadcast value="false"/>
<!--断网的时候是否重试，true：断网也重试；false：断网不重试，直接走失败的回调-->
<notNetRetry value="false"/>
<notNetRetry value="true"/>
</app>

2
app/src/main/java/com/arialyy/simple/base/BaseApplication.java
View File

@@ -34,7 +34,7 @@ public class BaseApplication extends Application {
super.onCreate();
INSTANCE = this;
AbsFrame.init(this);
//Aria.init(this);
Aria.init(this);
if (BuildConfig.DEBUG) {
//StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
// .detectAll()

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

@@ -55,11 +55,11 @@ public class HttpDownloadModule extends BaseViewModule {
//String url = "http://fdfs.speedata.cn:9989/group1/M00/00/05/rBGFrl3fdAKAVJwfMtSa9R18wLU139.zip";
//String url = "http://9.9.9.28:8088/files/update.zip";
//String url = "https://ss1.baidu.com/-4o3dSag_xI4khGko9WTAnF6hhy/image/h%3D300/sign=a9e671b9a551f3dedcb2bf64a4eff0ec/4610b912c8fcc3cef70d70409845d688d53f20f7.jpg";
//String url = "https://imtt.dd.qq.com/16891/apk/70BFFDB05AB8686F2A4CF3E07588A377.apk?fsname=com.tencent.tmgp.speedmobile_1.16.0.33877_1160033877.apk&csr=1bbd";
String url = "https://imtt.dd.qq.com/16891/apk/70BFFDB05AB8686F2A4CF3E07588A377.apk?fsname=com.tencent.tmgp.speedmobile_1.16.0.33877_1160033877.apk&csr=1bbd";
//String url = "https://ss1.baidu.com/-4o3dSag_xI4khGko9WTAnF6hhy/image/h%3D300/sign=a9e671b9a551f3dedcb2bf64a4eff0ec/4610b912c8fcc3cef70d70409845d688d53f20f7.jpg";
//String filePath = AppUtil.getConfigValue(context, HTTP_PATH_KEY, defFilePath);
//String url = "https://y.qq.com/download/import/QQMusic-import-1.2.1.zip";
String url = "https://video-hkt1-1.xx.fbcdn.net/v/t42.9040-2/89465702_658301101378505_5469280744218034176_n.mp4?_nc_cat=107&_nc_sid=985c63&efg=eyJ2ZW5jb2RlX3RhZyI6ImxlZ2FjeV9zZCJ9&_nc_oc=AQmzYwQG9vccyqr7S44-cfHc4wJ9010O1nvspG2DPV4cTct1pLrjKl1e1UmOJV99bJw&_nc_ht=video-hkt1-1.xx&oh=49bd04435aaa8b4459b8d5cb7d1e7c79&oe=5E672E37";
//String url = "https://video-hkt1-1.xx.fbcdn.net/v/t42.9040-2/89465702_658301101378505_5469280744218034176_n.mp4?_nc_cat=107&_nc_sid=985c63&efg=eyJ2ZW5jb2RlX3RhZyI6ImxlZ2FjeV9zZCJ9&_nc_oc=AQmzYwQG9vccyqr7S44-cfHc4wJ9010O1nvspG2DPV4cTct1pLrjKl1e1UmOJV99bJw&_nc_ht=video-hkt1-1.xx&oh=49bd04435aaa8b4459b8d5cb7d1e7c79&oe=5E672E37";
//String url = "http://donuts.aigauss.com/doc_fPhW2DBGj3_1578932414.png";
String filePath = "/mnt/sdcard/update.mp4";
//String url = "https://dhfspace.360drm.com/1_12809_1543904946_VID_20180808_212829.vep?e=1578554567&token=gUBmfZgZS5wy4wdQIDZG8UVxlNCyVSjvksIb13K5:WYSZRgmLbH1_9hjgqOAGmqR27JM=";

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

@@ -118,7 +118,7 @@ public class SingleTaskActivity extends BaseActivity<ActivitySingleBinding> {
}
@Override public void cancel(View v, AbsEntity entity) {
Aria.download(this).load(mTaskId).cancel();
Aria.download(this).load(mTaskId).cancel(true);
}
});
}

7
app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8VodDLoadActivity.java
View File

@@ -311,7 +311,7 @@ public class M3U8VodDLoadActivity extends BaseActivity<ActivityM3u8VodBinding> {
.setVodTsUrlConvert(new VodTsUrlConverter());
//.setMergeHandler(new TsMergeHandler());
option.setKeyUrlConverter(new KeyUrlConverter());
//option.setBandWidthUrlConverter(new BandWidthUrlConverter(mUrl));
option.setBandWidthUrlConverter(new BandWidthUrlConverter(mUrl));
return option;
}
@@ -327,10 +327,11 @@ public class M3U8VodDLoadActivity extends BaseActivity<ActivityM3u8VodBinding> {
static class VodTsUrlConverter implements IVodTsUrlConverter {
@Override public List<String> convert(String m3u8Url, List<String> tsUrls) {
Uri uri = Uri.parse(m3u8Url);
String parentUrl = "http://devimages.apple.com/iphone/samples/bipbop/gear1/";
//String parentUrl = "http://" + uri.getHost() + "/gear1/";
int index = m3u8Url.lastIndexOf("/");
//int index = m3u8Url.lastIndexOf("/");
//String parentUrl = m3u8Url.substring(0, index + 1);
String parentUrl = "https://135zyv5.xw0371.com/2018/10/29/X05c7CG3VB91gi1M/";
//String parentUrl = "https://v1.szjal.cn/20190819/Ql6UD1od/";
//String parentUrl = "http://" + uri.getHost() + "/";
List<String> newUrls = new ArrayList<>();
for (String url : tsUrls) {

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

@@ -34,13 +34,13 @@ public class M3U8VodModule extends BaseViewModule {
// m3u8测试集合：http://www.voidcn.com/article/p-snaliarm-ct.html
//private final String defUrl = "https://www.gaoya123.cn/2019/1557993797897.m3u8";
// 多码率地址：
//private final String defUrl = "http://devimages.apple.com/iphone/samples/bipbop/bipbopall.m3u8";
private final String defUrl = "http://devimages.apple.com/iphone/samples/bipbop/bipbopall.m3u8";
//private final String defUrl = "https://cn7.kankia.com/hls/20200108/e1eaec074274c64fe46a3bdb5d2ba487/1578488360/index.m3u8";
//private final String defUrl = "https://youku.cdn7-okzy.com/20191213/16167_c3592a02/index.m3u8";
//private final String defUrl = "http://qn.shytong.cn/b83137769ff6b555/11b0c9970f9a3fa0.mp4.m3u8";
//private final String defUrl = "https://135zyv5.xw0371.com/2018/10/29/X05c7CG3VB91gi1M/playlist.m3u8";
//private final String defUrl = "https://fangao.qfxmj.com/video/20191111/dbf7e2aa0c5f42a8b040442b54c13e3a/cloudv-transfer/555555556nr593o75556r165q86n82n0_eb3da35b8f4442808756a6ddc8ec1372_0_3.m3u8?wsSecret=d5fb403512d4cd427f18858086b35ce4&wsTime=1582197537";
private final String defUrl = "https://v1.szjal.cn/20190819/Ql6UD1od/index.m3u8";
//private final String defUrl = "https://v1.szjal.cn/20190819/Ql6UD1od/index.m3u8";
private final String filePath =
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getPath()
//+ "/道士下山.ts";

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

@@ -94,7 +94,7 @@ public class FtpUploadActivity extends BaseActivity<ActivitySingleBinding> {
}
@Override public void cancel(View v, AbsEntity entity) {
Aria.upload(this).loadFtp(mTaskId).cancel(false);
Aria.upload(this).loadFtp(mTaskId).cancel(true);
mTaskId = -1;
}
});
@@ -135,7 +135,7 @@ public class FtpUploadActivity extends BaseActivity<ActivitySingleBinding> {
@Upload.onWait
void onWait(UploadTask task) {
if (task.getKey().equals(mUrl)) {
if (task.getEntity().getUrl().equals(mUrl)) {
Log.d(TAG, "wait ==> " + task.getEntity().getFileName());
getBinding().pl.setInfo(task.getEntity());
}
@@ -143,14 +143,14 @@ public class FtpUploadActivity extends BaseActivity<ActivitySingleBinding> {
@Upload.onPre
protected void onPre(UploadTask task) {
if (task.getKey().equals(mUrl)) {
if (task.getEntity().getUrl().equals(mUrl)) {
getBinding().pl.setInfo(task.getEntity());
}
}
@Upload.onTaskStart
void taskStart(UploadTask task) {
if (task.getKey().equals(mUrl)) {
if (task.getEntity().getUrl().equals(mUrl)) {
getBinding().pl.setInfo(task.getEntity());
ALog.d(TAG, "isComplete = " + task.isComplete() + ", state = " + task.getState());
}
@@ -158,7 +158,7 @@ public class FtpUploadActivity extends BaseActivity<ActivitySingleBinding> {
@Upload.onTaskRunning
protected void running(UploadTask task) {
if (task.getKey().equals(mUrl)) {
if (task.getEntity().getUrl().equals(mUrl)) {
ALog.d(TAG, "isRunning" + "; state = " + task.getEntity().getState());
getBinding().pl.setInfo(task.getEntity());
}
@@ -166,7 +166,8 @@ public class FtpUploadActivity extends BaseActivity<ActivitySingleBinding> {
@Upload.onTaskResume
void taskResume(UploadTask task) {
if (task.getKey().equals(mUrl)) {
if (task.getEntity().getUrl().equals(mUrl)) {
getBinding().pl.setInfo(task.getEntity());
ALog.d(TAG, "resume");
getBinding().pl.setInfo(task.getEntity());
}
@@ -174,7 +175,7 @@ public class FtpUploadActivity extends BaseActivity<ActivitySingleBinding> {
@Upload.onTaskStop
void taskStop(UploadTask task) {
if (task.getKey().equals(mUrl)) {
if (task.getEntity().getUrl().equals(mUrl)) {
ALog.d(TAG, "stop");
getBinding().pl.setInfo(task.getEntity());
}
@@ -182,7 +183,7 @@ public class FtpUploadActivity extends BaseActivity<ActivitySingleBinding> {
@Upload.onTaskCancel
void taskCancel(UploadTask task) {
if (task.getKey().equals(mUrl)) {
if (task.getEntity().getUrl().equals(mUrl)) {
mTaskId = -1;
Log.d(TAG, "cancel");
getBinding().pl.setInfo(task.getEntity());
@@ -192,17 +193,17 @@ public class FtpUploadActivity extends BaseActivity<ActivitySingleBinding> {
@Upload.onTaskFail
void taskFail(UploadTask task, Exception e) {
ALog.d(TAG, "fail");
Toast.makeText(this, getString(R.string.download_fail), Toast.LENGTH_SHORT)
Toast.makeText(this, getString(R.string.upload_fail), Toast.LENGTH_SHORT)
.show();
if (task != null && task.getKey().equals(mUrl)) {
if (task != null && task.getEntity().getUrl().equals(mUrl)) {
getBinding().pl.setInfo(task.getEntity());
}
}
@Upload.onTaskComplete
void taskComplete(UploadTask task) {
if (task.getKey().equals(mUrl)) {
Toast.makeText(this, getString(R.string.download_success),
if (task.getEntity().getUrl().equals(mUrl)) {
Toast.makeText(this, getString(R.string.upload_success),
Toast.LENGTH_SHORT).show();
ALog.d(TAG, "md5: " + CommonUtil.getFileMD5(new File(task.getEntity().getFilePath())));
getBinding().pl.setInfo(task.getEntity());

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

@@ -38,7 +38,7 @@ public class UploadModule extends BaseViewModule {
//String url = AppUtil.getConfigValue(context, FTP_URL_KEY, "ftp://9.9.9.72:2121/aab/你好");
//String filePath = AppUtil.getConfigValue(context, FTP_PATH_KEY,
// Environment.getExternalStorageDirectory().getPath() + "/Download/AndroidAria.db");
String url = "ftp://9.9.9.72:2121/aab/你好";
String url = "ftp://192.168.0.105:2121/aab/你好";
String filePath = "/mnt/sdcard/QQMusic-import-1.2.1.zip";
UploadEntity entity = Aria.upload(context).getFirstUploadEntity(filePath);

2
app/src/main/res/values/strings.xml
View File

@@ -19,7 +19,9 @@
<string name="completed">已完成</string>
<string name="code_simple">代码示例：</string>
<string name="download_success">下载完成</string>
<string name="upload_success">上传完成</string>
<string name="download_fail">下载失败</string>
<string name="upload_fail">上传失败</string>
<string name="re_start">重新开始</string>
<string name="choose_current_dir">选择当前文件夹</string>
<string name="choose_dir">选择文件夹</string>