fix bug https://github.com/AriaLyy/Aria/issues/450

fix bug https://github.com/AriaLyy/Aria/issues/466 fix bug https://github.com/AriaLyy/Aria/issues/454 移除隐藏api的反射 https://github.com/AriaLyy/Aria/issues/456 新增ftp免证书登陆功能 https://github.com/AriaLyy/Aria/issues/455
2019-09-03 20:06:19 +08:00
parent 202e664530 86c3003b29
commit 22c81369b5
112 changed files with 1075 additions and 718 deletions
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@

  <uses-permission android:name="android.permission.INTERNET"/>
  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

  <application
@@ -32,9 +33,9 @@

    <activity android:name=".core.download.DownloadActivity"/>
    <activity android:name=".core.download.SingleTaskActivity"/>
-    <activity android:name=".core.download.multi_download.MultiTaskActivity"/>
-    <activity android:name=".core.download.fragment_download.FragmentActivity"/>
-    <activity android:name=".core.download.multi_download.MultiDownloadActivity"/>
+    <activity android:name=".core.download.mutil.MultiTaskActivity"/>
+    <activity android:name=".core.download.fragment.FragmentActivity"/>
+    <activity android:name=".core.download.mutil.MultiDownloadActivity"/>
    <activity android:name=".core.download.HighestPriorityActivity"/>
    <activity android:name=".core.download.group.DownloadGroupActivity"/>
    <activity android:name=".core.download.FtpDownloadActivity"/>
@@ -42,6 +43,7 @@
    <activity android:name=".core.upload.HttpUploadActivity"/>
    <activity android:name=".core.upload.FtpUploadActivity"/>
    <activity android:name=".core.download.KotlinDownloadActivity"/>
+    <activity android:name=".core.download.ComponentActivity"/>
    <activity
        android:name=".core.FullScreenCodeActivity"
        android:screenOrientation="landscape"
@@ -50,7 +52,7 @@
    <activity android:name=".core.download.m3u8.M3U8VodDLoadActivity"/>
    <activity android:name=".core.download.m3u8.M3U8LiveDLoadActivity"/>

-    <service android:name=".core.download.service_download.DownloadService"/>
+    <service android:name=".core.download.service.DownloadService"/>

    <provider
        android:name="androidx.core.content.FileProvider"
--- a/app/src/main/java/com/arialyy/simple/base/BaseApplication.java
+++ b/app/src/main/java/com/arialyy/simple/base/BaseApplication.java
@@ -21,6 +21,7 @@ import android.os.StrictMode;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.frame.core.AbsFrame;
 import com.arialyy.simple.BuildConfig;
