修复无法自动识别含有账号的ftpurl地址 https://github.com/AriaLyy/Aria/issues/146

app/src/main/java/com/arialyy/simple/MainActivity.java

@@ -47,7 +47,7 @@ public class MainActivity extends BaseActivity<ActivityMainBinding> {
 
   @OnClick({
       R.id.download, R.id.upload, R.id.download_task_group, R.id.ftp_download,
-      R.id.ftp_dir_download, R.id.ftp_upload
+      R.id.ftp_dir_download, R.id.ftp_upload, R.id.kotlin_download
   }) public void funcation(View view) {
     switch (view.getId()) {
       case R.id.download:
@@ -68,7 +68,9 @@ public class MainActivity extends BaseActivity<ActivityMainBinding> {
       case R.id.ftp_upload:
         startActivity(new Intent(this, FtpUploadActivity.class));
         break;
+      case R.id.kotlin_download:
+        //startActivity(new Intent(this, KotlinDownloadActivity.class));
+        break;
     }
   }
-
 }

app/src/main/java/com/arialyy/simple/download/FtpDownloadActivity.java

@@ -35,7 +35,9 @@ import java.io.File;
  * Ftp下载测试
  */
 public class FtpDownloadActivity extends BaseActivity<ActivityFtpDownloadBinding> {
-  private final String URL = "ftp://172.18.104.229:21/haha/测试ss123/ftp_test.apk";
+  private final String URL = "ftp://d:d@dygodj8.com:12311/[电影天堂www.dy2018.com]光辉岁月BD韩语中字.rmvb";
+  //private final String URL = "ftp://192.168.1.9:21/下载/AriaPrj.zip";
+  //private final String URL = "ftp://192.168.1.9:21/下载/[电影天堂www.dy2018.com]赛车总动员3BD中英双字.mp4";
 
   @Override protected void init(Bundle savedInstanceState) {
     super.init(savedInstanceState);
@@ -56,11 +58,10 @@ public class FtpDownloadActivity extends BaseActivity<ActivityFtpDownloadBinding
   public void onClick(View view) {
     switch (view.getId()) {
       case R.id.start:
-        Aria.download(this)
-            .loadFtp(URL, true)
-            .login("lao", "123456")
-            .setDownloadPath("/mnt/sdcard/")
-            .start();
+        Aria.download(this).loadFtp(URL, true)
+            .charSet("GBK")
+            //.login("lao", "123456")
+            .setDownloadPath("/mnt/sdcard/").start();
         break;
       case R.id.stop:
         Aria.download(this).loadFtp(URL).stop();

app/src/main/java/com/arialyy/simple/download/KotlinDownloadActivity.kt

@@ -0,0 +1,73 @@
+package com.arialyy.simple.download
+
+import android.os.Bundle
+import android.os.Environment
+import android.support.v7.app.AppCompatActivity
+import android.util.Log
+import android.view.View
+import com.arialyy.annotations.Download
+import com.arialyy.aria.core.Aria
+import com.arialyy.aria.core.download.DownloadTask
+import com.arialyy.simple.R
+import com.arialyy.simple.base.BaseActivity
+
+/**
+ * Created by Aria.Lao on 2017/10/23.
+ */
+class KotlinDownloadActivity : AppCompatActivity() {
+
+  private val DOWNLOAD_URL = "http://static.gaoshouyou.com/d/22/94/822260b849944492caadd2983f9bb624.apk"
+
+  private val TAG = "KotlinDownloadActivity";
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(setLayoutId())
+  }
+
+  fun setLayoutId(): Int {
+    return R.layout.activity_single
+  }
+
+  fun init(savedInstanceState: Bundle?) {
+    title = "单任务下载"
+//    val target = Aria.download(this).load(DOWNLOAD_URL)
+//    binding.progress = target.getPercent()
+//    if (target.getTaskState() == IEntity.STATE_STOP) {
+//      mStart.setText("恢复")
+//      mStart.setTextColor(resources.getColor(android.R.color.holo_blue_light))
+//      setBtState(true)
+//    } else if (target.isDownloading()) {
+//      setBtState(false)
+//    }
+//    binding.fileSize = target.getConvertFileSize()
+    Aria.download(this).register()
+  }
+
+  @Download.onTaskRunning protected fun running(task: DownloadTask) {
+    Log.d(TAG, task.percent.toString() + "")
+    val len = task.fileSize
+//    if (len == 0L) {
+//      binding.progress = 0
+//    } else {
+//      binding.progress = task.percent
+//    }
+//    binding.speed = task.convertSpeed
+  }
+
+  fun onClick(view: View) {
+    when (view.id) {
+      R.id.start -> startD()
+      R.id.stop -> Aria.download(this).load(DOWNLOAD_URL).stop()
+      R.id.cancel -> Aria.download(this).load(DOWNLOAD_URL).cancel()
+    }
+  }
+
+  private fun startD() {
+    Aria.download(this)
+        .load(DOWNLOAD_URL, true)
+        .addHeader("groupName", "value")
+        .setDownloadPath(Environment.getExternalStorageDirectory().path + "/hhhhhhhh.apk")
+        .start()
+  }
+}

app/src/main/java/com/arialyy/simple/download/SingleTaskActivity.java

@@ -18,6 +18,7 @@ package com.arialyy.simple.download;
 
 import android.os.Bundle;
 import android.os.Environment;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -125,6 +126,7 @@ public class SingleTaskActivity extends BaseActivity<ActivitySingleBinding> {
   }
 
   @Download.onTaskRunning(DOWNLOAD_URL) protected void running(DownloadTask task) {
+
     long len = task.getFileSize();
     if (len == 0) {
       getBinding().setProgress(0);
@@ -195,11 +197,6 @@ public class SingleTaskActivity extends BaseActivity<ActivitySingleBinding> {
   public void onClick(View view) {
     switch (view.getId()) {
       case R.id.start:
-        startD();
-        startD();
-        startD();
-        startD();
-        startD();
         startD();
         //new Thread(new Runnable() {
         //  @Override public void run() {