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

app/src/main/java/com/kfzs/duanduan/services/DownloadTaskService.java

@@ -270,7 +270,7 @@ public class DownloadTaskService {
     }
 
     public void setDownloadTaskPercent(int percent, double downloadedSize, double totalSize, int downloadTaskId, String downloadUrl) {
-        DDProviderHelper.getInstance().updateDownloadPercent(ctx, percent, downloadedSize, totalSize, downloadTaskId, downloadUrl);
+        DDProviderHelper.getInstance().updateDownloadPercent(ctx, percent, downloadedSize, totalSize, downloadTaskId, downloadUrl,DownloadTaskService.STATUS_ING);
 
 
 
@@ -342,6 +342,9 @@ public class DownloadTaskService {
     public void start(DownLoadInfo downLoadInfo) {
         DownloadTarget task = Aria.download(KFZSApp.getInstance()).load(downLoadInfo.getMDownloadUrl());
         String filePath = DIR+ File.separator+downLoadInfo.getMPackageName()+ ClassFileHelper.FILE_SUFFIX;
+        if(TextUtils.isEmpty(downLoadInfo.getMPackageName())){
+            filePath = DIR+ File.separator+downLoadInfo.getMGameName()+ ClassFileHelper.FILE_SUFFIX;
+        }
         task.setFilePath(filePath).start();
     }
 

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

@@ -191,6 +191,10 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
      * 开始任务或者下载游戏、试玩
      */
     private void startStask() {
+        if(TextUtils.isEmpty(task_entity.getDownload_link()) || !task_entity.getDownload_link().contains("http")){
+            G.showToast("下载地址错误!");
+            return;
+        }
         DownloadTarget task = Aria.download(this).load(task_entity.getDownload_link());
         String filePath = DIR+ File.separator+task_entity.getPackage_names()+ ClassFileHelper.FILE_SUFFIX;
         try{

datashare/src/main/java/com/kfzs/duanduan/datashare/DDProviderHelper.java

@@ -543,13 +543,14 @@ public class DDProviderHelper {
      * @param downloadTaskId
      * @param downloadUrl
      */
-    public void updateDownloadPercent(Context ctx, int percent, double downloadedSize, double totalSize, int downloadTaskId, String downloadUrl) {
+    public void updateDownloadPercent(Context ctx, int percent, double downloadedSize, double totalSize, int downloadTaskId, String downloadUrl, int state) {
         DownLoadInfo downloadTask = getDownloadTask(ctx, downloadUrl);
         if (downloadTask != null) {
             downloadTask.setMPercent(percent);
             downloadTask.setMTotalSize(totalSize);
             downloadTask.setMDownloadedSize(downloadedSize);
             downloadTask.setMDownloadTaskId(downloadTaskId);
+            downloadTask.setMStatus(state);//2下载中
             updateDownload(ctx, downloadTask);
         }
     }