Skip to content

Commit 94f900b

Browse files
author
aigestudio
committed
Add method getDLInfo getDLDBManager
1 parent a0b5054 commit 94f900b

File tree

10 files changed

+36
-48
lines changed

10 files changed

+36
-48
lines changed

‎.idea/encodings.xml

-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Demo/Demo.iml

+2-9
Original file line numberDiff line numberDiff line change
@@ -65,25 +65,18 @@
6565
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
6767
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6968
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
69+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
7170
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7271
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7472
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.1.1/jars" />
7573
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
8074
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
8275
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
8476
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8577
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8678
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
8780
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
8881
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8982
</content>

‎Demo/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ dependencies {
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
2424
compile project(':Downloader')
2525
compile 'com.android.support:support-v4:22.1.1'
26-
// compile 'cn.aigestudio.downloader:Downloader:1.3.7'
26+
// compile 'cn.aigestudio.downloader:Downloader:1.4.1'
2727
}

‎Downloader/Downloader.iml

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":Downloader" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="MultiThreadDownloader" external.system.module.version="1.4.1" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":Downloader" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="MultiThreadDownloader" external.system.module.version="1.4.2" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -69,19 +69,9 @@
6969
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
7070
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
7171
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
72-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
7372
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7673
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
8074
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
8575
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8676
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8777
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />

‎Downloader/build.gradle

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
apply plugin: 'com.android.library'
22

3-
version = "1.4.1"
3+
version = "1.4.2"
44

55
android {
66
compileSdkVersion 23
77
buildToolsVersion "23.0.1"
8+
resourcePrefix "aigestudio_downloader"
89

910
defaultConfig {
1011
minSdkVersion 1
1112
targetSdkVersion 23
12-
versionCode 5
13+
versionCode 8
1314
versionName version
1415
}
1516
buildTypes {

‎Downloader/src/main/java/cn/aigestudio/downloader/bizs/DLInfo.java

+8-7
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,17 @@
1212
*
1313
* @author AigeStudio 2015-05-16
1414
*/
15-
class DLInfo {
15+
public class DLInfo {
16+
public int totalBytes;
17+
public int currentBytes;
18+
public String fileName;
19+
public String dirPath;
20+
public String baseUrl;
21+
public String realUrl;
22+
1623
int redirect;
17-
int totalBytes;
18-
int currentBytes;
1924
boolean hasListener;
2025
boolean isResume;
21-
String fileName;
22-
String dirPath;
23-
String baseUrl;
24-
String realUrl;
2526
String mimeType;
2627
String eTag;
2728
String disposition;

‎Downloader/src/main/java/cn/aigestudio/downloader/bizs/DLManager.java

+12
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@
6969
* 修复下载无法取消问题
7070
* 优化线程分配
7171
* 优化下载逻辑提升执行效率
72+
* @author AigeStudio 2015-11-27
73+
* 新增{@link #getDLInfo(String)}方法获取瞬时下载信息
74+
* 新增{@link #getDLDBManager()}方法获取数据库管理对象
7275
*/
7376
public final class DLManager {
7477
private static final String TAG = DLManager.class.getSimpleName();
@@ -290,6 +293,15 @@ public void dlCancel(String url) {
290293
DLDBManager.getInstance(context).deleteAllThreadInfo(url);
291294
}
292295

296+
public DLInfo getDLInfo(String url) {
297+
return DLDBManager.getInstance(context).queryTaskInfo(url);
298+
}
299+
300+
@Deprecated
301+
public DLDBManager getDLDBManager() {
302+
return DLDBManager.getInstance(context);
303+
}
304+
293305
synchronized DLManager removeDLTask(String url) {
294306
TASK_DLING.remove(url);
295307
return sManager;

‎Downloader/src/main/java/cn/aigestudio/downloader/bizs/DLThread.java

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public void run() {
5858
listener.onFinish(dlThreadInfo);
5959
}
6060
} catch (IOException e) {
61+
listener.onStop(dlThreadInfo);
6162
e.printStackTrace();
6263
} finally {
6364
try {

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ allprojects {
1111
repositories {
1212
jcenter()
1313
}
14-
}
14+
}

0 commit comments

Comments
 (0)