fix bug https://github.com/AriaLyy/Aria/issues/799 https://github.com/AriaLyy/Aria/issues/798

Aria/src/main/java/com/arialyy/aria/core/common/SFtpOption.java

@@ -35,7 +35,7 @@ public class SFtpOption extends BaseOption {
 
   public SFtpOption() {
     super();
-    ComponentUtil.getInstance().checkComponentExist(ComponentUtil.COMPONENT_TYPE_M3U8);
+    ComponentUtil.getInstance().checkComponentExist(ComponentUtil.COMPONENT_TYPE_SFTP);
   }
 
   public SFtpOption charSet(String charSet) {

FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpSubDLoaderUtil.java

@@ -19,6 +19,7 @@ import android.os.Handler;
 import com.arialyy.aria.core.download.DTaskWrapper;
 import com.arialyy.aria.core.group.AbsSubDLoadUtil;
 import com.arialyy.aria.core.group.SubRecordHandler;
+import com.arialyy.aria.core.loader.GroupSubThreadStateManager;
 import com.arialyy.aria.core.loader.LoaderStructure;
 import com.arialyy.aria.core.loader.NormalTTBuilder;
 import com.arialyy.aria.core.loader.SubLoader;
@@ -48,6 +49,7 @@ final class FtpSubDLoaderUtil extends AbsSubDLoadUtil {
   @Override protected LoaderStructure buildLoaderStructure() {
     LoaderStructure structure = new LoaderStructure();
     structure.addComponent(new SubRecordHandler(getWrapper()))
+        .addComponent(new GroupSubThreadStateManager(getSchedulers(),getKey()))
         .addComponent(new NormalTTBuilder(getWrapper(), new FtpDTTBuilderAdapter()))
         .addComponent(new FtpDFileInfoTask(getWrapper()));
     structure.accept(getLoader());

app/src/main/java/com/arialyy/simple/core/download/FtpDownloadModule.java

@@ -33,7 +33,7 @@ public class FtpDownloadModule extends BaseViewModule {
   private final String FTP_URL_KEY = "FTP_URL_KEY";
   private final String FTP_PATH_KEY = "FTP_PATH_KEY";
 
-  private final String ftpDefUrl = "ftp://9.9.9.50:2121/Cyberduck-6.9.4.30164.zip";
+  private final String ftpDefUrl = "ftp://192.168.0.104:2121/qqqq.exe";
   private final String ftpDefPath =
       Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getPath();
 
@@ -46,12 +46,12 @@ public class FtpDownloadModule extends BaseViewModule {
   LiveData<DownloadEntity> getFtpDownloadInfo(Context context) {
     //String url = AppUtil.getConfigValue(context, FTP_URL_KEY, ftpDefUrl);
     //String filePath = AppUtil.getConfigValue(context, FTP_PATH_KEY, ftpDefPath);
-    String url = "ftp://9.9.9.72:2121/Cyberduck-6.9.4.30164.zip";
+    //String url = "ftp://9.9.9.72:2121/Cyberduck-6.9.4.30164.zip";
 
-    singDownloadInfo = Aria.download(context).getFirstDownloadEntity(url);
+    singDownloadInfo = Aria.download(context).getFirstDownloadEntity(ftpDefUrl);
     if (singDownloadInfo == null) {
       singDownloadInfo = new DownloadEntity();
-      singDownloadInfo.setUrl(url);
+      singDownloadInfo.setUrl(ftpDefUrl);
       String name = getFileName(ftpDefUrl);
       singDownloadInfo.setFileName(name);
       singDownloadInfo.setFilePath(ftpDefPath + name);

app/src/main/java/com/arialyy/simple/core/download/group/FTPDirDownloadActivity.java

@@ -36,7 +36,7 @@ import com.arialyy.simple.widget.SubStateLinearLayout;
  * Created by lyy on 2017/7/6.
  */
 public class FTPDirDownloadActivity extends BaseActivity<ActivityDownloadGroupBinding> {
-  private static final String dir = "ftp://9.9.9.72:2121/upload/测试";
+  private static final String dir = "ftp://192.168.0.104:2121/aab/你好";
 
   private SubStateLinearLayout mChildList;
   private long mTaskId = -1;
@@ -51,8 +51,10 @@ public class FTPDirDownloadActivity extends BaseActivity<ActivityDownloadGroupBi
     if (entity != null) {
       mTaskId = entity.getId();
       mChildList.addData(entity.getSubEntities());
-      getBinding().pl.setInfo(entity);
+    }else {
+      entity = new DownloadGroupEntity();
     }
+    getBinding().pl.setInfo(entity);
     getBinding().pl.setBtListener(new ProgressLayout.OnProgressLayoutBtListener() {
       @Override public void create(View v, AbsEntity entity) {
         mTaskId = Aria.download(this)

app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8VodModule.java

@@ -34,7 +34,8 @@ public class M3U8VodModule extends BaseViewModule {
   // m3u8测试集合：http://www.voidcn.com/article/p-snaliarm-ct.html
   //private final String defUrl = "https://www.gaoya123.cn/2019/1557993797897.m3u8";
   // 多码率地址：
-  private final String defUrl = "http://devimages.apple.com/iphone/samples/bipbop/bipbopall.m3u8";
+  //private final String defUrl = "http://devimages.apple.com/iphone/samples/bipbop/bipbopall.m3u8";
+  private final String defUrl = "https://5.voooe.cn/cache/youku/4e00b49a6e4f11155967c2cb3385a2ab.m3u8";
   //private final String defUrl = "http://pp3zvsk2n.bkt.clouddn.com/20200806/sd/15967206011811803/38475fadd55e4ecea3.m3u8";
   //private final String defUrl = "http://youku.cdn7-okzy.com/20200123/16815_fbe419ed/index.m3u8";
 

build.gradle

@@ -45,7 +45,7 @@ task clean(type: Delete) {
 
 ext {
   versionCode = 390
-  versionName = '3.8.14'
+  versionName = '3.8.15-bate-1'
   userOrg = 'arialyy'
   groupId = 'com.arialyy.aria'
   publishVersion = versionName