修复组合任务初始化失败时，无法删除的问题

修复`reStart()`后，无法停止的问题 ftp增加主动模式，开启主动模式：https://aria.laoyuyu.me/aria_doc/api/ftp_params.html 优化提示
2019-12-16 20:18:45 +08:00
parent f3d5e0135a
commit 0d93953cd9
33 changed files with 446 additions and 197 deletions
--- a/app/src/main/java/com/arialyy/simple/core/download/FtpDownloadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/FtpDownloadActivity.java
@@ -23,6 +23,7 @@ import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
+import com.arialyy.aria.core.common.FtpConnectionMode;
 import com.arialyy.aria.core.common.FtpOption;
 import com.arialyy.aria.core.download.DownloadEntity;
 import com.arialyy.aria.core.inf.IEntity;
@@ -80,11 +81,11 @@ public class FtpDownloadActivity extends BaseActivity<ActivityFtpDownloadBinding
      }
    });
    getBinding().setViewModel(this);
-    try {
-      getBinding().codeView.setSource(AppUtil.getHelpCode(this, "FtpDownload.java"));
-    } catch (IOException e) {
-      e.printStackTrace();
-    }
+    //try {
+    //  getBinding().codeView.setSource(AppUtil.getHelpCode(this, "FtpDownload.java"));
+    //} catch (IOException e) {
+    //  e.printStackTrace();
+    //}
  }

  public void onClick(View view) {
@@ -123,6 +124,7 @@ public class FtpDownloadActivity extends BaseActivity<ActivityFtpDownloadBinding
  private FtpOption getFtpOption() {
    FtpOption option = new FtpOption();
    option.login(user, passw);
+    option.setConnectionMode(FtpConnectionMode.DATA_CONNECTION_MODE_ACTIVITY);
    return option;
  }

--- a/app/src/main/java/com/arialyy/simple/core/download/FtpDownloadModule.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/FtpDownloadModule.java
@@ -47,7 +47,8 @@ public class FtpDownloadModule extends BaseViewModule {
   *
   */
  LiveData<DownloadEntity> getFtpDownloadInfo(Context context) {
-    String url = AppUtil.getConfigValue(context, FTP_URL_KEY, ftpDefUrl);
+    //String url = AppUtil.getConfigValue(context, FTP_URL_KEY, ftpDefUrl);
+    String url = "ftp://9.9.9.72:2121/Cyberduck-6.9.4.30164.zip";
    String filePath = AppUtil.getConfigValue(context, FTP_PATH_KEY, ftpDefPath);

    singDownloadInfo = Aria.download(context).getFirstDownloadEntity(url);
--- a/app/src/main/java/com/arialyy/simple/core/download/HttpDownloadModule.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/HttpDownloadModule.java
@@ -54,11 +54,12 @@ public class HttpDownloadModule extends BaseViewModule {
    //String url = "http://image.totwoo.com/totwoo-TOTWOO-v3.5.6.apk";
    //String url = "http://fdfs.speedata.cn:9989/group1/M00/00/05/rBGFrl3fdAKAVJwfMtSa9R18wLU139.zip";
    //String url = "http://9.9.9.28:8088/files/update.zip";
-    String url = "https://ss1.baidu.com/-4o3dSag_xI4khGko9WTAnF6hhy/image/h%3D300/sign=a9e671b9a551f3dedcb2bf64a4eff0ec/4610b912c8fcc3cef70d70409845d688d53f20f7.jpg";
+    //String url = "https://ss1.baidu.com/-4o3dSag_xI4khGko9WTAnF6hhy/image/h%3D300/sign=a9e671b9a551f3dedcb2bf64a4eff0ec/4610b912c8fcc3cef70d70409845d688d53f20f7.jpg";
    //String url = "https://imtt.dd.qq.com/16891/apk/70BFFDB05AB8686F2A4CF3E07588A377.apk?fsname=com.tencent.tmgp.speedmobile_1.16.0.33877_1160033877.apk&csr=1bbd";
    //String url = "https://ss1.baidu.com/-4o3dSag_xI4khGko9WTAnF6hhy/image/h%3D300/sign=a9e671b9a551f3dedcb2bf64a4eff0ec/4610b912c8fcc3cef70d70409845d688d53f20f7.jpg";
    //String filePath = AppUtil.getConfigValue(context, HTTP_PATH_KEY, defFilePath);
-    String filePath = "/mnt/sdcard/gg.png";
+    String url = "https://y.qq.com/download/import/QQMusic-import-1.2.1.zip";
+    String filePath = "/mnt/sdcard/QQMusic-import-1.2.1.zip";
    //String filePath = "/mnt/sdcard/update.zip";

    singDownloadInfo = Aria.download(context).getFirstDownloadEntity(url);
--- a/app/src/main/java/com/arialyy/simple/core/download/SingleTaskActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/SingleTaskActivity.java
@@ -32,6 +32,7 @@ import androidx.lifecycle.ViewModelProviders;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.common.HttpOption;
+import com.arialyy.aria.core.common.RequestEnum;
 import com.arialyy.aria.core.download.DownloadEntity;
 import com.arialyy.aria.core.inf.IEntity;
 import com.arialyy.aria.core.listener.ISchedulers;
@@ -116,11 +117,6 @@ public class SingleTaskActivity extends BaseActivity<ActivitySingleBinding> {
      }
    });
    getBinding().setViewModel(this);
-    try {
-      getBinding().codeView.setSource(AppUtil.getHelpCode(this, "HttpDownload.java"));
-    } catch (IOException e) {
-      e.printStackTrace();
-    }
  }

  public void chooseUrl() {
@@ -279,10 +275,9 @@ public class SingleTaskActivity extends BaseActivity<ActivitySingleBinding> {
              .load(mTaskId)
              .stop();
        } else {
-          mUrl = "http://sdkdown.muzhiwan.com/openfile/2019/07/11/com.netease.syfz.mzw_5d26f8d9cee27.apk";
-          Aria.download(this).load(mTaskId)
+          mTaskId = Aria.download(this).load(mTaskId)
              //.updateUrl(mUrl)
-              .resume();
+              .reStart();
        }
        break;
      case R.id.cancel:
@@ -296,6 +291,7 @@ public class SingleTaskActivity extends BaseActivity<ActivitySingleBinding> {
    option.addHeader("1", "@")
        .useServerFileName(true)
        .setFileLenAdapter(new FileLenAdapter());
+    //option.setRequestType(RequestEnum.POST);
    mTaskId = Aria.download(SingleTaskActivity.this)
        .load(mUrl)
        .setFilePath(mFilePath, true)
--- a/app/src/main/java/com/arialyy/simple/core/download/mutil/DownloadAdapter.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/mutil/DownloadAdapter.java
@@ -298,7 +298,7 @@ public class DownloadAdapter extends AbsRVAdapter<AbsEntity, DownloadAdapter.Sim
        Aria.download(getContext()).load(entity.getId()).cancel(true);
        break;
      case ITaskWrapper.DG_HTTP:
-        Aria.download(getContext()).load(entity.getId()).cancel(true);
+        Aria.download(getContext()).loadGroup(entity.getId()).cancel(true);
        break;
    }
  }
--- a/app/src/main/java/com/arialyy/simple/core/download/mutil/FileListAdapter.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/mutil/FileListAdapter.java
@@ -24,6 +24,7 @@ import android.widget.Toast;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.m3u8.M3U8VodOption;
 import com.arialyy.aria.core.processor.IVodTsUrlConverter;
+import com.arialyy.aria.util.ALog;
 import com.arialyy.simple.R;
 import com.arialyy.simple.base.adapter.AbsHolder;
 import com.arialyy.simple.base.adapter.AbsRVAdapter;
@@ -88,6 +89,7 @@ final class FileListAdapter extends AbsRVAdapter<FileListEntity, FileListAdapter
                  .setGroupAlias(item.name)
                  .unknownSize()
                  .create();
+              ALog.d(TAG, "getGroupTaskList = " +  Aria.download(this).getGroupTaskList().size());
              break;
            case 2:
              M3U8VodOption option = new M3U8VodOption();
--- a/app/src/main/res/layout/activity_ftp_download.xml
+++ b/app/src/main/res/layout/activity_ftp_download.xml
@@ -76,11 +76,11 @@
        bind:stateStr="@{stateStr}"
        />

-    <com.arialyy.simple.widget.CodeView
-        android:id="@+id/code_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        />
+<!--    <com.arialyy.simple.widget.CodeView-->
+<!--        android:id="@+id/code_view"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="match_parent"-->
+<!--        />-->

  </LinearLayout>
 </layout>
--- a/app/src/main/res/layout/activity_single.xml
+++ b/app/src/main/res/layout/activity_single.xml
@@ -76,11 +76,5 @@
        bind:stateStr="@{stateStr}"
        />

-    <com.arialyy.simple.widget.CodeView
-        android:id="@+id/code_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        />
-
  </LinearLayout>
 </layout>