From 8787030fa627e2beb7a825901141db2d10b7c45e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=96=90?= Date: Tue, 7 Jul 2020 17:13:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8B=E8=BD=BD=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=9B=91=E5=90=AC=E5=99=A8=E7=88=B6=E7=B1=BB=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/arialyy/aria/core/common/ProxyHelper.java | 4 ++-- .../aria/core/scheduler/BaseListenerInterface.java | 8 -------- .../DownloadTaskInternalListenerInterface.java | 10 ++++++++++ .../core/scheduler/M3U8PeerTaskListenerInterface.java | 2 +- .../core/scheduler/NormalTaskListenerInterface.java | 2 +- .../aria/core/scheduler/SubTaskListenerInterface.java | 2 +- .../arialyy/aria/core/scheduler/TaskSchedulers.java | 2 +- 7 files changed, 16 insertions(+), 14 deletions(-) delete mode 100644 Aria/src/main/java/com/arialyy/aria/core/scheduler/BaseListenerInterface.java create mode 100644 Aria/src/main/java/com/arialyy/aria/core/scheduler/DownloadTaskInternalListenerInterface.java diff --git a/Aria/src/main/java/com/arialyy/aria/core/common/ProxyHelper.java b/Aria/src/main/java/com/arialyy/aria/core/common/ProxyHelper.java index 2a3f089e..8496a3b6 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/common/ProxyHelper.java +++ b/Aria/src/main/java/com/arialyy/aria/core/common/ProxyHelper.java @@ -18,7 +18,7 @@ package com.arialyy.aria.core.common; import com.arialyy.annotations.TaskEnum; import com.arialyy.aria.core.download.DownloadGroupTaskListener; import com.arialyy.aria.core.download.DownloadTaskListener; -import com.arialyy.aria.core.scheduler.BaseListenerInterface; +import com.arialyy.aria.core.scheduler.DownloadTaskInternalListenerInterface; import com.arialyy.aria.core.scheduler.M3U8PeerTaskListenerInterface; import com.arialyy.aria.core.scheduler.SubTaskListenerInterface; import com.arialyy.aria.core.upload.UploadTaskListener; @@ -117,7 +117,7 @@ public class ProxyHelper { } private Set checkProxyTypeByInterface(Class clazz) { - if (!BaseListenerInterface.class.isAssignableFrom(clazz)) { + if (!DownloadTaskInternalListenerInterface.class.isAssignableFrom(clazz)) { return null; } Set result = new HashSet<>(); diff --git a/Aria/src/main/java/com/arialyy/aria/core/scheduler/BaseListenerInterface.java b/Aria/src/main/java/com/arialyy/aria/core/scheduler/BaseListenerInterface.java deleted file mode 100644 index 75ce3764..00000000 --- a/Aria/src/main/java/com/arialyy/aria/core/scheduler/BaseListenerInterface.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.arialyy.aria.core.scheduler; - -/** - * @author ChenFei(chenfei0928 @ gmail.com) - * @date 2020-07-07 15:18 - */ -public interface BaseListenerInterface { -} diff --git a/Aria/src/main/java/com/arialyy/aria/core/scheduler/DownloadTaskInternalListenerInterface.java b/Aria/src/main/java/com/arialyy/aria/core/scheduler/DownloadTaskInternalListenerInterface.java new file mode 100644 index 00000000..993b54f1 --- /dev/null +++ b/Aria/src/main/java/com/arialyy/aria/core/scheduler/DownloadTaskInternalListenerInterface.java @@ -0,0 +1,10 @@ +package com.arialyy.aria.core.scheduler; + +/** + * 直接实现监听器回调接口的基类,不对外部直接开放,仅作为内部监听器的父接口使用 + * + * @author ChenFei(chenfei0928 @ gmail.com) + * @date 2020-07-07 15:18 + */ +public interface DownloadTaskInternalListenerInterface { +} diff --git a/Aria/src/main/java/com/arialyy/aria/core/scheduler/M3U8PeerTaskListenerInterface.java b/Aria/src/main/java/com/arialyy/aria/core/scheduler/M3U8PeerTaskListenerInterface.java index 132e0ce0..5cc8837c 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/scheduler/M3U8PeerTaskListenerInterface.java +++ b/Aria/src/main/java/com/arialyy/aria/core/scheduler/M3U8PeerTaskListenerInterface.java @@ -19,7 +19,7 @@ package com.arialyy.aria.core.scheduler; * Created by Aria.Lao on 2019/6/26. * m3u8切片事件回调类 */ -public interface M3U8PeerTaskListenerInterface extends BaseListenerInterface { +public interface M3U8PeerTaskListenerInterface extends DownloadTaskInternalListenerInterface { public void onPeerStart(final String m3u8Url, final String peerPath, final int peerIndex); diff --git a/Aria/src/main/java/com/arialyy/aria/core/scheduler/NormalTaskListenerInterface.java b/Aria/src/main/java/com/arialyy/aria/core/scheduler/NormalTaskListenerInterface.java index bdc5ec86..4d9d4ad1 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/scheduler/NormalTaskListenerInterface.java +++ b/Aria/src/main/java/com/arialyy/aria/core/scheduler/NormalTaskListenerInterface.java @@ -24,7 +24,7 @@ import com.arialyy.aria.core.task.UploadTask; * Created by Aria.Lao on 2017/6/7. * 普通任务事件{@link DownloadTask}、{@link UploadTask}、{@link DownloadGroupTask}回调类 */ -public interface NormalTaskListenerInterface extends BaseListenerInterface { +public interface NormalTaskListenerInterface extends DownloadTaskInternalListenerInterface { /** * 队列已经满了,继续创建任务,将会回调该方法 diff --git a/Aria/src/main/java/com/arialyy/aria/core/scheduler/SubTaskListenerInterface.java b/Aria/src/main/java/com/arialyy/aria/core/scheduler/SubTaskListenerInterface.java index 7e375ffd..03abb5f1 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/scheduler/SubTaskListenerInterface.java +++ b/Aria/src/main/java/com/arialyy/aria/core/scheduler/SubTaskListenerInterface.java @@ -22,7 +22,7 @@ import com.arialyy.aria.core.task.ITask; * Created by Aria.Lao on 2019/6/26. * 子任务事件回调类 */ -public interface SubTaskListenerInterface extends BaseListenerInterface { +public interface SubTaskListenerInterface extends DownloadTaskInternalListenerInterface { public void onNoSupportBreakPoint(TASK task); diff --git a/Aria/src/main/java/com/arialyy/aria/core/scheduler/TaskSchedulers.java b/Aria/src/main/java/com/arialyy/aria/core/scheduler/TaskSchedulers.java index 0bf70ef0..b54cabdf 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/scheduler/TaskSchedulers.java +++ b/Aria/src/main/java/com/arialyy/aria/core/scheduler/TaskSchedulers.java @@ -106,7 +106,7 @@ public class TaskSchedulers implements ISchedulers { } if (!hasProxyListener(listeners, taskEnum)) { - if (obj instanceof BaseListenerInterface) { + if (obj instanceof DownloadTaskInternalListenerInterface) { listeners.put(taskEnum, obj); return; }