优化配置功能、增加组合任务的配置功能

优化任务队列代码
AriaLyy · Jan 21, 2019 · 56af75c · 56af75c
1 parent f6792b2
commit 56af75c
Show file tree

Hide file tree

Showing 63 changed files with 1,104 additions and 654 deletions.
diff --git a/Aria/jcenter.gradle b/Aria/jcenter.gradle
@@ -76,7 +76,7 @@ artifacts {
 //################################# jcenter 上传配置 start #########################################
 bintray {
 //  user = hasProperty("bintrayUser") ? getProperty("bintrayUser") : getProperty("BINTRAY_USER")
-//  groupName = hasProperty("bintrayKey") ? getProperty("bintrayKey") : getProperty("BINTRAY_KEY")
+//  groupHash = hasProperty("bintrayKey") ? getProperty("bintrayKey") : getProperty("BINTRAY_KEY")
   user = BINTRAY_USER
   key = BINTRAY_KEY
   configurations = ['archives']

diff --git a/Aria/src/main/java/com/arialyy/aria/core/AriaManager.java b/Aria/src/main/java/com/arialyy/aria/core/AriaManager.java
@@ -30,15 +30,12 @@
 import com.arialyy.aria.core.common.QueueMod;
 import com.arialyy.aria.core.download.DownloadEntity;
 import com.arialyy.aria.core.download.DownloadGroupEntity;
-import com.arialyy.aria.core.download.DGTaskWrapper;
 import com.arialyy.aria.core.download.DownloadReceiver;
-import com.arialyy.aria.core.download.DTaskWrapper;
 import com.arialyy.aria.core.inf.AbsReceiver;
 import com.arialyy.aria.core.inf.IReceiver;
 import com.arialyy.aria.core.inf.ReceiverType;
 import com.arialyy.aria.core.upload.UploadEntity;
 import com.arialyy.aria.core.upload.UploadReceiver;
-import com.arialyy.aria.core.upload.UTaskWrapper;
 import com.arialyy.aria.orm.DbEntity;
 import com.arialyy.aria.orm.DelegateWrapper;
 import com.arialyy.aria.util.ALog;
@@ -78,6 +75,7 @@
   private Configuration.DownloadConfig mDConfig;
   private Configuration.UploadConfig mUConfig;
   private Configuration.AppConfig mAConfig;
+  private Configuration.DGroupConfig mDGConfig;
 
   private AriaManager(Context context) {
     APP = context.getApplicationContext();
@@ -127,8 +125,7 @@ private void initAria() {
    */
   private void amendTaskState() {
     Class[] clazzs = new Class[] {
-        DownloadEntity.class, UploadEntity.class, DownloadGroupEntity.class,
-        DTaskWrapper.class, UTaskWrapper.class, DGTaskWrapper.class
+        DownloadEntity.class, UploadEntity.class, DownloadGroupEntity.class
     };
     String sql = "UPDATE %s SET state=2 WHERE state IN (3,4,5,6)";
     for (Class clazz : clazzs) {
@@ -206,6 +203,19 @@ public Configuration.AppConfig getAppConfig() {
     return mAConfig;
   }
 
+  /**
+   * 如果需要在代码中修改下载类型的组合任务的配置，请使用以下方法
+   * <pre>
+   *   <code>
+   *     //修改最大任务队列数
+   *     Aria.get(this).getDownloadConfig().setMaxTaskNum(3);
+   *   </code>
+   * </pre>
+   */
+  public Configuration.DGroupConfig getDGroupConfig(){
+    return mDGConfig;
+  }
+
   /**
    * 设置命令
    */
@@ -268,7 +278,7 @@ public void delRecord(int type, String key) {
         DbEntity.deleteData(DownloadEntity.class, "url=? and isGroupChild='false'", key);
         break;
       case 2:
-        DbEntity.deleteData(DownloadGroupEntity.class, "groupName=?", key);
+        DbEntity.deleteData(DownloadGroupEntity.class, "groupHash=?", key);
         break;
       case 3:
         DbEntity.deleteData(UploadEntity.class, "filePath=?", key);
@@ -379,6 +389,7 @@ private void initConfig() {
     mDConfig = Configuration.getInstance().downloadCfg;
     mUConfig = Configuration.getInstance().uploadCfg;
     mAConfig = Configuration.getInstance().appCfg;
+    mDGConfig = Configuration.getInstance().dGroupCfg;
 
     File xmlFile = new File(APP.getFilesDir().getPath() + Configuration.XML_FILE);
     File tempDir = new File(APP.getFilesDir().getPath() + "/temp");