From a575e885a9cb7937f4eda47c57f384534c1d0c96 Mon Sep 17 00:00:00 2001 From: laoyuyu <511455842@qq.com> Date: Sun, 27 Oct 2019 01:28:34 +0800 Subject: [PATCH] 3.7.1 --- .../core/upload/target/HttpNormalTarget.java | 5 +++ DEV_LOG.md | 4 ++ .../aria/core/loader/NormalLoader.java | 2 +- README.md | 45 +++++++++++++------ build.gradle | 2 +- 5 files changed, 42 insertions(+), 16 deletions(-) diff --git a/Aria/src/main/java/com/arialyy/aria/core/upload/target/HttpNormalTarget.java b/Aria/src/main/java/com/arialyy/aria/core/upload/target/HttpNormalTarget.java index 2b7a3d5d..27a6e1fa 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/upload/target/HttpNormalTarget.java +++ b/Aria/src/main/java/com/arialyy/aria/core/upload/target/HttpNormalTarget.java @@ -20,6 +20,7 @@ import com.arialyy.aria.core.common.AbsNormalTarget; import com.arialyy.aria.core.common.HttpOption; import com.arialyy.aria.core.inf.Suggest; import com.arialyy.aria.core.wrapper.AbsTaskWrapper; +import com.arialyy.aria.util.ALog; /** * Created by lyy on 2017/2/28. @@ -57,6 +58,10 @@ public class HttpNormalTarget extends AbsNormalTarget { return this; } + @Override public void resume() { + ALog.e(TAG, "http上传任务没有恢复功能"); + } + @Override public boolean isRunning() { return mConfigHandler.isRunning(); } diff --git a/DEV_LOG.md b/DEV_LOG.md index a5ede232..a8bc96af 100644 --- a/DEV_LOG.md +++ b/DEV_LOG.md @@ -5,6 +5,10 @@ - fix bug https://github.com/AriaLyy/Aria/issues/454 - fix bug https://github.com/AriaLyy/Aria/issues/467 - fix bug https://github.com/AriaLyy/Aria/issues/459 + - fix bug https://github.com/AriaLyy/Aria/issues/487 + - fix bug https://github.com/AriaLyy/Aria/issues/483 + - fix bug https://github.com/AriaLyy/Aria/issues/482 + - fix bug https://github.com/AriaLyy/Aria/issues/473 - 移除隐藏api的反射 https://github.com/AriaLyy/Aria/issues/456 - 新增ftp免证书登陆功能h ttps://github.com/AriaLyy/Aria/issues/455 - 适配androidX diff --git a/PublicComponent/src/main/java/com/arialyy/aria/core/loader/NormalLoader.java b/PublicComponent/src/main/java/com/arialyy/aria/core/loader/NormalLoader.java index 9221a312..1fd67739 100644 --- a/PublicComponent/src/main/java/com/arialyy/aria/core/loader/NormalLoader.java +++ b/PublicComponent/src/main/java/com/arialyy/aria/core/loader/NormalLoader.java @@ -99,7 +99,7 @@ public class NormalLoader extends AbsLoader { ((IDLoadListener) mListener).onPostPre(getEntity().getFileSize()); } File file = new File(getEntity().getFilePath()); - if (!file.getParentFile().exists()) { + if (file.getParentFile() != null && !file.getParentFile().exists()) { file.getParentFile().mkdirs(); } } diff --git a/README.md b/README.md index 2143013f..c74f2625 100644 --- a/README.md +++ b/README.md @@ -43,23 +43,30 @@ Aria有以下特点： ![m3u8点播文件边下边看](https://github.com/AriaLyy/Aria/blob/master/img/m3u8VodDownload.gif) ## 引入库 -[![Core](https://api.bintray.com/packages/arialyy/maven/AriaApi/images/download.svg)](https://bintray.com/arialyy/maven/AriaApi/_latestVersion) -[![Compiler](https://api.bintray.com/packages/arialyy/maven/AriaCompiler/images/download.svg)](https://bintray.com/arialyy/maven/AriaCompiler/_latestVersion) +[![license](http://img.shields.io/badge/license-Apache2.0-brightgreen.svg?style=flat)](https://github.com/AriaLyy/Aria/blob/master/LICENSE) +[![Core](https://img.shields.io/badge/Core-3.7.1-blue)](https://github.com/AriaLyy/Aria) +[![Compiler](https://img.shields.io/badge/Compiler-3.7.1-blue)](https://github.com/AriaLyy/Aria) +[![FtpComponent](https://img.shields.io/badge/FtpComponent-3.7.1-orange)](https://github.com/AriaLyy/Aria) +[![M3U8Component](https://img.shields.io/badge/M3U8Component-3.7.1-orange)](https://github.com/AriaLyy/Aria) ```java -compile 'com.arialyy.aria:aria-core:3.6.6' -annotationProcessor 'com.arialyy.aria:aria-compiler:3.6.6' +implementation 'com.arialyy.aria:core:3.7.1' +annotationProcessor 'com.arialyy.aria:compiler:3.7.1' +implementation 'com.arialyy.aria:ftpComponent:3.7.1' # 如果需要使用ftp，请增加该组件 +implementation 'com.arialyy.aria:m3u8Component:3.7.1' # 如果需要使用m3u8下载功能，请增加该组件 ``` 如果出现android support依赖错误，请将 `compile 'com.arialyy.aria:aria-core:'`替换为 ``` api('com.arialyy.aria:aria-core:'){ - exclude group: 'com.android.support' + exclude group: 'androidx.appcompat.app' } ``` 如果你使用的是kotlin，请使用kotlin官方提供的方法配置apt，[kotlin kapt官方配置传送门](https://www.kotlincn.net/docs/reference/kapt.html) __⚠️注意：3.5.4以下版本升级时，需要更新[配置文件](https://aria.laoyuyu.me/aria_doc/start/config.html)！！__ +__⚠️注意：3.7 以上版本已经适配了AndroidX__ + *** ## 使用 由于Aria涉及到文件和网络的操作，因此需要你在manifest文件中添加以下权限，如果你希望在6.0以上的系统中使用Aria，那么你需要动态向安卓系统申请文件系统读写权限，[如何使用安卓系统权限](https://developer.android.com/training/permissions/index.html?hl=zh-cn) @@ -126,17 +133,27 @@ protected void onCreate(Bundle savedInstanceState) { } ``` +### [文档地址](https://aria.laoyuyu.me/aria_doc/) + ### 版本日志 - + v_3.6.6 - - fix bug https://github.com/AriaLyy/Aria/issues/426 - - fix bug https://github.com/AriaLyy/Aria/issues/429 - - fix bug https://github.com/AriaLyy/Aria/issues/428 - - fix bug https://github.com/AriaLyy/Aria/issues/427 - - fix bug https://github.com/AriaLyy/Aria/issues/431 - - fix bug https://github.com/AriaLyy/Aria/issues/441 - - 修复普通下载任务、组合任务共享执行队列、缓存池的问题 - - 修复组合任务启动失败时，`DownloadGroupEntity`的状态变为执行中的问题 + + v_3.7 + - fix bug https://github.com/AriaLyy/Aria/issues/450 + - fix bug https://github.com/AriaLyy/Aria/issues/466 + - fix bug https://github.com/AriaLyy/Aria/issues/454 + - fix bug https://github.com/AriaLyy/Aria/issues/467 + - fix bug https://github.com/AriaLyy/Aria/issues/459 + - fix bug https://github.com/AriaLyy/Aria/issues/487 + - fix bug https://github.com/AriaLyy/Aria/issues/483 + - fix bug https://github.com/AriaLyy/Aria/issues/482 + - fix bug https://github.com/AriaLyy/Aria/issues/473 + - 移除隐藏api的反射 https://github.com/AriaLyy/Aria/issues/456 + - 新增ftp免证书登陆功能h ttps://github.com/AriaLyy/Aria/issues/455 + - 适配androidX + - 修复组合任务，恢复下载，会出现进度显示为0的问题 + - m3u8点播下载新增创建ts索引功能 + - 修复多任务的m3u8点播下载时，一个任务调用`jumpIndex`，其它m3u8任务也会自动调用`jumpIndex`的问题 + - 添加权限检查 [更多版本记录](https://github.com/AriaLyy/Aria/blob/master/DEV_LOG.md) diff --git a/build.gradle b/build.gradle index 1f82c71c..a5bb8b66 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,7 @@ task clean(type: Delete) { ext { versionCode = 371 - versionName = '3.7_pre_2' + versionName = '3.7.1' userOrg = 'arialyy' groupId = 'com.arialyy.aria' publishVersion = versionName