update Priority

Author: jiaolei

library/src/com/lidroid/xutils/BitmapUtils.java

@@ -33,7 +33,6 @@
 import com.lidroid.xutils.bitmap.core.BitmapSize;
 import com.lidroid.xutils.bitmap.download.Downloader;
 import com.lidroid.xutils.cache.FileNameGenerator;
-import com.lidroid.xutils.task.Priority;
 import com.lidroid.xutils.task.PriorityAsyncTask;
 import com.lidroid.xutils.task.PriorityExecutor;
 import com.lidroid.xutils.task.TaskHandler;
@@ -271,11 +270,8 @@ public <T extends View> void display(T container, String uri, BitmapDisplayConfi
             Drawable loadingDrawable = displayConfig.getLoadingDrawable();
             callBack.setDrawable(container, new AsyncDrawable<T>(loadingDrawable, loadTask));
 
-            Priority priority = displayConfig.getPriority();
-            if (priority == null) {
-                priority = Priority.DEFAULT;
-            }
-            loadTask.executeOnExecutor(executor, priority);
+            loadTask.setPriority(displayConfig.getPriority());
+            loadTask.executeOnExecutor(executor);
         }
     }
 

library/src/com/lidroid/xutils/HttpUtils.java

@@ -24,7 +24,6 @@
 import com.lidroid.xutils.http.client.HttpRequest;
 import com.lidroid.xutils.http.client.RetryHandler;
 import com.lidroid.xutils.http.client.entity.GZipDecompressingEntity;
-import com.lidroid.xutils.task.Priority;
 import com.lidroid.xutils.task.PriorityExecutor;
 import com.lidroid.xutils.util.OtherUtils;
 import org.apache.http.*;
@@ -301,8 +300,11 @@ public HttpHandler<File> download(HttpRequest.HttpMethod method, String url, Str
 
         handler.setExpiry(currentRequestExpiry);
         handler.setHttpRedirectHandler(httpRedirectHandler);
-        request.setRequestParams(params, handler);
 
+        if (params != null) {
+            request.setRequestParams(params, handler);
+            handler.setPriority(params.getPriority());
+        }
         handler.executeOnExecutor(EXECUTOR, request, target, autoResume, autoRename);
         return handler;
     }
@@ -316,10 +318,8 @@ private <T> HttpHandler<T> sendRequest(HttpRequest request, RequestParams params
         handler.setHttpRedirectHandler(httpRedirectHandler);
         request.setRequestParams(params, handler);
 
-        Priority priority = null;
         if (params != null) {
-            priority = params.getPriority();
-            handler.setPriority(priority);
+            handler.setPriority(params.getPriority());
         }
         handler.executeOnExecutor(EXECUTOR, request);
         return handler;

library/src/com/lidroid/xutils/task/Priority.java

@@ -6,35 +6,11 @@
  * Time: 上午11:25
  */
 public enum Priority {
-    UI_TOP(0), UI_NORMAL(1), UI_LOW(2), DEFAULT(3), BG_TOP(4), BG_NORMAL(5), BG_LOW(6);
-    private int value = 0;
-
-    Priority(int value) {
-        this.value = value;
-    }
-
-    public int value() {
-        return this.value;
-    }
-
-    public static Priority valueOf(int value) {
-        switch (value) {
-            case 0:
-                return UI_TOP;
-            case 1:
-                return UI_NORMAL;
-            case 2:
-                return UI_LOW;
-            case 3:
-                return DEFAULT;
-            case 4:
-                return BG_TOP;
-            case 5:
-                return BG_NORMAL;
-            case 6:
-                return BG_LOW;
-            default:
-                return DEFAULT;
-        }
-    }
+    UI_TOP,
+    UI_NORMAL,
+    UI_LOW,
+    DEFAULT,
+    BG_TOP,
+    BG_NORMAL,
+    BG_LOW;
 }

library/src/com/lidroid/xutils/task/PriorityObjectBlockingQueue.java

@@ -107,7 +107,7 @@ private void _enqueue(Node<E> node) {
 
         while (curr.next != null) {
             temp = curr.next;
-            if (temp.getPriority().value() > node.getPriority().value()) {
+            if (temp.getPriority().ordinal() > node.getPriority().ordinal()) {
                 curr.next = node;
                 node.next = temp;
                 added = true;