修复任务记录删除失败的问题

优化网络连接状态获取的逻辑
修复配置文件的某些配置失效的问题
新增m3u8切片状态注解`@M3U8.onPeerStart`,`@M3U8.onPeerComplete`,`@M3U8.onPeerFail`
新增动态指定m3u8协议视频的下载功能(边下边播)
This commit is contained in:
laoyuyu
2019-07-05 21:20:38 +08:00
parent 060b1f138e
commit b0818537f2
133 changed files with 2492 additions and 1199 deletions

View File

@@ -31,8 +31,6 @@ import java.lang.annotation.Target;
* }
* </code>
* </pre>
* {@literal @}Download.onPre("http://www.baidu.com")如果你的注解中增加了url描述
* 则表示,所有下载任务中,只有下载地址为"http://www.baidu.com"的任务才能回调该注解的方法。
*/
@Retention(RetentionPolicy.CLASS) @Target(ElementType.METHOD) public @interface Download {

View File

@@ -30,9 +30,6 @@ import java.lang.annotation.Target;
* }
* </code>
* </pre>
* {@literal @}Download.onPre("mGroupHash")如果你的注解中增加了url描述
* 则表示,所有下载任务中,只有下载地址为"myGroupHash"的任务才能回调该注解的方法。
*
*
* 如果希望获取子任务的状态可以使用onSub..类的注解
* <pre>

View File

@@ -0,0 +1,57 @@
/*
* 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.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* Created by lyy on 2019/6/25.
* M3U8 切片事件
* <pre>
* <code>
* {@literal @}M3U8.onPeerStart
* protected void onPeerStart(String m3u8Url, String peerPath, int peerIndex) {
* ...
* }
* </code>
* </pre>
*/
@Retention(RetentionPolicy.CLASS) @Target(ElementType.METHOD) public @interface M3U8 {
/**
* "@M3U8.onPeerStart"注解,切片开始下载
*/
@Retention(RetentionPolicy.CLASS) @Target(ElementType.METHOD) @interface onPeerStart {
String[] value() default { AriaConstance.NO_URL };
}
/**
* "@M3U8.onPeerFail注解切片下载失败
*/
@Retention(RetentionPolicy.CLASS) @Target(ElementType.METHOD) @interface onPeerFail {
String[] value() default { AriaConstance.NO_URL };
}
/**
* "@M3U8.onPeersComplete"注解,切片下载完成
*/
@Retention(RetentionPolicy.CLASS) @Target(ElementType.METHOD) @interface onPeerComplete {
String[] value() default { AriaConstance.NO_URL };
}
}

View File

@@ -0,0 +1,48 @@
/*
* 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.annotations;
/**
* Created by lyy on 2017/7/10.
* 任务类型枚举
*/
public enum TaskEnum {
DOWNLOAD("com.arialyy.aria.core.download", "DownloadTask", "$$DownloadListenerProxy",
"NormalTaskListener"),
DOWNLOAD_GROUP("com.arialyy.aria.core.download", "DownloadGroupTask",
"$$DownloadGroupListenerProxy", "NormalTaskListener"),
DOWNLOAD_GROUP_SUB("com.arialyy.aria.core.download", "DownloadGroupTask",
"$$DGSubListenerProxy", "SubTaskListener"),
UPLOAD("com.arialyy.aria.core.upload", "UploadTask", "$$UploadListenerProxy",
"NormalTaskListener"),
M3U8_PEER("com.arialyy.aria.core.download", "DownloadTask", "$$M3U8PeerListenerProxy",
"M3U8PeerTaskListener");
public String pkg, className, proxySuffix, proxySuperClass;
/**
* @param pkg 包名
* @param className 对应到任务类名
* @param proxySuffix 事件代理后缀
* @param proxySuperClass 代理类的父类
*/
TaskEnum(String pkg, String className, String proxySuffix, String proxySuperClass) {
this.pkg = pkg;
this.className = className;
this.proxySuffix = proxySuffix;
this.proxySuperClass = proxySuperClass;
}
}

View File

@@ -31,8 +31,6 @@ import java.lang.annotation.Target;
* }
* </code>
* </pre>
* {@literal @}Upload.onPre("/mnt/sdcard/test.zip")如果你的注解中增加了path描述
* 则表示,所有上传任务中,只有上传路径为"/mnt/sdcard/test.zip"的任务才能回调该注解的方法。
*/
@Retention(RetentionPolicy.CLASS) @Target(ElementType.METHOD) public @interface Upload {