+import com.squareup.leakcanary.LeakCanary;

 /**
 * Created by Lyy on 2016/9/27.
@@ -41,12 +42,12 @@ public class BaseApplication extends Application {
      //    .build());
      //StrictMode.setThreadPolicy(
      //    new StrictMode.ThreadPolicy.Builder().detectAll().penaltyLog().build());
-      //if (LeakCanary.isInAnalyzerProcess(this)) {//1
-      //  //This process is dedicated to LeakCanary for heap analysis.
-      //  //You should not init your app in this process.
-      //  return;
-      //}
-      //LeakCanary.install(this);
+      if (LeakCanary.isInAnalyzerProcess(this)) {//1
+        //This process is dedicated to LeakCanary for heap analysis.
+        //You should not init your app in this process.
+        return;
+      }
+      LeakCanary.install(this);
    }

    //registerReceiver(new ConnectionChangeReceiver(), new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
--- a/app/src/main/java/com/arialyy/simple/common/NormalToAdapter.java
+++ b/app/src/main/java/com/arialyy/simple/common/NormalToAdapter.java
@@ -0,0 +1,45 @@
+package com.arialyy.simple.common;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.TextView;
+import androidx.appcompat.widget.AppCompatImageView;
+import com.arialyy.simple.R;
+import com.arialyy.simple.base.adapter.AbsHolder;
+import com.arialyy.simple.base.adapter.AbsRVAdapter;
+import com.arialyy.simple.to.NormalTo;
+import java.util.List;
+
+/**
+ * normalto实体对应的简单适配器
+ */
+public class NormalToAdapter extends AbsRVAdapter<NormalTo, NormalToAdapter.Holder> {
+
+  public NormalToAdapter(Context context, List<NormalTo> data) {
+    super(context, data);
+  }
+
+  @Override protected NormalToAdapter.Holder getViewHolder(View convertView, int viewType) {
+    return new NormalToAdapter.Holder(convertView);
+  }
+
+  @Override protected int setLayoutId(int type) {
+    return R.layout.item_download;
+  }
+
+  @Override protected void bindData(NormalToAdapter.Holder holder, int position, NormalTo item) {
+    holder.text.setText(item.title);
+    holder.image.setImageResource(item.icon);
+  }
+
+  class Holder extends AbsHolder {
+    TextView text;
+    AppCompatImageView image;
+
+    Holder(View itemView) {
+      super(itemView);
+      text = findViewById(R.id.title);
+      image = findViewById(R.id.image);
+    }
+  }
+}
--- a/app/src/main/java/com/arialyy/simple/core/download/ComponentActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/ComponentActivity.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2016 AriaLyy(https://github.com/AriaLyy/Aria)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.arialyy.simple.core.download;
+
+import android.os.Bundle;
+import android.view.View;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import com.arialyy.simple.MainActivity;
+import com.arialyy.simple.R;
+import com.arialyy.simple.base.BaseActivity;
+import com.arialyy.simple.base.adapter.RvItemClickSupport;
+import com.arialyy.simple.common.NormalToAdapter;
+import com.arialyy.simple.core.download.fragment.FragmentActivity;
+import com.arialyy.simple.databinding.ActivityComponentBinding;
+import com.arialyy.simple.modlue.CommonModule;
+import com.arialyy.simple.to.NormalTo;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ComponentActivity extends BaseActivity<ActivityComponentBinding> {
+  @Override protected int setLayoutId() {
+    return R.layout.activity_component;
+  }
+
+  @Override protected void init(Bundle savedInstanceState) {
+    super.init(savedInstanceState);
+    NormalTo to = getIntent().getParcelableExtra(MainActivity.KEY_MAIN_DATA);
+    setTitle(to.title);
+
+    final List<NormalTo> data = new ArrayList<>();
+    getBinding().list.setLayoutManager(new GridLayoutManager(this, 2));
+    final NormalToAdapter adapter = new NormalToAdapter(this, data);
+    getBinding().list.setAdapter(adapter);
+    final CommonModule module = ViewModelProviders.of(this).get(CommonModule.class);
+
+    module.getComponentData(this).observe(this,
+        new Observer<List<NormalTo>>() {
+          @Override public void onChanged(@Nullable List<NormalTo> normalTos) {
+            if (normalTos != null) {
+              data.addAll(normalTos);
+              adapter.notifyDataSetChanged();
+            }
+          }
+        });
+    RvItemClickSupport.addTo(getBinding().list).setOnItemClickListener(
+        new RvItemClickSupport.OnItemClickListener() {
+          @Override public void onItemClicked(RecyclerView recyclerView, int position, View v) {
+            switch (position) {
+              case 0:
+                module.startNextActivity(ComponentActivity.this, data.get(position),
+                    FragmentActivity.class);
+                break;
+              case 1:
+                DownloadDialog dialog = new DownloadDialog(ComponentActivity.this);
+                dialog.show();
+                break;
+            }
+          }
+        });
+  }
+}
--- a/app/src/main/java/com/arialyy/simple/core/download/DownloadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/DownloadActivity.java
@@ -16,12 +16,9 @@

 package com.arialyy.simple.core.download;

-import android.content.Context;
 import android.os.Bundle;
 import android.view.View;
-import android.widget.TextView;
 import androidx.annotation.Nullable;
-import androidx.appcompat.widget.AppCompatImageView;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
 import androidx.recyclerview.widget.GridLayoutManager;
@@ -29,10 +26,9 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.arialyy.simple.MainActivity;
 import com.arialyy.simple.R;
 import com.arialyy.simple.base.BaseActivity;
-import com.arialyy.simple.base.adapter.AbsHolder;
-import com.arialyy.simple.base.adapter.AbsRVAdapter;
 import com.arialyy.simple.base.adapter.RvItemClickSupport;
-import com.arialyy.simple.core.download.multi_download.MultiTaskActivity;
+import com.arialyy.simple.common.NormalToAdapter;
+import com.arialyy.simple.core.download.mutil.MultiTaskActivity;
 import com.arialyy.simple.databinding.ActivityDownloadMeanBinding;
 import com.arialyy.simple.modlue.CommonModule;
 import com.arialyy.simple.to.NormalTo;
@@ -56,7 +52,7 @@ public class DownloadActivity extends BaseActivity<ActivityDownloadMeanBinding>

    final List<NormalTo> data = new ArrayList<>();
    getBinding().list.setLayoutManager(new GridLayoutManager(this, 2));
-    final Adapter adapter = new Adapter(this, data);
+    final NormalToAdapter adapter = new NormalToAdapter(this, data);
    getBinding().list.setAdapter(adapter);
    final CommonModule module = ViewModelProviders.of(this).get(CommonModule.class);

@@ -91,40 +87,15 @@ public class DownloadActivity extends BaseActivity<ActivityDownloadMeanBinding>
                    KotlinDownloadActivity.class);
                break;
              case 4:
