Merge pull request #23 from CodyyAndroid/dev

修复Downloader#pause id不在任务队列时,未更新数据库状态
CodyyAndroid · Jul 26, 2017 · ef5b512 · ef5b512
2 parents 6f72117 + 9322ffa
commit ef5b512
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -16,14 +16,14 @@ allprojects {
 ```
 dependencies {
             //如果项目中已有com.android.support.*包,则从Downloader中剔除;
-	        compile('com.github.CodyyAndroid:Downloader:1.1.4') {
+	        compile('com.github.CodyyAndroid:Downloader:1.1.5') {
                    exclude group: 'com.android.support'
             }
             //如果项目中无com.android.support.*包,则保留;
-            compile('com.github.CodyyAndroid:Downloader:1.1.4')
+            compile('com.github.CodyyAndroid:Downloader:1.1.5')
 	}
 
 ```
-## [API](https://jitpack.io/com/github/CodyyAndroid/Downloader/1.1.4/javadoc/)
+## [API](https://jitpack.io/com/github/CodyyAndroid/Downloader/1.1.5/javadoc/)
 
 
diff --git a/downloadlibrary/build.gradle b/downloadlibrary/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode 47
-        versionName "1.1.4"
+        versionCode 48
+        versionName "1.1.5"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -56,7 +56,7 @@ javadoc {
         author true
         version true
         links "http://docs.oracle.com/javase/7/docs/api"
-        title "下载库1.1.4"
+        title "下载库1.1.5"
     }
 }
 // 制作文档(Javadoc)

diff --git a/downloadlibrary/src/main/java/com/codyy/download/Downloader.java b/downloadlibrary/src/main/java/com/codyy/download/Downloader.java
@@ -25,7 +25,7 @@
  * 文件下载器
  * Created by lijian on 2017/6/7.
  *
- * @version 1.1.0
+ * @version 1.1.5
  */
 
 public class Downloader {

diff --git a/downloadlibrary/src/main/java/com/codyy/download/service/DownloadService.java b/downloadlibrary/src/main/java/com/codyy/download/service/DownloadService.java
@@ -334,9 +334,9 @@ public void pause(@NonNull String... ids) {
             if (mDownThreadMap.containsKey(id)) {
                 mDownThreadMap.get(id).pause();
                 mDownThreadMap.remove(id);
-                mDownloadDao.updateStatus(id, DownloadFlag.PAUSED);
-                sendPauseOrWaitingMessage(DownloadFlag.PAUSED, id);
             }
+            mDownloadDao.updateStatus(id, DownloadFlag.PAUSED);
+            sendPauseOrWaitingMessage(DownloadFlag.PAUSED, id);
         }
     }