Merge branch 'master' of github.com:AriaLyy/Aria

fix bug https://github.com/AriaLyy/Aria/issues/537
Update Custom.md
2019-11-28 19:49:26 +08:00 · 2019-11-28 19:48:50 +08:00 · 2019-11-28 16:39:46 +08:00 · 2019-11-28 16:37:04 +08:00 · 2019-11-28 09:59:08 +08:00 · 2019-11-27 21:38:25 +08:00
29 changed files with 222 additions and 115 deletions
--- a/.github/ISSUE_TEMPLATE/Custom.md
+++ b/.github/ISSUE_TEMPLATE/Custom.md
@@ -1,35 +1,26 @@
 ---
 name: 问题描述
-about: 请详细描述你遇到的问题
+about: 提交问题前，请先阅读文档和搜索issue

 ---

-<!-- 请详细描述以下信息，即使是一个简单的bug，没有充足的信息，作者却需要花费大量的时间去查找可能的原因！！ -->
-
-## 预期行为
-
-
-## 当前行为
-
-
-## 可能的解决方案
-<!-- 不是强制性的，针对该错误的修复/原因的建议-->
-
-
-## 重现步骤
-<!-- 请提供明确的步骤 -->
-
-1.
-2.
-3.
-4.
-
-
-## 错误日志
-
+<!-- 提交问题前，请先阅读文档和搜索相应问题的issue -->

 ## 版本
 * 框架版本

 * 系统版本

+## 错误日志
+<!-- 请提供详细的错误日志 -->
+
+
+## 重现步骤
+<!-- 请提供明确的步骤 -->
+1.
+2.
+3.
+4.
+
+
+
--- a/Aria/src/main/java/com/arialyy/aria/core/AriaManager.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/AriaManager.java
@@ -98,9 +98,6 @@ import java.util.concurrent.ConcurrentHashMap;
  }

  public static AriaManager getInstance() {
-    if (INSTANCE == null) {
-      throw new NullPointerException("请使用AriaManager.init(context)初始化管理器");
-    }
    return INSTANCE;
  }

--- a/Aria/src/main/java/com/arialyy/aria/core/command/AbsCmdFactory.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/command/AbsCmdFactory.java
@@ -15,6 +15,7 @@
 */
 package com.arialyy.aria.core.command;

+import com.arialyy.aria.core.task.ITask;
 import com.arialyy.aria.core.wrapper.AbsTaskWrapper;

 /**
@@ -25,8 +26,7 @@ public abstract class AbsCmdFactory<TASK_ENTITY extends AbsTaskWrapper, CMD exte

  /**
   * @param entity 下载实体
-   * @param taskType {@link ICmd#TASK_TYPE_DOWNLOAD}、{@link ICmd#TASK_TYPE_DOWNLOAD_GROUP}、{@link
-   * ICmd#TASK_TYPE_UPLOAD}
+   * {@link ITask#DOWNLOAD}、{@link ITask#DOWNLOAD_GROUP}、{@link ITask#UPLOAD}
   */
  public abstract CMD createCmd(TASK_ENTITY entity, int type, int taskType);
 }
--- a/Aria/src/main/java/com/arialyy/aria/core/command/AbsNormalCmd.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/command/AbsNormalCmd.java
@@ -157,14 +157,6 @@ public abstract class AbsNormalCmd<T extends AbsTaskWrapper> extends AbsCmd<T> {
    mQueue.resumeTask(task);
  }

