From fd944c2e3571eb3b0e9f9d184c27f3b0fc54be9c Mon Sep 17 00:00:00 2001 From: AriaLyy <511455842@qq.com> Date: Thu, 23 Feb 2017 14:49:39 +0800 Subject: [PATCH 1/2] bug fix --- .../main/java/com/arialyy/aria/core/Aria.java | 27 +++++++++---------- .../com/arialyy/aria/core/AriaManager.java | 4 +++ .../java/com/arialyy/aria/util/CheckUtil.java | 4 +++ 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Aria/src/main/java/com/arialyy/aria/core/Aria.java b/Aria/src/main/java/com/arialyy/aria/core/Aria.java index 4aab85f2..b3c5a6c9 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/Aria.java +++ b/Aria/src/main/java/com/arialyy/aria/core/Aria.java @@ -28,6 +28,7 @@ import android.os.Build; import android.widget.PopupWindow; import com.arialyy.aria.core.scheduler.OnSchedulerListener; import com.arialyy.aria.core.task.Task; +import com.arialyy.aria.util.CheckUtil; /** * Created by lyy on 2016/12/1. @@ -98,12 +99,12 @@ import com.arialyy.aria.core.task.Task; private Aria() { } + /** * 接受Activity、Service、Application */ public static AMReceiver whit(Context context) { - //if (context == null) throw new IllegalArgumentException("context 不能为 null"); - checkNull(context); + CheckUtil.checkNull(context); if (context instanceof Activity || context instanceof Service || context instanceof Application) { @@ -117,7 +118,7 @@ import com.arialyy.aria.core.task.Task; * 处理Fragment */ public static AMReceiver whit(Fragment fragment) { - checkNull(fragment); + CheckUtil.checkNull(fragment); return AriaManager.getInstance( Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? fragment.getContext() : fragment.getActivity()).get(fragment); @@ -127,7 +128,7 @@ import com.arialyy.aria.core.task.Task; * 处理Fragment */ public static AMReceiver whit(android.support.v4.app.Fragment fragment) { - checkNull(fragment); + CheckUtil.checkNull(fragment); return AriaManager.getInstance( Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? fragment.getContext() : fragment.getActivity()).get(fragment); @@ -137,7 +138,7 @@ import com.arialyy.aria.core.task.Task; * 处理Fragment、或者DialogFragment */ public static AMReceiver whit(DialogFragment dialog) { - checkNull(dialog); + CheckUtil.checkNull(dialog); return AriaManager.getInstance( Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? dialog.getContext() : dialog.getActivity()) .get(dialog); @@ -147,7 +148,7 @@ import com.arialyy.aria.core.task.Task; * 处理popupwindow */ public static AMReceiver whit(PopupWindow popupWindow) { - checkNull(popupWindow); + CheckUtil.checkNull(popupWindow); return AriaManager.getInstance(popupWindow.getContentView().getContext()).get(popupWindow); } @@ -155,7 +156,7 @@ import com.arialyy.aria.core.task.Task; * 处理Dialog */ public static AMReceiver whit(Dialog dialog) { - checkNull(dialog); + CheckUtil.checkNull(dialog); return AriaManager.getInstance(dialog.getContext()).get(dialog); } @@ -177,7 +178,7 @@ import com.arialyy.aria.core.task.Task; * 处理Dialog的通用任务 */ public static AriaManager get(Dialog dialog) { - checkNull(dialog); + CheckUtil.checkNull(dialog); return AriaManager.getInstance(dialog.getContext()); } @@ -185,7 +186,7 @@ import com.arialyy.aria.core.task.Task; * 处理Dialog的通用任务 */ public static AriaManager get(PopupWindow popupWindow) { - checkNull(popupWindow); + CheckUtil.checkNull(popupWindow); return AriaManager.getInstance(popupWindow.getContentView().getContext()); } @@ -193,7 +194,7 @@ import com.arialyy.aria.core.task.Task; * 处理Fragment的通用任务 */ public static AriaManager get(Fragment fragment) { - checkNull(fragment); + CheckUtil.checkNull(fragment); return AriaManager.getInstance( Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? fragment.getContext() : fragment.getActivity()); @@ -203,16 +204,12 @@ import com.arialyy.aria.core.task.Task; * 处理Fragment的通用任务 */ public static AriaManager get(android.support.v4.app.Fragment fragment) { - checkNull(fragment); + CheckUtil.checkNull(fragment); return AriaManager.getInstance( Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? fragment.getContext() : fragment.getActivity()); } - private static void checkNull(Object obj) { - if (obj == null) throw new IllegalArgumentException("不能传入空对象"); - } - public static class SimpleSchedulerListener implements OnSchedulerListener { @Override public void onTaskPre(Task task) { diff --git a/Aria/src/main/java/com/arialyy/aria/core/AriaManager.java b/Aria/src/main/java/com/arialyy/aria/core/AriaManager.java index b9dcb150..d100d1a3 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/AriaManager.java +++ b/Aria/src/main/java/com/arialyy/aria/core/AriaManager.java @@ -217,6 +217,10 @@ import java.util.Set; key = clsName; } handlePopupWindowLift((PopupWindow) obj); + } else if (obj instanceof Service) { + key = clsName; + } else if (obj instanceof Application) { + key = clsName; } } else { key = clsName; diff --git a/Aria/src/main/java/com/arialyy/aria/util/CheckUtil.java b/Aria/src/main/java/com/arialyy/aria/util/CheckUtil.java index 5326a0a6..fd07b7c1 100644 --- a/Aria/src/main/java/com/arialyy/aria/util/CheckUtil.java +++ b/Aria/src/main/java/com/arialyy/aria/util/CheckUtil.java @@ -31,6 +31,10 @@ import java.util.regex.Pattern; public class CheckUtil { private static final String TAG = "CheckUtil"; + public static void checkNull(Object obj) { + if (obj == null) throw new IllegalArgumentException("不能传入空对象"); + } + /** * 检查sql的expression是否合法 */ From ad2e5a9ccefaeb33f0d601cf8fab5dad2d1bfe91 Mon Sep 17 00:00:00 2001 From: AriaLyy <511455842@qq.com> Date: Thu, 23 Feb 2017 15:02:34 +0800 Subject: [PATCH 2/2] readme --- .idea/misc.xml | 2 +- .idea/modules.xml | 4 ++-- .idea/vcs.xml | 6 ------ .../com/arialyy/aria/util/BufferedRandomAccessFile.java | 2 +- README.md | 3 ++- 5 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 .idea/vcs.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index fbb68289..5d199810 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/.idea/modules.xml b/.idea/modules.xml index b0a774eb..d68bc4ee 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,8 @@ - - + + diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddf..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Aria/src/main/java/com/arialyy/aria/util/BufferedRandomAccessFile.java b/Aria/src/main/java/com/arialyy/aria/util/BufferedRandomAccessFile.java index 167dbdf7..a0f36785 100644 --- a/Aria/src/main/java/com/arialyy/aria/util/BufferedRandomAccessFile.java +++ b/Aria/src/main/java/com/arialyy/aria/util/BufferedRandomAccessFile.java @@ -33,7 +33,7 @@ import java.util.Arrays; * functioning of the RandomAccessFile methods that are not * overridden here relies on the implementation of those methods in the * superclass. - * Author : Avinash Lakshman ( alakshman@facebook.com) & Prashant Malik ( pmalik@facebook.com ) + * Author : Avinash Lakshman ( alakshman@facebook.com) Prashant Malik ( pmalik@facebook.com ) */ public final class BufferedRandomAccessFile extends RandomAccessFile { diff --git a/README.md b/README.md index ddc19c92..fbff9751 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Aria，致力于让下载傻瓜化
## 下载 [![Download](https://api.bintray.com/packages/arialyy/maven/Aria/images/download.svg)](https://bintray.com/arialyy/maven/Aria/_latestVersion)
```java -compile 'com.arialyy.aria:Aria:2.4.0' +compile 'com.arialyy.aria:Aria:2.4.1' ``` ## 示例 @@ -134,6 +134,7 @@ Aria支持https下载，如果你希望使用自己的ca证书，那么你需要 *** ## 开发日志 + + v_2.4.1 修复下载慢的问题，修复application、service 不能使用的问题 + v_2.4.0 支持https链接下载 + v_2.3.8 修复数据错乱的bug、添加fragment支持 + v_2.3.6 添加dialog、popupWindow支持