Skip to content

Commit 455eeb7

Browse files
committed
修复下载完成后m3u8为Null的bug
添加取消下载任务方法
1 parent 9e57767 commit 455eeb7

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed

library/src/main/java/jaygoo/library/m3u8downloader/M3U8Downloader.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.text.TextUtils;
44

5+
import java.io.File;
56
import java.util.ArrayList;
67
import java.util.LinkedList;
78
import java.util.List;
@@ -11,6 +12,7 @@
1112
import jaygoo.library.m3u8downloader.bean.M3U8Task;
1213
import jaygoo.library.m3u8downloader.bean.M3U8TaskState;
1314
import jaygoo.library.m3u8downloader.utils.M3U8Log;
15+
import jaygoo.library.m3u8downloader.utils.MUtils;
1416

1517
/**
1618
* ================================================
@@ -120,6 +122,27 @@ public void pause(String url){
120122
}
121123
}
122124

125+
/**
126+
* 取消任务
127+
* @param url
128+
*/
129+
public void cancel(String url){
130+
if (TextUtils.isEmpty(url) || isQuicklyClick())return;
131+
m3U8DownLoadTask.stop();
132+
downloadNextTask();
133+
}
134+
135+
/**
136+
* 取消任务,删除缓存
137+
* @param url
138+
*/
139+
public void cancelAndDelete(String url){
140+
if (TextUtils.isEmpty(url) || isQuicklyClick())return;
141+
m3U8DownLoadTask.stop();
142+
MUtils.clearDir(new File(MUtils.getSaveFileDir(url)));
143+
downloadNextTask();
144+
}
145+
123146
/**
124147
* 下载任务,如果当前任务在下载列表中则认为是插队,否则入队等候下载
125148
* @param url
@@ -211,6 +234,7 @@ public void onDownloading(long totalFileSize, long itemFileSize, int totalTs, in
211234
@Override
212235
public void onSuccess(M3U8 m3U8) {
213236
m3U8DownLoadTask.stop();
237+
currentM3U8Task.setM3U8(m3U8);
214238
currentM3U8Task.setState( M3U8TaskState.SUCCESS);
215239
if (onM3U8DownloadListener != null) {
216240
onM3U8DownloadListener.onDownloadSuccess(currentM3U8Task);

0 commit comments

Comments
 (0)