Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

app/src/main/java/com/kfzs/duanduan/ActDownloadMgr.java

@@ -411,7 +411,7 @@ public class ActDownloadMgr extends BaseCompatActivity {
         pbProgress.setProgress(task.getPercent());
         targetBtn.setText(R.string.downloading);
 
-        setTaskStatusByDownloadUrl(url, DownloadTaskService.STATUS_ING, "");
+        setTaskStatusByDownloadUrl(url, DownloadTaskService.STATUS_ING, task.getDownloadPath());
     }
 
     @Download.onTaskStop void taskStop(DownloadTask task) {
@@ -444,7 +444,7 @@ public class ActDownloadMgr extends BaseCompatActivity {
         String url = task.getKey();
         KFProgressButton targetBtn = (KFProgressButton) lvDownloadMgr.findViewWithTag(DownloadMgrAdapter.PUBLIC_TAG_PREFIX_BUTTON + url);
         targetBtn.setText(R.string.download_fail);
-        setTaskStatusByDownloadUrl(url, DownloadTaskService.STATUS_FAIL, "");
+        setTaskStatusByDownloadUrl(url, DownloadTaskService.STATUS_FAIL, task.getDownloadPath());
     }
 
     @Download.onTaskComplete void taskComplete(DownloadTask task) {

app/src/main/java/com/sheep/gamegroup/model/entity/TaskEty.java

@@ -111,7 +111,7 @@ public class TaskEty implements Serializable{
     }
 
     public String getDownload_link() {
-        return download_link;
+        return download_link != null ? download_link.trim() : download_link;
     }
 
     public void setDownload_link(String download_link) {

app/src/main/java/com/sheep/gamegroup/view/activity/DialogActivity.java

@@ -211,7 +211,8 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                         task.stop();
                     } else if(task.getTaskState() == IEntity.STATE_FAIL){
                         task.cancel(true);
-                        task.reStart();
+                        task.resetState();
+                        task.removeRecord();
                     } else {
                         task.setFilePath(filePath);
                         task.start();