+                // 服务中
+                break;
+              case 5:
+                // 组件中使用
+                module.startNextActivity(DownloadActivity.this, data.get(position),
+                    ComponentActivity.class);
                break;
            }
          }
        });
  }
-
-  private static class Adapter extends AbsRVAdapter<NormalTo, Adapter.Holder> {
-
-    Adapter(Context context, List<NormalTo> data) {
-      super(context, data);
-    }
-
-    @Override protected Adapter.Holder getViewHolder(View convertView, int viewType) {
-      return new Adapter.Holder(convertView);
-    }
-
-    @Override protected int setLayoutId(int type) {
-      return R.layout.item_download;
-    }
-
-    @Override protected void bindData(Adapter.Holder holder, int position, NormalTo item) {
-      holder.text.setText(item.title);
-      holder.image.setImageResource(item.icon);
-    }
-
-    private static class Holder extends AbsHolder {
-      TextView text;
-      AppCompatImageView image;
-
-      Holder(View itemView) {
-        super(itemView);
-        text = findViewById(R.id.title);
-        image = findViewById(R.id.image);
-      }
-    }
-  }
 }
--- a/app/src/main/java/com/arialyy/simple/core/download/DownloadDialog.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/DownloadDialog.java
@@ -42,7 +42,7 @@ public class DownloadDialog extends AbsDialog implements View.OnClickListener {
  private long mTaskId = -1;

  private static final String DOWNLOAD_URL =
-      "http://static.gaoshouyou.com/d/4b/d7/e04b308d9cd7f0ad4cac18d1a514544c.apk";
+      "http://sdkdown.muzhiwan.com/openfile/2019/07/12/com.nswj.acing.mzw_5d283abee9a3c.apk";

  public DownloadDialog(Context context) {
    super(context);
@@ -82,7 +82,7 @@ public class DownloadDialog extends AbsDialog implements View.OnClickListener {
        if (mTaskId == -1) {
          mTaskId = Aria.download(this)
              .load(DOWNLOAD_URL)
-              .setFilePath(Environment.getExternalStorageDirectory().getPath() + "/飞机大战.apk")
+              .setFilePath(Environment.getExternalStorageDirectory().getPath() + "/女神危机.apk")
              .create();
          mStart.setText(getContext().getString(R.string.stop));
          break;
--- a/app/src/main/java/com/arialyy/simple/core/download/DownloadModule.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/DownloadModule.java
@@ -23,7 +23,7 @@ import com.arialyy.aria.core.download.DownloadEntity;
 import com.arialyy.aria.util.CommonUtil;
 import com.arialyy.simple.R;
 import com.arialyy.simple.base.BaseModule;
-import com.arialyy.simple.core.download.multi_download.FileListEntity;
+import com.arialyy.simple.core.download.mutil.FileListEntity;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedList;
--- a/app/src/main/java/com/arialyy/simple/core/download/FtpDownloadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/FtpDownloadActivity.java
@@ -94,8 +94,9 @@ public class FtpDownloadActivity extends BaseActivity<ActivityFtpDownloadBinding
          mTaskId = Aria.download(this).loadFtp(mUrl)
              .setFilePath(mFilePath, true)
              .option()
-              .login("8L8e", "8guD")
-              .controller(ControllerType.START_CONTROLLER)
+              .login("lao", "123456")
+              .asFtps()
+              .controller(ControllerType.CREATE_CONTROLLER)
              .create();
          getBinding().setStateStr(getString(R.string.stop));
          break;
@@ -107,8 +108,9 @@ public class FtpDownloadActivity extends BaseActivity<ActivityFtpDownloadBinding
          Aria.download(this)
              .loadFtp(mTaskId)
              .option()
-              .login("8L8e", "8guD")
-              .controller(ControllerType.NORMAL_CONTROLLER)
+              .login("lao", "123456")
+              .asFtps()
+              .controller(ControllerType.TASK_CONTROLLER)
              .resume();
          getBinding().setStateStr(getString(R.string.stop));
        }
--- a/app/src/main/java/com/arialyy/simple/core/download/FtpDownloadModule.java
+++ b/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.205:2121/Cyberduck-6.9.4.30164.zip";
+  private final String ftpDefUrl = "ftp://9.9.9.50:2121/Cyberduck-6.9.4.30164.zip";
  private final String ftpDefPath =
      Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getPath();

--- a/app/src/main/java/com/arialyy/simple/core/download/HighestPriorityActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/HighestPriorityActivity.java
@@ -32,7 +32,7 @@ import com.arialyy.aria.core.inf.IEntity;
 import com.arialyy.frame.util.show.L;
 import com.arialyy.simple.R;
 import com.arialyy.simple.base.BaseActivity;
-import com.arialyy.simple.core.download.multi_download.DownloadAdapter;
+import com.arialyy.simple.core.download.mutil.DownloadAdapter;
 import com.arialyy.simple.databinding.ActivityHighestPriorityBinding;
 import com.arialyy.simple.util.AppUtil;
 import com.arialyy.simple.widget.HorizontalProgressBarWithNumber;
--- a/app/src/main/java/com/arialyy/simple/core/download/HttpDownloadModule.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/HttpDownloadModule.java
@@ -33,7 +33,7 @@ public class HttpDownloadModule extends BaseViewModule {
  private final String HTTP_PATH_KEY = "HTTP_PATH_KEY";

  private final String defUrl =
-      "http://hzdown.muzhiwan.com/2017/05/08/nl.noio.kingdom_59104935e56f0.apk";
+      "http://hzdown.muzhiwan.com/2017/05/08/nl.noio.kingdom_59104935e56f0.apk1";
  //"http://9.9.9.205:5000/download/Cyberduck-6.9.4.30164.zip";
  //"http://202.98.201.103:7000/vrs/TPK/ZTC440402001Z.tpk";
  private final String defFilePath =
--- a/app/src/main/java/com/arialyy/simple/core/download/KotlinDownloadActivity.kt
+++ b/app/src/main/java/com/arialyy/simple/core/download/KotlinDownloadActivity.kt
@@ -93,7 +93,7 @@ class KotlinDownloadActivity : BaseActivity<ActivitySingleKotlinBinding>() {
        .get(HttpDownloadModule::class.java)
    mModule!!.getHttpDownloadInfo(this)
        .observe(this, Observer { entity ->
-          if (entity == null) {
+          if (entity == null || entity.id < 0) {
            return@Observer
          }
          if (entity.state == IEntity.STATE_STOP) {
--- a/app/src/main/java/com/arialyy/simple/core/download/SingleTaskActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/SingleTaskActivity.java
@@ -305,7 +305,7 @@ public class SingleTaskActivity extends BaseActivity<ActivitySingleBinding> {
        })
        .option()
        .addHeader("1", "@")
-        .controller(ControllerType.START_CONTROLLER)
+        .controller(ControllerType.CREATE_CONTROLLER)
        .create();
  }

--- a/app/src/main/java/com/arialyy/simple/core/download/fragment_download/DownloadFragment.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/fragment_download/DownloadFragment.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.arialyy.simple.core.download.fragment_download;
+package com.arialyy.simple.core.download.fragment;

 import android.os.Bundle;
 import android.os.Environment;
@@ -41,6 +41,7 @@ public class DownloadFragment extends AbsFragment<FragmentDownloadBinding>

  private static final String DOWNLOAD_URL =
      "https://res5.d.cn/2137e42d610b3488d9420c6421529386eee5bdbfd9be1fafe0a05d6dabaec8c156ddbd00581055bbaeac03904fb63310e80010680235d16bd4c040b50096a0c20dd1c4b0854529a1.apk";
+  private static final String FILE_NAME = "王者军团";

  @Override protected void init(Bundle savedInstanceState) {
    mStart = mRootView.findViewById(R.id.start);
@@ -51,7 +52,6 @@ public class DownloadFragment extends AbsFragment<FragmentDownloadBinding>
    DownloadEntity entity = Aria.download(this).getFirstDownloadEntity(DOWNLOAD_URL);
    if (entity != null) {
      getBinding().setFileSize(CommonUtil.formatFileSize(entity.getFileSize()));
-      int state = entity.getState();
      getBinding().setProgress(entity.getPercent());
      if (entity.getState() == IEntity.STATE_RUNNING) {
        getBinding().setStateStr(getString(R.string.stop));
@@ -62,6 +62,8 @@ public class DownloadFragment extends AbsFragment<FragmentDownloadBinding>
    } else {
      getBinding().setStateStr(getString(R.string.start));
    }
+    getBinding().setUrl(DOWNLOAD_URL);
+    getBinding().setFileName(FILE_NAME);
    Aria.download(this).register();
  }

@@ -71,7 +73,9 @@ public class DownloadFragment extends AbsFragment<FragmentDownloadBinding>
        if (mTaskId == -1) {
          mTaskId = Aria.download(this)
              .load(DOWNLOAD_URL)
-              .setFilePath(Environment.getExternalStorageDirectory().getPath() + "/王者军团.apk")
+              .setFilePath(
+                  Environment.getExternalStorageDirectory().getPath() + String.format("%s.apk",
+                      FILE_NAME))
              .create();
          getBinding().setStateStr(getString(R.string.stop));
          break;
--- a/app/src/main/java/com/arialyy/simple/core/download/fragment_download/FragmentActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/fragment_download/FragmentActivity.java
@@ -14,13 +14,15 @@
 * limitations under the License.
 */

-package com.arialyy.simple.core.download.fragment_download;
+package com.arialyy.simple.core.download.fragment;

 import android.os.Bundle;
 import com.arialyy.aria.core.Aria;
+import com.arialyy.simple.MainActivity;
 import com.arialyy.simple.R;
 import com.arialyy.simple.base.BaseActivity;
 import com.arialyy.simple.databinding.FragmentDownloadBinding;
+import com.arialyy.simple.to.NormalTo;

 /**
 * Created by lyy on 2017/1/4.
@@ -33,7 +35,9 @@ public class FragmentActivity extends BaseActivity<FragmentDownloadBinding> {

  @Override protected void init(Bundle savedInstanceState) {
    super.init(savedInstanceState);
-    setTile("Fragment 中使用");
+
+    final NormalTo to = getIntent().getParcelableExtra(MainActivity.KEY_MAIN_DATA);
+    setTitle(to.title);
    Aria.download(this).register();
  }
 }
--- a/app/src/main/java/com/arialyy/simple/core/download/group/FTPDirDownloadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/group/FTPDirDownloadActivity.java
@@ -79,7 +79,7 @@ public class FTPDirDownloadActivity extends BaseActivity<ActivityDownloadGroupBi
              .setGroupAlias("ftp文件夹下载")
              .option()
              .login("8L8e", "8guD")
-              .controller(ControllerType.START_CONTROLLER)
+              .controller(ControllerType.CREATE_CONTROLLER)
              .create();
          getBinding().setStateStr(getString(R.string.stop));
          break;
@@ -92,7 +92,7 @@ public class FTPDirDownloadActivity extends BaseActivity<ActivityDownloadGroupBi
              .loadFtpDir(mTaskId)
              .option()
              .login("8L8e", "8guD")
-              .controller(ControllerType.NORMAL_CONTROLLER)
+              .controller(ControllerType.TASK_CONTROLLER)
              .resume();
          getBinding().setStateStr(getString(R.string.stop));
        }
--- a/app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8LiveDLoadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8LiveDLoadActivity.java
@@ -250,7 +250,7 @@ public class M3U8LiveDLoadActivity extends BaseActivity<ActivityM3u8LiveBinding>
            return parentUrl + tsUrl;
          }
        })
-        .controller(ControllerType.START_CONTROLLER)
+        .controller(ControllerType.CREATE_CONTROLLER)
        //.setLiveTsUrlConvert(new IVodTsUrlConverter() {
        //  @Override public List<String> convert(String m3u8Url, List<String> tsUrls) {
        //    int peerIndex = m3u8Url.lastIndexOf("/");
--- a/app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8VodDLoadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8VodDLoadActivity.java
@@ -30,7 +30,7 @@ import com.arialyy.annotations.Download;
 import com.arialyy.annotations.M3U8;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.common.controller.ControllerType;
-import com.arialyy.aria.core.common.controller.StartController;
+import com.arialyy.aria.core.common.controller.BuilderController;
 import com.arialyy.aria.core.download.DownloadEntity;
 import com.arialyy.aria.core.download.DownloadTask;
 import com.arialyy.aria.core.download.m3u8.IBandWidthUrlConverter;
@@ -299,7 +299,7 @@ public class M3U8VodDLoadActivity extends BaseActivity<ActivityM3u8VodBinding> {
                  return newUrls;
                }
              })
-              .controller(ControllerType.NORMAL_CONTROLLER)
+              .controller(ControllerType.TASK_CONTROLLER)
              .resume();
        }
        break;
@@ -341,11 +341,11 @@ public class M3U8VodDLoadActivity extends BaseActivity<ActivityM3u8VodBinding> {
          }
        })
        .generateIndexFile()
-        .controller(ControllerType.START_CONTROLLER)
+        .controller(ControllerType.CREATE_CONTROLLER)
        .create();
  }

-  private Class<StartController> c = StartController.class;
+  private Class<BuilderController> c = BuilderController.class;

  @Override protected void dataCallback(int result, Object data) {
    super.dataCallback(result, data);
--- a/app/src/main/java/com/arialyy/simple/core/download/m3u8/VideoPlayerFragment.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/m3u8/VideoPlayerFragment.java
@@ -59,7 +59,7 @@ public class VideoPlayerFragment extends BaseFragment<FragmentVideoPlayerBinding
    getBinding().surfaceView.getHolder().addCallback(new SurfaceHolder.Callback() {
      @Override public void surfaceCreated(SurfaceHolder holder) {
        mSurfaceHolder = holder;
-        //startNewPlayer(mPlayers.valueAt(0));
+        startNewPlayer(mPlayers.valueAt(0));
      }

      @Override
--- a/app/src/main/java/com/arialyy/simple/core/download/multi_download/DownloadAdapter.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/multi_download/DownloadAdapter.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.arialyy.simple.core.download.multi_download;
+package com.arialyy.simple.core.download.mutil;

 import android.annotation.SuppressLint;
 import android.content.Context;
--- a/app/src/main/java/com/arialyy/simple/core/download/multi_download/DownloadNumDialog.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/multi_download/DownloadNumDialog.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.arialyy.simple.core.download.multi_download;
+package com.arialyy.simple.core.download.mutil;

 import android.annotation.SuppressLint;
 import android.os.Bundle;
--- a/app/src/main/java/com/arialyy/simple/core/download/multi_download/FileListAdapter.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/multi_download/FileListAdapter.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.arialyy.simple.core.download.multi_download;
+package com.arialyy.simple.core.download.mutil;

 import android.content.Context;
 import android.view.View;
--- a/app/src/main/java/com/arialyy/simple/core/download/multi_download/FileListEntity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/multi_download/FileListEntity.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.arialyy.simple.core.download.multi_download;
+package com.arialyy.simple.core.download.mutil;

 /**
 * Created by AriaL on 2017/1/6.
--- a/app/src/main/java/com/arialyy/simple/core/download/multi_download/MultiDownloadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/multi_download/MultiDownloadActivity.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.arialyy.simple.core.download.multi_download;
+package com.arialyy.simple.core.download.mutil;

 import android.os.Bundle;
 import android.util.Log;
--- a/app/src/main/java/com/arialyy/simple/core/download/multi_download/MultiEntity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/multi_download/MultiEntity.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.arialyy.simple.core.download.multi_download;
+package com.arialyy.simple.core.download.mutil;

 import com.arialyy.aria.core.download.DownloadEntity;
 import com.arialyy.aria.core.download.DownloadGroupEntity;
--- a/app/src/main/java/com/arialyy/simple/core/download/multi_download/MultiModule.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/multi_download/MultiModule.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.arialyy.simple.core.download.multi_download;
+package com.arialyy.simple.core.download.mutil;

 import android.content.Context;
 import com.arialyy.simple.base.BaseModule;
--- a/app/src/main/java/com/arialyy/simple/core/download/multi_download/MultiTaskActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/multi_download/MultiTaskActivity.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.arialyy.simple.core.download.multi_download;
+package com.arialyy.simple.core.download.mutil;

 import android.content.Intent;
 import android.os.Bundle;
--- a/app/src/main/java/com/arialyy/simple/core/download/service_download/DownloadNotification.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/service_download/DownloadNotification.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.arialyy.simple.core.download.service_download;
+package com.arialyy.simple.core.download.service;

 import android.app.NotificationManager;
 import android.content.Context;
--- a/app/src/main/java/com/arialyy/simple/core/download/service_download/DownloadService.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/service_download/DownloadService.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.arialyy.simple.core.download.service_download;
+package com.arialyy.simple.core.download.service;

 import android.app.Service;
 import android.content.Intent;
--- a/app/src/main/java/com/arialyy/simple/core/upload/FtpUploadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/upload/FtpUploadActivity.java
@@ -131,7 +131,7 @@ public class FtpUploadActivity extends BaseActivity<ActivityFtpUploadBinding> {
                  })
              .option()
              .login("8L8e", "8guD")
-              .controller(ControllerType.START_CONTROLLER)
+              .controller(ControllerType.CREATE_CONTROLLER)
              .create();
          getBinding().setStateStr(getString(R.string.stop));
          break;
@@ -144,7 +144,7 @@ public class FtpUploadActivity extends BaseActivity<ActivityFtpUploadBinding> {
              .loadFtp(mTaskId)
              .option()
              .login("8L8e", "8guD")
-              .controller(ControllerType.NORMAL_CONTROLLER)
+              .controller(ControllerType.TASK_CONTROLLER)
              .resume();
          getBinding().setStateStr(getString(R.string.stop));
        }
--- a/app/src/main/java/com/arialyy/simple/core/upload/HttpUploadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/upload/HttpUploadActivity.java
@@ -20,6 +20,8 @@ import android.os.Bundle;
 import android.view.View;
 import com.arialyy.annotations.Upload;
 import com.arialyy.aria.core.Aria;
+import com.arialyy.aria.core.common.RequestEnum;
+import com.arialyy.aria.core.common.controller.ControllerType;
 import com.arialyy.aria.core.upload.UploadEntity;
 import com.arialyy.aria.core.upload.UploadTask;
 import com.arialyy.frame.util.FileUtil;
@@ -38,7 +40,7 @@ public class HttpUploadActivity extends BaseActivity<ActivityUploadBinding> {
  private static final String TAG = "HttpUploadActivity";
  HorizontalProgressBarWithNumber mPb;

-  private final String FILE_PATH = "/mnt/sdcard/test.apk";
+  private final String FILE_PATH = "/mnt/sdcard/ggsg14.apk";
  private UploadEntity mEntity;

  @Override protected int setLayoutId() {
@@ -72,10 +74,14 @@ public class HttpUploadActivity extends BaseActivity<ActivityUploadBinding> {

  void upload() {
    Aria.upload(HttpUploadActivity.this).load(FILE_PATH)
-        .setUploadUrl(
-            "http://lib-test.xzxyun.com:8042/Api/upload?data={\"type\":\"1\",\"fileType\":\".apk\"}")
+        //.setUploadUrl("http://lib-test.xzxyun.com:8042/Api/upload?data={\"type\":\"1\",\"fileType\":\".apk\"}")
+        .setUploadUrl("http://9.9.9.205:5000/upload/")
        //.setTempUrl("http://192.168.1.6:8080/upload/sign_file/").setAttachment("file")
        //.addHeader("iplanetdirectorypro", "11a09102fb934ad0bc206f9c611d7933")
+        .option()
+        .setRequestType(RequestEnum.POST)
+        .setParam("params", "bbbbbbbb")
+        .controller(ControllerType.CREATE_CONTROLLER)
        .create();
  }

--- a/app/src/main/java/com/arialyy/simple/modlue/AnyRunnModule.java
+++ b/app/src/main/java/com/arialyy/simple/modlue/AnyRunnModule.java
@@ -113,7 +113,7 @@ public class AnyRunnModule {
          .setStorePath("/mnt/sdcard/Download/server.crt")
          .setAlias("www.laoyuyu.me")
          .setStorePass("123456")
-          .controller(ControllerType.START_CONTROLLER)
+          .controller(ControllerType.CREATE_CONTROLLER)
          .create();
    } else {
      Aria.download(this).load(mEntity.getId()).resume();
--- a/app/src/main/java/com/arialyy/simple/modlue/CommonModule.java
+++ b/app/src/main/java/com/arialyy/simple/modlue/CommonModule.java
@@ -43,6 +43,28 @@ public class CommonModule extends BaseViewModule {
    context.startActivity(intent);
  }

+  public LiveData<List<NormalTo>> getComponentData(Context context) {
+    List<NormalTo> list = new ArrayList<>();
+    String[] titles = context.getResources().getStringArray(R.array.component_items);
+    int[] icons = new int[] {
+        R.drawable.ic_fragment,
+        R.drawable.ic_dialog
+    };
+    int i = 0;
+    for (String title : titles) {
+      NormalTo to = new NormalTo();
+      to.icon = icons[i];
+      to.title = title;
+      i++;
+      list.add(to);
+    }
+    mLiveData.postValue(list);
+    return mLiveData;
+  }
+
+  /**
+   * http下载功能页面数据
+   */
  public LiveData<List<NormalTo>> getDownloadData(Context context) {
    List<NormalTo> list = new ArrayList<>();
    String[] titles = context.getResources().getStringArray(R.array.download_items);
@@ -66,6 +88,9 @@ public class CommonModule extends BaseViewModule {
    return mLiveData;
  }

+  /**
+   * 首页数据
+   */
  public LiveData<List<NormalTo>> getMainData(Context context) {
    List<NormalTo> list = new ArrayList<>();
    String[] titles = context.getResources().getStringArray(R.array.main_items);
--- a/app/src/main/res/drawable/ic_dialog.xml
+++ b/app/src/main/res/drawable/ic_dialog.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:viewportHeight="1024"
+    android:viewportWidth="1024"
+    android:width="24dp">
+  <path
+      android:fillColor="@color/icon_color"
+      android:pathData="M950.86,292.57L950.86,109.71c0,-20.2 -16.37,-36.57 -36.57,-36.57L109.71,73.14c-20.2,0 -36.57,16.37 -36.57,36.57v804.57c0,20.2 16.37,36.57 36.57,36.57h804.57c20.2,0 36.57,-16.37 36.57,-36.57L950.86,365.71L73.14,365.71v-73.14h877.71zM109.71,0h804.57C974.88,0 1024,49.12 1024,109.71v804.57C1024,974.88 974.88,1024 914.29,1024L109.71,1024C49.12,1024 0,974.88 0,914.29L0,109.71C0,49.12 49.12,0 109.71,0zM694.86,146.29L768,146.29c20.2,0 36.57,16.37 36.57,36.57 0,20.2 -16.37,36.57 -36.57,36.57h-73.14c-20.2,0 -36.57,-16.37 -36.57,-36.57 0,-20.2 16.37,-36.57 36.57,-36.57zM256,512h512c20.2,0 36.57,16.37 36.57,36.57 0,20.2 -16.37,36.57 -36.57,36.57L256,585.14c-20.2,0 -36.57,-16.37 -36.57,-36.57C219.43,528.37 235.8,512 256,512zM256,731.43h512c20.2,0 36.57,16.37 36.57,36.57 0,20.2 -16.37,36.57 -36.57,36.57L256,804.57c-20.2,0 -36.57,-16.37 -36.57,-36.57 0,-20.2 16.37,-36.57 36.57,-36.57z"/>
+</vector>
--- a/app/src/main/res/layout/activity_component.xml
+++ b/app/src/main/res/layout/activity_component.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+  <androidx.recyclerview.widget.RecyclerView
+      android:id="@+id/list"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      />
+</layout>
--- a/app/src/main/res/layout/activity_fragment.xml
+++ b/app/src/main/res/layout/activity_fragment.xml
@@ -9,7 +9,7 @@
    <include layout="@layout/layout_bar"/>
    <fragment
        android:id="@+id/fragment1"
-        android:name="com.arialyy.simple.core.download.fragment_download.DownloadFragment"
+        android:name="com.arialyy.simple.core.download.fragment.DownloadFragment"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        />
--- a/app/src/main/res/layout/fragment_download.xml
+++ b/app/src/main/res/layout/fragment_download.xml
@@ -20,6 +20,14 @@
        name="stateStr"
        type="String"
        />
+    <variable
+        name="file_name"
+        type="String"
+        />
+    <variable
+        name="url"
+        type="String"
+        />
  </data>

  <LinearLayout
@@ -31,6 +39,13 @@
    <TextView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
+        android:text="@{@string/file_name(file_name)}"
+        />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@{@string/url(url)}"
        />

    <include
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -62,6 +62,11 @@
    <item>组件中使用</item>
  </string-array>

+  <string-array name="component_items">
+    <item>fragment中使用</item>
+    <item>dialog中使用</item>
+  </string-array>
+

  <string-array name="test_apk_download_url">
    <item>http://static.gaoshouyou.com/d/d4/4f/d6d48db3794fb9ecf47e83c346570881.apk</item>
--- a/app/src/main/res/xml/network_security_config.xml
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
  <base-config cleartextTrafficPermitted="true"/>
-  <!--<domain-config cleartextTrafficPermitted="true">-->
+  <!--<domain-clientConfig cleartextTrafficPermitted="true">-->
    <!--<domain includeSubdomains="true">Your URL(ex: 127.0.0.1)</domain>-->
-  <!--</domain-config>-->
+  <!--</domain-clientConfig>-->
 </network-security-config>