Merge branch 'release/rxdownload2_v1.1.1'

ssseasonnn · Jan 17, 2017 · 24e935b · 24e935b
2 parents 66d4972 + be39a1f
commit 24e935b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -71,7 +71,7 @@ RxDownload 现在支持RxJava2, 只需将包名改为 ```zlc.season.rxdownload2.
 
 ```groovy
 	dependencies{
-   		 compile 'zlc.season:rxdownload2:1.1.0'
+   		 compile 'zlc.season:rxdownload2:1.1.1'
 	}
 ```
 

diff --git a/rxdownload2/bintray.gradle b/rxdownload2/bintray.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
 // This is the library version used when deploying the artifact
-version = "1.1.0"
+version = "1.1.1"
 
 def siteUrl = 'https://github.com/ssseasonnn/RxDownload'      // 项目的主页
 def gitUrl = 'https://github.com/ssseasonnn/RxDownload.git'   // Git仓库的url

diff --git a/rxdownload2/src/main/java/zlc/season/rxdownload2/RxDownload.java b/rxdownload2/src/main/java/zlc/season/rxdownload2/RxDownload.java
@@ -168,7 +168,7 @@ public ObservableSource<? extends DownloadEvent> apply(Object o) throws Exceptio
     }
 
     /**
-     * Read all the download record from the database
+     * Read all the download record from the database.
      * 从数据库中读取所有的下载记录
      *
      * @return Observable<List<DownloadRecord>>
@@ -184,7 +184,10 @@ public Observable<List<DownloadRecord>> getTotalDownloadRecords() {
 
     /**
      * Read single download record with url.
-     * 从数据库中读取下载地址为url的下载记录
+     * If record exists, return correct record, else return empty record.
+     * <p>
+     * 从数据库中读取下载地址为url的下载记录, 如果数据库中存在该记录，则正常返回.
+     * 如果不存在该记录，则返回一个空的DownloadRecord(url = null, saveName = null.)
      *
      * @param url download url
      *

diff --git a/rxdownload2/src/main/java/zlc/season/rxdownload2/db/DataBaseHelper.java b/rxdownload2/src/main/java/zlc/season/rxdownload2/db/DataBaseHelper.java
@@ -159,6 +159,15 @@ public long repairErrorFlag() {
                 new String[]{DownloadFlag.WAITING + "", DownloadFlag.STARTED + ""});
     }
 
+    /**
+     * 获得url对应的下载记录
+     * <p>
+     * ps: 如果数据库中没有记录，则返回一个空的DownloadRecord.
+     *
+     * @param url url
+     *
+     * @return record
+     */
     public Observable<DownloadRecord> readRecord(final String url) {
         return Observable.create(new ObservableOnSubscribe<DownloadRecord>() {
             @Override
@@ -167,7 +176,10 @@ public void subscribe(ObservableEmitter<DownloadRecord> emitter) throws Exceptio
                 try {
                     cursor = getReadableDatabase().rawQuery("select * from " + TABLE_NAME +
                             " where " + "url=?", new String[]{url});
-                    while (cursor.moveToNext()) {
+                    if (cursor.getCount() == 0) {
+                        emitter.onNext(new DownloadRecord());
+                    } else {
+                        cursor.moveToFirst();
                         emitter.onNext(Db.RecordTable.read(cursor));
                     }
                     emitter.onComplete();