-  /**
-   * 启动指定任务
-   *
-   * @param task 指定任务
-   */
-  void startTask(AbsTask task) {
-    mQueue.startTask(task);
-  }

  /**
   * 从队列中获取任务
--- a/Aria/src/main/java/com/arialyy/aria/core/command/NormalCmdFactory.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/command/NormalCmdFactory.java
@@ -16,6 +16,7 @@

 package com.arialyy.aria.core.command;

+import com.arialyy.aria.core.task.ITask;
 import com.arialyy.aria.core.wrapper.AbsTaskWrapper;

 /**
@@ -83,8 +84,7 @@ public class NormalCmdFactory extends AbsCmdFactory<AbsTaskWrapper, AbsNormalCmd
   * @param entity 下载实体
   * @param type 命令类型{@link #TASK_CREATE}、{@link #TASK_START}、{@link #TASK_CANCEL}、{@link
   * #TASK_STOP}、{@link #TASK_HIGHEST_PRIORITY}、{@link #TASK_STOP_ALL}、{@link #TASK_RESUME_ALL}
-   * @param taskType {@link ICmd#TASK_TYPE_DOWNLOAD}、{@link ICmd#TASK_TYPE_DOWNLOAD_GROUP}、{@link
-   * ICmd#TASK_TYPE_UPLOAD}
+   * @param taskType {@link ITask#DOWNLOAD}、{@link ITask#DOWNLOAD_GROUP}、{@link ITask#UPLOAD}
   */
  public AbsNormalCmd createCmd(AbsTaskWrapper entity, int type, int taskType) {
    switch (type) {
--- a/Aria/src/main/java/com/arialyy/aria/core/command/ResumeAllCmd.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/command/ResumeAllCmd.java
@@ -16,29 +16,10 @@
 package com.arialyy.aria.core.command;

 import com.arialyy.aria.core.AriaManager;
-import com.arialyy.aria.core.common.AbsEntity;
-import com.arialyy.aria.core.download.DGTaskWrapper;
-import com.arialyy.aria.core.download.DTaskWrapper;
-import com.arialyy.aria.core.download.DownloadEntity;
-import com.arialyy.aria.core.download.DownloadGroupEntity;
 import com.arialyy.aria.core.inf.IEntity;
-import com.arialyy.aria.core.inf.IOptionConstant;
-import com.arialyy.aria.core.manager.TaskWrapperManager;
-import com.arialyy.aria.core.queue.DGroupTaskQueue;
-import com.arialyy.aria.core.queue.DTaskQueue;
-import com.arialyy.aria.core.queue.UTaskQueue;
-import com.arialyy.aria.core.task.AbsTask;
-import com.arialyy.aria.core.upload.UTaskWrapper;
-import com.arialyy.aria.core.upload.UploadEntity;
 import com.arialyy.aria.core.wrapper.AbsTaskWrapper;
-import com.arialyy.aria.core.wrapper.ITaskWrapper;
-import com.arialyy.aria.orm.DbEntity;
 import com.arialyy.aria.util.ALog;
-import com.arialyy.aria.util.CommonUtil;
 import com.arialyy.aria.util.NetUtils;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Executors;

 /**
 * Created by AriaL on 2017/6/13.
@@ -50,7 +31,6 @@ import java.util.concurrent.Executors;
 */
 final class ResumeAllCmd<T extends AbsTaskWrapper> extends AbsNormalCmd<T> {

-
  ResumeAllCmd(T entity, int taskType) {
    super(entity, taskType);
  }
@@ -60,8 +40,7 @@ final class ResumeAllCmd<T extends AbsTaskWrapper> extends AbsNormalCmd<T> {
      ALog.w(TAG, "恢复任务失败，网络未连接");
      return;
    }
-    new Thread(new ResumeThread(isDownloadCmd, IEntity.STATE_COMPLETE)).start();
+    new Thread(new ResumeThread(isDownloadCmd,
+        String.format("state!=%s", IEntity.STATE_COMPLETE))).start();
  }
-
-
 }
--- a/Aria/src/main/java/com/arialyy/aria/core/command/ResumeThread.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/command/ResumeThread.java
@@ -47,11 +47,11 @@ public class ResumeThread implements Runnable {
  private String TAG = CommonUtil.getClassName(getClass());
  private List<AbsTaskWrapper> mWaitList = new ArrayList<>();
  private boolean isDownloadCmd;
-  private int excludeState;
+  private String sqlCondition;

-  ResumeThread(boolean isDownload, int excludeState) {
+  ResumeThread(boolean isDownload, String sqlCondition) {
    this.isDownloadCmd = isDownload;
-    this.excludeState = excludeState;
+    this.sqlCondition = sqlCondition;
  }

  /**
@@ -63,8 +63,8 @@ public class ResumeThread implements Runnable {
    if (type == 1) {
      List<DownloadEntity> entities =
          DbEntity.findDatas(DownloadEntity.class,
-              "isGroupChild=? AND state!=? ORDER BY stopTime DESC", "false",
-              String.valueOf(excludeState));
+              String.format("NOT(isGroupChild) AND NOT(isComplete) AND %s ORDER BY stopTime DESC",
+                  sqlCondition));
      if (entities != null && !entities.isEmpty()) {
        for (DownloadEntity entity : entities) {
          addResumeEntity(TaskWrapperManager.getInstance()
@@ -73,8 +73,9 @@ public class ResumeThread implements Runnable {
      }
    } else if (type == 2) {
      List<DownloadGroupEntity> entities =
-          DbEntity.findDatas(DownloadGroupEntity.class, "state!=? ORDER BY stopTime DESC",
-              String.valueOf(excludeState));
+          DbEntity.findDatas(DownloadGroupEntity.class,
+              String.format("NOT(isComplete) AND %s ORDER BY stopTime DESC",
+                  sqlCondition));
      if (entities != null && !entities.isEmpty()) {
        for (DownloadGroupEntity entity : entities) {
          addResumeEntity(
@@ -84,8 +85,9 @@ public class ResumeThread implements Runnable {
      }
    } else if (type == 3) {
      List<UploadEntity> entities =
-          DbEntity.findDatas(UploadEntity.class, "state!=? ORDER BY stopTime DESC",
-              String.valueOf(excludeState));
+          DbEntity.findDatas(UploadEntity.class,
+              String.format("NOT(isComplete) AND %s ORDER BY stopTime DESC",
+                  sqlCondition));
      if (entities != null && !entities.isEmpty()) {
        for (UploadEntity entity : entities) {
          addResumeEntity(TaskWrapperManager.getInstance()
@@ -125,7 +127,7 @@ public class ResumeThread implements Runnable {
        queue = DGroupTaskQueue.getInstance();
      }

-      if (queue == null){
+      if (queue == null) {
        ALog.e(TAG, "任务类型错误");
        continue;
      }
--- a/Aria/src/main/java/com/arialyy/aria/core/command/StartCmd.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/command/StartCmd.java
@@ -27,12 +27,22 @@ import com.arialyy.aria.util.NetUtils;
 /**
 * Created by lyy on 2016/8/22. 开始命令 队列模型{@link QueueMod#NOW}、{@link QueueMod#WAIT}
 */
-final class StartCmd<T extends AbsTaskWrapper> extends AbsNormalCmd<T> {
+final public class StartCmd<T extends AbsTaskWrapper> extends AbsNormalCmd<T> {
+
+  private boolean newStart = false;

  StartCmd(T entity, int taskType) {
    super(entity, taskType);
  }

+  /**
+   * 立即执行任务
+   * @param newStart true 立即执行任务，无论执行队列是否满了
+   */
+  public void setNewStart(boolean newStart) {
+    this.newStart = newStart;
+  }
+
  @Override public void executeCmd() {
    if (!canExeCmd) return;
    if (!NetUtils.isConnected(AriaManager.getInstance().getAPP())) {
@@ -71,7 +81,11 @@ final class StartCmd<T extends AbsTaskWrapper> extends AbsNormalCmd<T> {
            startTask();
          }
        } else {
-          sendWaitState(task);
+          if (newStart){
+            startTask();
+          }else {
+            sendWaitState(task);
+          }
        }
      }
    } else {
@@ -91,6 +105,7 @@ final class StartCmd<T extends AbsTaskWrapper> extends AbsNormalCmd<T> {
   * 当缓冲队列为null时，查找数据库中所有等待中的任务
   */
  private void findAllWaitTask() {
-    new Thread(new ResumeThread(isDownloadCmd, IEntity.STATE_WAIT)).start();
+    new Thread(
+        new ResumeThread(isDownloadCmd, String.format("state=%s", IEntity.STATE_WAIT))).start();
  }
 }
--- a/Aria/src/main/java/com/arialyy/aria/core/common/AbsNormalTarget.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/common/AbsNormalTarget.java
@@ -150,7 +150,17 @@ public abstract class AbsNormalTarget<TARGET extends AbsNormalTarget> extends Ab
   */
  @Override
  public void resume() {
-    getController().resume();
+    resume(false);
+  }
+
+  /**
+   * 正常来说，当执行队列满时，调用恢复任务接口，只能将任务放到缓存队列中。
+   * 如果希望调用恢复接口，马上进入执行队列，需要使用该方法
+   *
+   * @param newStart true 立即将任务恢复到执行队列中
+   */
+  @Override public void resume(boolean newStart) {
+    getController().resume(newStart);
  }

  /**
--- a/Aria/src/main/java/com/arialyy/aria/core/common/controller/INormalFeature.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/common/controller/INormalFeature.java
@@ -30,6 +30,14 @@ public interface INormalFeature {
   */
  void resume();

+  /**
+   * 正常来说，当执行队列满时，调用恢复任务接口，只能将任务放到缓存队列中。
+   * 如果希望调用恢复接口，马上进入执行队列，需要使用该方法
+   *
+   * @param newStart true 立即将任务恢复到执行队列中
+   */
+  void resume(boolean newStart);
+
  /**
   * 删除任务
   */
--- a/Aria/src/main/java/com/arialyy/aria/core/common/controller/NormalController.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/common/controller/NormalController.java
@@ -16,11 +16,12 @@
 package com.arialyy.aria.core.common.controller;

 import com.arialyy.aria.core.command.CancelCmd;
+import com.arialyy.aria.core.command.CmdHelper;
 import com.arialyy.aria.core.command.NormalCmdFactory;
+import com.arialyy.aria.core.command.StartCmd;
 import com.arialyy.aria.core.event.EventMsgUtil;
 import com.arialyy.aria.core.wrapper.AbsTaskWrapper;
 import com.arialyy.aria.util.ALog;
-import com.arialyy.aria.core.command.CmdHelper;

 /**
 * 启动控制器
@@ -49,10 +50,23 @@ public final class NormalController extends FeatureController implements INormal
   */
  @Override
  public void resume() {
+    resume(false);
+  }
+
+  /**
+   * 正常来说，当执行队列满时，调用恢复任务接口，只能将任务放到缓存队列中。
+   * 如果希望调用恢复接口，马上进入执行队列，需要使用该方法
+   *
+   * @param newStart true 立即将任务恢复到执行队列中
+   */
+  @Override public void resume(boolean newStart) {
    if (checkConfig()) {
+      StartCmd cmd =
+          (StartCmd) CmdHelper.createNormalCmd(getTaskWrapper(), NormalCmdFactory.TASK_START,
+              checkTaskType());
+      cmd.setNewStart(newStart);
      EventMsgUtil.getDefault()
-          .post(CmdHelper.createNormalCmd(getTaskWrapper(), NormalCmdFactory.TASK_START,
-              checkTaskType()));
+          .post(cmd);
    }
  }

--- a/Aria/src/main/java/com/arialyy/aria/core/download/m3u8/M3U8Option.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/download/m3u8/M3U8Option.java
@@ -17,6 +17,7 @@ package com.arialyy.aria.core.download.m3u8;

 import com.arialyy.aria.core.common.BaseOption;
 import com.arialyy.aria.core.processor.IBandWidthUrlConverter;
+import com.arialyy.aria.core.processor.IKeyUrlConverter;
 import com.arialyy.aria.core.processor.ITsMergeHandler;
 import com.arialyy.aria.util.CheckUtil;
 import com.arialyy.aria.util.ComponentUtil;
@@ -31,6 +32,7 @@ public class M3U8Option<OP extends M3U8Option> extends BaseOption {
  private int bandWidth;
  private ITsMergeHandler mergeHandler;
  private IBandWidthUrlConverter bandWidthUrlConverter;
+  private IKeyUrlConverter keyUrlConverter;

  M3U8Option() {
    super();
@@ -88,4 +90,15 @@ public class M3U8Option<OP extends M3U8Option> extends BaseOption {
    this.bandWidthUrlConverter = bandWidthUrlConverter;
    return (OP) this;
  }
+
+  /**
+   * M3U8 密钥url转换器，对于某些服务器，密钥的下载地址是被加密的，因此需要使用该方法将被加密的密钥解密成可被识别的http地址
+   *
+   * @param keyUrlConverter {@link IKeyUrlConverter}
+   */
+  public OP setKeyUrlConverter(IKeyUrlConverter keyUrlConverter) {
+    CheckUtil.checkMemberClass(keyUrlConverter.getClass());
+    this.keyUrlConverter = keyUrlConverter;
+    return (OP) this;
+  }
 }
--- a/DEV_LOG.md
+++ b/DEV_LOG.md
@@ -1,6 +1,14 @@
 ## 开发日志
-  + v_3.7.8-pre-1(2019/11/20)
+  + v_3.7.9 (2019/11/28)
+    - fix bug https://github.com/AriaLyy/Aria/issues/537
+  + v_3.7.8 (2019/11/28)
    - fix bug https://github.com/AriaLyy/Aria/issues/526
+    - fix bug https://github.com/AriaLyy/Aria/issues/533
+    - fix bug https://github.com/AriaLyy/Aria/issues/535
+    - 修复ftp无法完成下载的问题
+    - 修复一个非分块模式下，调用`updateUrl(newUrl)`后无法恢复下载的问题
+    - 增加立即恢复任务的接口，正常来说，当执行队列满时，调用恢复任务接口，只能将任务放到缓存队列中。如果希望调用恢复接口，马上进入执行队列，需要调用`resume(true)`这个重载方法。
+    - 增加M3U8加密密钥的下载地址转换器 https://github.com/AriaLyy/Aria/issues/522
  + v_3.7.7 (2019/11/20)
    - 修复ftp无法完成下载的问题
    - 修复一个http下载崩溃的问题
--- a/HttpComponent/src/main/java/com/arialyy/aria/http/download/HttpDThreadTaskAdapter.java
+++ b/HttpComponent/src/main/java/com/arialyy/aria/http/download/HttpDThreadTaskAdapter.java
@@ -24,6 +24,7 @@ import com.arialyy.aria.http.BaseHttpThreadTaskAdapter;
 import com.arialyy.aria.http.ConnectionHelp;
 import com.arialyy.aria.util.ALog;
 import com.arialyy.aria.util.BufferedRandomAccessFile;
+import com.arialyy.aria.util.FileUtil;
 import java.io.BufferedInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
--- a/M3U8Component/src/main/java/com/arialyy/aria/m3u8/M3U8InfoThread.java
+++ b/M3U8Component/src/main/java/com/arialyy/aria/m3u8/M3U8InfoThread.java
@@ -26,6 +26,7 @@ import com.arialyy.aria.core.download.DownloadEntity;
 import com.arialyy.aria.core.download.M3U8Entity;
 import com.arialyy.aria.core.inf.OnFileInfoCallback;
 import com.arialyy.aria.core.processor.IBandWidthUrlConverter;
+import com.arialyy.aria.core.processor.IKeyUrlConverter;
 import com.arialyy.aria.core.wrapper.AbsTaskWrapper;
 import com.arialyy.aria.core.wrapper.ITaskWrapper;
 import com.arialyy.aria.exception.M3U8Exception;
@@ -127,7 +128,7 @@ final public class M3U8InfoThread implements Runnable {
        File indexFile = new File(indexPath);
        if (!indexFile.exists()) {
          FileUtil.createFile(indexPath);
-        }else {
+        } else {
          //FileUtil.deleteFile(indexPath);
        }
        fos = new FileOutputStream(indexFile);
@@ -353,7 +354,18 @@ final public class M3U8InfoThread implements Runnable {
      } else {
        return;
      }
-      URL url = ConnectionHelp.handleUrl(info.keyUrl, mHttpOption);
+
+      IKeyUrlConverter keyUrlConverter = mM3U8Option.getKeyUrlConverter();
+      String keyUrl = info.keyUrl;
+      if (keyUrlConverter != null) {
+        keyUrl = keyUrlConverter.convert(keyUrl);
+      }
+      if (TextUtils.isEmpty(keyUrl)){
+        ALog.e(TAG, "m3u8密钥key url 为空");
+        return;
+      }
+
+      URL url = ConnectionHelp.handleUrl(keyUrl, mHttpOption);
      conn = ConnectionHelp.handleConnection(url, mHttpOption);
      ConnectionHelp.setConnectParam(mHttpOption, conn);
      conn.setConnectTimeout(mConnectTimeOut);
--- a/M3U8Component/src/main/java/com/arialyy/aria/m3u8/M3U8TaskOption.java
+++ b/M3U8Component/src/main/java/com/arialyy/aria/m3u8/M3U8TaskOption.java
@@ -17,6 +17,7 @@ package com.arialyy.aria.m3u8;

 import com.arialyy.aria.core.inf.ITaskOption;
 import com.arialyy.aria.core.processor.IBandWidthUrlConverter;
+import com.arialyy.aria.core.processor.IKeyUrlConverter;
 import com.arialyy.aria.core.processor.ILiveTsUrlConverter;
 import com.arialyy.aria.core.processor.ITsMergeHandler;
 import com.arialyy.aria.core.processor.IVodTsUrlConverter;
@@ -103,6 +104,19 @@ public class M3U8TaskOption implements ITaskOption {
   */
  private boolean generateIndexFile = false;

+  /**
+   * 加密密钥的解密处理器
+   */
+  private SoftReference<IKeyUrlConverter> keyUrlConverter;
+
+  public IKeyUrlConverter getKeyUrlConverter() {
+    return keyUrlConverter == null ? null : keyUrlConverter.get();
+  }
+
+  public void setKeyUrlConverter(IKeyUrlConverter keyUrlConverter) {
+    this.keyUrlConverter = new SoftReference<>(keyUrlConverter);
+  }
+
  public boolean isGenerateIndexFile() {
    return generateIndexFile;
  }
--- a/PublicComponent/src/main/java/com/arialyy/aria/core/TaskOptionParams.java
+++ b/PublicComponent/src/main/java/com/arialyy/aria/core/TaskOptionParams.java
@@ -22,6 +22,7 @@ import com.arialyy.aria.core.processor.FtpInterceptHandler;
 import com.arialyy.aria.core.processor.IBandWidthUrlConverter;
 import com.arialyy.aria.core.processor.IFtpUploadInterceptor;
 import com.arialyy.aria.core.processor.IHttpFileLenAdapter;
+import com.arialyy.aria.core.processor.IKeyUrlConverter;
 import com.arialyy.aria.core.processor.ILiveTsUrlConverter;
 import com.arialyy.aria.core.processor.ITsMergeHandler;
 import com.arialyy.aria.core.processor.IVodTsUrlConverter;
@@ -61,6 +62,7 @@ public class TaskOptionParams {
    PROCESSORES.add(ILiveTsUrlConverter.class);
    PROCESSORES.add(ITsMergeHandler.class);
    PROCESSORES.add(IVodTsUrlConverter.class);
+    PROCESSORES.add(IKeyUrlConverter.class);
  }

  /**
--- a/PublicComponent/src/main/java/com/arialyy/aria/core/common/RecordHelper.java
+++ b/PublicComponent/src/main/java/com/arialyy/aria/core/common/RecordHelper.java
@@ -63,7 +63,8 @@ public class RecordHelper {
      fileExists = true;
    }
    // 处理文件被删除的情况
-    if (fileExists) {
+    if (!fileExists) {
+      ALog.w(TAG, String.format("文件【%s】被删除，重新分配线程区间", mTaskRecord.filePath));
      for (int i = 0; i < mTaskRecord.threadNum; i++) {
        long startL = i * blockSize, endL = (i + 1) * blockSize;
        ThreadRecord tr = mTaskRecord.threadRecords.get(i);
--- a/PublicComponent/src/main/java/com/arialyy/aria/core/processor/IKeyUrlConverter.java
+++ b/PublicComponent/src/main/java/com/arialyy/aria/core/processor/IKeyUrlConverter.java
@@ -0,0 +1,32 @@
+/*
+ * 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.aria.core.processor;
+
+import com.arialyy.aria.core.inf.IEventHandler;
+
+/**
+ * M3U8 密钥下载地址处理器，可用于解密被加密的密钥的下载地址
+ */
+public interface IKeyUrlConverter extends IEventHandler {
+
+  /**
+   * 将被加密的密钥下载地址转换为可使用的http下载地址
+   *
+   * @param keyUrl 加密的url地址
+   * @return 可正常访问的http地址
+   */
+  String convert(String keyUrl);
+}
--- a/PublicComponent/src/main/java/com/arialyy/aria/util/CommonUtil.java
+++ b/PublicComponent/src/main/java/com/arialyy/aria/util/CommonUtil.java
@@ -71,15 +71,15 @@ public class CommonUtil {
      ALog.e(TAG, "sql语句表达式不能为null");
      return false;
    }
-    if (expression.length == 1) {
-      ALog.e(TAG, String.format("表达式需要写入参数，参数信息：%s", Arrays.toString(expression)));
-      return false;
-    }
+    //if (expression.length == 1) {
+    //  ALog.e(TAG, String.format("表达式需要写入参数，参数信息：%s", Arrays.toString(expression)));
+    //  return false;
+    //}
    String where = expression[0];
-    if (!where.contains("?")) {
-      ALog.e(TAG, String.format("请在where语句的'='后编写?，参数信息：%s", Arrays.toString(expression)));
-      return false;
-    }
+    //if (!where.contains("?")) {
+    //  ALog.e(TAG, String.format("请在where语句的'='后编写?，参数信息：%s", Arrays.toString(expression)));
+    //  return false;
+    //}
    Pattern pattern = Pattern.compile("\\?");
    Matcher matcher = pattern.matcher(where);
    int count = 0;
--- a/README.md
+++ b/README.md
@@ -44,16 +44,16 @@ Aria有以下特点：

 ## 引入库
 [![license](http://img.shields.io/badge/license-Apache2.0-brightgreen.svg?style=flat)](https://github.com/AriaLyy/Aria/blob/master/LICENSE)
-[![Core](https://img.shields.io/badge/Core-v_3.7.8-pre-1-blue)](https://github.com/AriaLyy/Aria)
-[![Compiler](https://img.shields.io/badge/Compiler-v_3.7.8-pre-1-blue)](https://github.com/AriaLyy/Aria)
-[![FtpComponent](https://img.shields.io/badge/FtpComponent-v_3.7.8-pre-1-orange)](https://github.com/AriaLyy/Aria)
-[![M3U8Component](https://img.shields.io/badge/M3U8Component-v_3.7.8-pre-1-orange)](https://github.com/AriaLyy/Aria)
+[![Core](https://img.shields.io/badge/Core-3.7.9-blue)](https://github.com/AriaLyy/Aria)
+[![Compiler](https://img.shields.io/badge/Compiler-3.7.9-blue)](https://github.com/AriaLyy/Aria)
+[![FtpComponent](https://img.shields.io/badge/FtpComponent-3.7.9-orange)](https://github.com/AriaLyy/Aria)
+[![M3U8Component](https://img.shields.io/badge/M3U8Component-3.7.9-orange)](https://github.com/AriaLyy/Aria)

 ```java
-implementation 'com.arialyy.aria:core:v_3.7.8-pre-1'
-annotationProcessor 'com.arialyy.aria:compiler:v_3.7.8-pre-1'
-implementation 'com.arialyy.aria:ftpComponent:v_3.7.8-pre-1' # 如果需要使用ftp，请增加该组件
-implementation 'com.arialyy.aria:m3u8Component:v_3.7.8-pre-1' # 如果需要使用m3u8下载功能，请增加该组件
+implementation 'com.arialyy.aria:core:3.7.9'
+annotationProcessor 'com.arialyy.aria:compiler:3.7.9'
+implementation 'com.arialyy.aria:ftpComponent:3.7.9' # 如果需要使用ftp，请增加该组件
+implementation 'com.arialyy.aria:m3u8Component:3.7.9' # 如果需要使用m3u8下载功能，请增加该组件
 ```
 如果出现android support依赖错误，请将 `compile 'com.arialyy.aria:core:<last-version>'`替换为
 ```
@@ -137,9 +137,9 @@ protected void onCreate(Bundle savedInstanceState) {


 ### 版本日志
-  + v_v_3.7.8-pre-1 (2019/11/20)
-    - fix bug https://github.com/AriaLyy/Aria/issues/526
-
+  + v_3.7.9 (2019/11/28)
+    - fix bug https://github.com/AriaLyy/Aria/issues/537
+    
 [更多版本记录](https://github.com/AriaLyy/Aria/blob/master/DEV_LOG.md)

 ## 混淆配置
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,6 +72,8 @@ dependencies {
  implementation project(':M3U8Component')
  implementation project(':FtpComponent')
  implementation project(path: ':AriaAnnotations')
+
+  debugImplementation 'com.amitshekhar.android:debug-db:1.0.6'
 }
 repositories {
  mavenCentral()
--- a/app/src/main/java/com/arialyy/simple/base/BaseApplication.java
+++ b/app/src/main/java/com/arialyy/simple/base/BaseApplication.java
@@ -34,7 +34,7 @@ public class BaseApplication extends Application {
    super.onCreate();
    INSTANCE = this;
    AbsFrame.init(this);
-    Aria.init(this);
+    //Aria.init(this);
    if (BuildConfig.DEBUG) {
      //StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
      //    .detectAll()
--- a/app/src/main/java/com/arialyy/simple/core/download/HttpDownloadModule.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/HttpDownloadModule.java
@@ -51,8 +51,8 @@ public class HttpDownloadModule extends BaseViewModule {
    //String url = AppUtil.getConfigValue(context, HTTP_URL_KEY, defUrl);
    //String url =
    //    "http://sdkdown.muzhiwan.com/openfile/2019/05/21/com.netease.tom.mzw_5ce3ef8754d05.apk";
-    //String url = "http://image.totwoo.com/totwoo-TOTWOO-v3.5.6.apk";
-    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 = "http://image.totwoo.com/totwoo-TOTWOO-v3.5.6.apk";
+    //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);

--- a/app/src/main/java/com/arialyy/simple/core/download/SingleTaskActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/SingleTaskActivity.java
@@ -276,8 +276,9 @@ public class SingleTaskActivity extends BaseActivity<ActivitySingleBinding> {
        if (Aria.download(this).load(mTaskId).isRunning()) {
          Aria.download(this).load(mTaskId).stop();
        } else {
+          mUrl = "http://sdkdown.muzhiwan.com/openfile/2019/07/11/com.netease.syfz.mzw_5d26f8d9cee27.apk";
          Aria.download(this).load(mTaskId)
-              //.updateUrl("http://sdkdown.muzhiwan.com/openfile/2019/07/11/com.netease.syfz.mzw_5d26f8d9cee27.apk")
+              .updateUrl(mUrl)
              .resume();
        }
        break;
--- 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
@@ -49,6 +49,7 @@ public class M3U8LiveDLoadActivity extends BaseActivity<ActivityM3u8LiveBinding>
  private String mFilePath;
  private M3U8LiveModule mModule;
  private DownloadEntity mEntity;
+  private long mTaskId;

  @Override
  protected void init(Bundle savedInstanceState) {
@@ -63,6 +64,7 @@ public class M3U8LiveDLoadActivity extends BaseActivity<ActivityM3u8LiveBinding>
          return;
        }
        mEntity = entity;
+        mTaskId = mEntity.getId();
        getBinding().setStateStr(getString(R.string.start));
        getBinding().setUrl(entity.getUrl());
        getBinding().setFilePath(entity.getFilePath());
@@ -213,22 +215,23 @@ public class M3U8LiveDLoadActivity extends BaseActivity<ActivityM3u8LiveBinding>
  public void onClick(View view) {
    switch (view.getId()) {
      case R.id.start:
-        if (Aria.download(this).load(mEntity.getId()).isRunning()) {
+        if (Aria.download(this).load(mTaskId).isRunning()) {
          Aria.download(this).load(mEntity.getId()).stop();
        } else {
          startD();
        }
        break;
      case R.id.cancel:
-        if (AppUtil.chekEntityValid(mEntity)) {
+        if (mTaskId != -1){
          Aria.download(this).load(mEntity.getId()).cancel(true);
+          mTaskId = -1;
        }
        break;
    }
  }

  private void startD() {
-    Aria.download(M3U8LiveDLoadActivity.this)
+    mTaskId = Aria.download(M3U8LiveDLoadActivity.this)
        .load(mUrl)
        .setFilePath(mFilePath, true)
        .m3u8LiveOption(getLiveoption())
--- 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
@@ -36,6 +36,7 @@ import com.arialyy.aria.core.download.M3U8Entity;
 import com.arialyy.aria.core.download.m3u8.M3U8VodOption;
 import com.arialyy.aria.core.inf.IEntity;
 import com.arialyy.aria.core.processor.IBandWidthUrlConverter;
+import com.arialyy.aria.core.processor.IKeyUrlConverter;
 import com.arialyy.aria.core.processor.ITsMergeHandler;
 import com.arialyy.aria.core.processor.IVodTsUrlConverter;
 import com.arialyy.aria.core.task.DownloadTask;
@@ -308,6 +309,7 @@ public class M3U8VodDLoadActivity extends BaseActivity<ActivityM3u8VodBinding> {
        //.merge(true)
        .setVodTsUrlConvert(new VodTsUrlConverter());
        //.setMergeHandler(new TsMergeHandler());
+    option.setKeyUrlConverter(new KeyUrlConverter());
    option.setBandWidthUrlConverter(new BandWidthUrlConverter(mUrl));
    return option;
  }
@@ -357,4 +359,12 @@ public class M3U8VodDLoadActivity extends BaseActivity<ActivityM3u8VodBinding> {
      return url.substring(0, index + 1) + bandWidthUrl;
    }
  }
+
+  static  class KeyUrlConverter implements IKeyUrlConverter{
+
+    @Override public String convert(String keyUrl) {
+      ALog.d("TAG", "convertUrl....");
+      return null;
+    }
+  }
 }
--- 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
@@ -307,17 +307,17 @@ public class DownloadAdapter extends AbsRVAdapter<AbsEntity, DownloadAdapter.Sim
    switch (entity.getTaskType()) {
      case ITaskWrapper.D_FTP:
        //Aria.download(getContext()).loadFtp((DownloadEntity) entity).login("lao", "123456").create();
-        Aria.download(getContext()).loadFtp(entity.getId()).resume();
+        Aria.download(getContext()).loadFtp(entity.getId()).resume(true);
        break;
      case ITaskWrapper.D_FTP_DIR:
-        Aria.download(getContext()).loadFtpDir(entity.getId()).resume();
+        Aria.download(getContext()).loadFtpDir(entity.getId()).resume(true);
        break;
      case ITaskWrapper.D_HTTP:
      case ITaskWrapper.M3U8_VOD:
-        Aria.download(getContext()).load(entity.getId()).resume();
+        Aria.download(getContext()).load(entity.getId()).resume(true);
        break;
      case ITaskWrapper.DG_HTTP:
-        Aria.download(getContext()).loadGroup(entity.getId()).resume();
+        Aria.download(getContext()).loadGroup(entity.getId()).resume(true);
        break;
    }
  }
--- a/build.gradle
+++ b/build.gradle
@@ -44,8 +44,8 @@ task clean(type: Delete) {
 }

 ext {
-  versionCode = 378
-  versionName = '3.7.8-pre-1'
+  versionCode = 379
+  versionName = '3.7.9'
  userOrg = 'arialyy'
  groupId = 'com.arialyy.aria'
  publishVersion = versionName
Author	SHA1	Message	Date
laoyuyu	91daecd039	Merge branch 'master' of github.com:AriaLyy/Aria	2019-11-28 19:49:26 +08:00
laoyuyu	297cc99f2b	fix bug https://github.com/AriaLyy/Aria/issues/537	2019-11-28 19:48:50 +08:00
lyy	f5f8e9b528	Update Custom.md	2019-11-28 16:39:46 +08:00
lyy	94c3e8bb58	Update Custom.md	2019-11-28 16:37:04 +08:00
laoyuyu	ee5ee6e080	增加m3u8密钥url转换器	2019-11-28 09:59:08 +08:00
laoyuyu	c4cc804c67	增加立即恢复任务的接口，正常来说，当执行队列满时，调用恢复任务接口，只能将任务放到缓存队列中。如果希望调用恢复接口，马上进入执行队列，需要调用`resume(true)`这个重载方法。修复一个非分块模式下，无法恢复下载的问题增加M3U8加密密钥的下载地址转换器 https://github.com/AriaLyy/Aria/issues/522	2019-11-27 21:38:25 +08:00
laoyuyu	c9c00c38c6	Merge branch 'master' of github.com:AriaLyy/Aria	2019-11-26 19:32:16 +08:00
laoyuyu	846235a826	fix bug https://github.com/AriaLyy/Aria/issues/533 fix bug https://github.com/AriaLyy/Aria/issues/535	2019-11-26 19:28:06 +08:00
lyy	06dd6b35e0	Update README.md	2019-11-26 15:39:47 +08:00
lyy	944d69a1af	Update README.md	2019-11-21 10:37:21 +08:00