没做啥

.idea/misc.xml

@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

Aria/build.gradle

@@ -7,8 +7,8 @@ android {
   defaultConfig {
     minSdkVersion 9
     targetSdkVersion 23
-    versionCode 81
+    versionCode 82
-    versionName "2.3.3"
+    versionName "2.3.4"
   }
   buildTypes {
     release {

Aria/src/main/java/com/arialyy/aria/core/AriaManager.java

@@ -29,6 +29,7 @@ import android.support.v4.app.Fragment;
 import android.text.TextUtils;
 import android.util.Log;
 import com.arialyy.aria.core.command.CmdFactory;
+import com.arialyy.aria.core.scheduler.OnSchedulerListener;
 import com.arialyy.aria.util.CheckUtil;
 import com.arialyy.aria.util.CommonUtil;
 import com.arialyy.aria.core.command.IDownloadCmd;
@@ -37,6 +38,7 @@ import java.io.File;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -47,12 +49,12 @@ import java.util.Set;
  * Aria管理器，任务操作在这里执行
  */
 @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) public class AriaManager {
-  private static final    String                  TAG      = "AriaManager";
+  private static final String TAG = "AriaManager";
-  private static final    Object                  LOCK     = new Object();
+  private static final Object LOCK = new Object();
-  private static volatile AriaManager             INSTANCE = null;
+  private static volatile AriaManager INSTANCE = null;
-  private                 Map<String, AMReceiver> mTargets = new HashMap<>();
+  private Map<String, AMReceiver> mTargets = new HashMap<>();
   private DownloadManager mManager;
-  private LifeCallback    mLifeCallback;
+  private LifeCallback mLifeCallback;
 
   private AriaManager(Context context) {
     regAppLifeCallback(context);
@@ -99,7 +101,7 @@ import java.util.Set;
    */
   public void stopAllTask() {
     List<DownloadEntity> allEntity = mManager.getAllDownloadEntity();
-    List<IDownloadCmd>   stopCmds  = new ArrayList<>();
+    List<IDownloadCmd> stopCmds = new ArrayList<>();
     for (DownloadEntity entity : allEntity) {
       if (entity.getState() == DownloadEntity.STATE_DOWNLOAD_ING) {
         stopCmds.add(CommonUtil.createCmd(entity, CmdFactory.TASK_STOP));
@@ -158,8 +160,8 @@ import java.util.Set;
    * 删除所有任务
    */
   public void cancelAllTask() {
-    List<DownloadEntity> allEntity  = mManager.getAllDownloadEntity();
+    List<DownloadEntity> allEntity = mManager.getAllDownloadEntity();
-    List<IDownloadCmd>   cancelCmds = new ArrayList<>();
+    List<IDownloadCmd> cancelCmds = new ArrayList<>();
     for (DownloadEntity entity : allEntity) {
       cancelCmds.add(CommonUtil.createCmd(entity, CmdFactory.TASK_CANCEL));
     }
@@ -173,9 +175,9 @@ import java.util.Set;
   }
 
   private AMReceiver putTarget(Object obj) {
-    String     clsName = obj.getClass().getName();
+    String clsName = obj.getClass().getName();
-    AMReceiver target  = null;
+    AMReceiver target = null;
-    String     key     = "";
+    String key = "";
     if (!(obj instanceof Activity)) {
       if (obj instanceof android.support.v4.app.Fragment) {
         key = clsName + "_" + ((Fragment) obj).getActivity().getClass().getName();
@@ -209,12 +211,12 @@ import java.util.Set;
    */
   private void handleDialogDialogLift(Dialog dialog) {
     try {
-      Field   dismissField = CommonUtil.getField(dialog.getClass(), "mDismissMessage");
+      Field dismissField = CommonUtil.getField(dialog.getClass(), "mDismissMessage");
-      Message dismissMsg   = (Message) dismissField.get(dialog);
+      Message dismissMsg = (Message) dismissField.get(dialog);
       //如果Dialog已经设置Dismiss事件，则查找cancel事件
       if (dismissMsg != null) {
-        Field   cancelField = CommonUtil.getField(dialog.getClass(), "mCancelMessage");
+        Field cancelField = CommonUtil.getField(dialog.getClass(), "mCancelMessage");
-        Message cancelMsg   = (Message) cancelField.get(dialog);
+        Message cancelMsg = (Message) cancelField.get(dialog);
         if (cancelMsg != null) {
           Log.e(TAG, "你已经对Dialog设置了Dismiss和cancel事件。为了防止内存泄露，"
               + "请在dismiss方法中调用Aria.whit(this).removeSchedulerListener();来注销事件");
@@ -282,20 +284,35 @@ import java.util.Set;
    * onDestroy
    */
   private void destroySchedulerListener(Object obj) {
-    Set<String> keys    = mTargets.keySet();
+    Set<String> keys = mTargets.keySet();
-    String      clsName = obj.getClass().getName();
+    String clsName = obj.getClass().getName();
-    for (String key : keys) {
+    for (Iterator<Map.Entry<String, AMReceiver>> iter = mTargets.entrySet().iterator();
+        iter.hasNext(); ) {
+      Map.Entry<String, AMReceiver> entry = iter.next();
+      String key = entry.getKey();
       if (key.equals(clsName) || key.contains(clsName)) {
         AMReceiver receiver = mTargets.get(key);
         if (receiver.obj != null) {
           if (receiver.obj instanceof Application || receiver.obj instanceof Service) break;
           receiver.removeSchedulerListener();
           receiver.destroy();
-          mTargets.remove(key);
+          iter.remove();
         }
         break;
       }
     }
+    //for (String key : keys) {
+    //  if (key.equals(clsName) || key.contains(clsName)) {
+    //    AMReceiver receiver = mTargets.get(key);
+    //    if (receiver.obj != null) {
+    //      if (receiver.obj instanceof Application || receiver.obj instanceof Service) break;
+    //      receiver.removeSchedulerListener();
+    //      receiver.destroy();
+    //      mTargets.remove(key);
+    //    }
+    //    break;
+    //  }
+    //}
   }
 
   /**