Sfoglia il codice sorgente

1.修改Android Apex Drivers将Operation Queue抽取到Lib。

Pen Li 7 anni fa
parent
commit
3aa8044520

+ 2 - 2
ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/ApexDriverApplication.java

@@ -32,7 +32,7 @@ import com.usai.redant.apexdrivers.home.HomeFragment;
 import com.usai.redant.apexdrivers.network.Network;
 import com.usai.redant.apexdrivers.offline.OfflineHandler;
 import com.usai.redant.apexdrivers.receiver.ApexDriverAlarmReceiver;
-import com.usai.redant.apexdrivers.utils.OperationQueue;
+import com.usai.redant.rautils.operationQueue.OperationQueue;
 import com.usai.redant.rautils.receiver.RABroadcast;
 import com.usai.redant.rautils.utils.AESUtil;
 
@@ -234,7 +234,7 @@ public class ApexDriverApplication extends Application {
             Intent intent = new Intent(getApplicationContext(),ApexDriversBackgroundService.class);
             bindService(intent,mServiceConnection, Context.BIND_AUTO_CREATE);
 
-            networkQueue = new OperationQueue();
+            networkQueue = OperationQueue.sharedQueue();
 
 
             Log.d("ApexDriverApplication", "onCreate: launch service successful");

+ 1 - 2
ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/detail/model/DetailPhotoModel.java

@@ -2,11 +2,10 @@ package com.usai.redant.apexdrivers.detail.model;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.media.Image;
 import android.text.TextUtils;
 
 import com.usai.redant.apexdrivers.ApexDriverApplication;
-import com.usai.redant.apexdrivers.utils.OperationQueue;
+import com.usai.redant.rautils.operationQueue.OperationQueue;
 import com.usai.redant.rautils.utils.ImageUtil;
 
 import java.net.URI;

+ 1 - 1
ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/detail/model/DetailSignatureModel.java

@@ -5,7 +5,7 @@ import android.graphics.Bitmap;
 import android.text.TextUtils;
 
 import com.usai.redant.apexdrivers.ApexDriverApplication;
-import com.usai.redant.apexdrivers.utils.OperationQueue;
+import com.usai.redant.rautils.operationQueue.OperationQueue;
 import com.usai.redant.rautils.utils.ImageUtil;
 
 import java.net.URI;

+ 1 - 1
ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/home/HomeFragment.java

@@ -33,7 +33,7 @@ import com.usai.redant.apexdrivers.SaveInstanceHelper;
 import com.usai.redant.apexdrivers.badgeview.BadgeView;
 import com.usai.redant.apexdrivers.detail.DetailActivity;
 import com.usai.redant.apexdrivers.message.MessageActivity;
-import com.usai.redant.apexdrivers.utils.OperationQueue;
+import com.usai.redant.rautils.operationQueue.OperationQueue;
 import com.usai.redant.rautils.utils.Network;
 
 import org.json.JSONArray;

+ 1 - 1
ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/home/HomeOrderModel.java

@@ -3,7 +3,7 @@ import android.content.Context;
 import android.graphics.Bitmap;
 
 import com.usai.redant.apexdrivers.ApexDriverApplication;
-import com.usai.redant.apexdrivers.utils.OperationQueue;
+import com.usai.redant.rautils.operationQueue.OperationQueue;
 import com.usai.redant.rautils.utils.ImageUtil;
 import com.usai.redant.rautils.utils.RAUtil;
 

+ 1 - 3
ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/message/MessageActivity.java

@@ -7,7 +7,6 @@ import android.graphics.Color;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.Gravity;
@@ -29,12 +28,11 @@ import com.usai.redant.apexdrivers.base.BasicActivity;
 import com.usai.redant.apexdrivers.detail.DetailActivity;
 import com.usai.redant.apexdrivers.message.model.MessageModel;
 import com.usai.redant.apexdrivers.network.Network;
-import com.usai.redant.apexdrivers.utils.OperationQueue;
+import com.usai.redant.rautils.operationQueue.OperationQueue;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.w3c.dom.Text;
 
 import java.util.ArrayList;
 

+ 1 - 1
ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/photoCell/PhotoItemModel.java

@@ -6,7 +6,7 @@ import android.graphics.BitmapFactory;
 
 import com.usai.redant.apexdrivers.ApexDriverApplication;
 import com.usai.redant.apexdrivers.base.BasicObject;
-import com.usai.redant.apexdrivers.utils.OperationQueue;
+import com.usai.redant.rautils.operationQueue.OperationQueue;
 import com.usai.redant.rautils.utils.ImageUtil;
 
 import org.json.JSONException;

+ 1 - 4
ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/setting/SettingActivity.java

@@ -5,12 +5,9 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Handler;
-import android.os.PersistableBundle;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -29,7 +26,7 @@ import com.usai.redant.apexdrivers.setting.model.LinkModel;
 import com.usai.redant.apexdrivers.setting.model.OptionModel;
 import com.usai.redant.apexdrivers.setting.model.SectionModel;
 import com.usai.redant.apexdrivers.setting.option.OptionActivity;
-import com.usai.redant.apexdrivers.utils.OperationQueue;
+import com.usai.redant.rautils.operationQueue.OperationQueue;
 import com.usai.redant.rautils.fileViewer.FileViewerActivity;
 import com.usai.redant.rautils.utils.FileManager;
 import com.usai.redant.rautils.utils.ImageUtil;

+ 1 - 1
ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/setting/changepassword/ChangePasswordDialog.java

@@ -21,7 +21,7 @@ import android.widget.TextView;
 import com.usai.redant.apexdrivers.ApexDriverApplication;
 import com.usai.redant.apexdrivers.R;
 import com.usai.redant.apexdrivers.network.Network;
-import com.usai.redant.apexdrivers.utils.OperationQueue;
+import com.usai.redant.rautils.operationQueue.OperationQueue;
 
 import org.json.JSONObject;
 

+ 0 - 79
ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/utils/OperationQueue.java

@@ -1,79 +0,0 @@
-package com.usai.redant.apexdrivers.utils;
-
-import android.os.AsyncTask;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class OperationQueue {
-
-    /**
-     * 根据CPU核心数控制线程数
-     * */
-    private static final int count = Runtime.getRuntime().availableProcessors() * 3;
-
-    private static ExecutorService limitedTaskExecutor = null;
-
-    public OperationQueue() {
-        limitedTaskExecutor = Executors.newFixedThreadPool(count);
-    }
-
-    public void addOperationTask(OperationBackgroundCallBack backgroundCallBack, OperationCompletionCallBack completion, OperationCancelCallBack cancelCallBack) {
-
-        OperationTask task = new OperationTask(backgroundCallBack,completion,cancelCallBack);
-        task.executeOnExecutor(limitedTaskExecutor);
-    }
-
-    private class OperationTask extends AsyncTask<Void, Void, Object> {
-
-        private OperationBackgroundCallBack mBackgroundCallBack;
-        private OperationCompletionCallBack mCompletion;
-        private OperationCancelCallBack mCancelCallBack;
-
-        OperationTask(OperationBackgroundCallBack backgroundCallBack, OperationCompletionCallBack completion, OperationCancelCallBack cancelCallBack) {
-            mBackgroundCallBack = backgroundCallBack;
-            mCompletion = completion;
-            mCancelCallBack = cancelCallBack;
-        }
-
-        @Override
-        protected Object doInBackground(Void... voids) {
-
-            if (mBackgroundCallBack != null) {
-                return mBackgroundCallBack.operationDoInBackground();
-            }
-
-            return null;
-        }
-
-        @Override
-        protected void onPostExecute(Object object) {
-
-            if (mCompletion != null) {
-                mCompletion.operationCompletion(object);
-            }
-        }
-
-        @Override
-        protected void onCancelled() {
-            super.onCancelled();
-
-            if (mCancelCallBack != null) {
-                mCancelCallBack.operationCancelled();
-            }
-        }
-    }
-
-    public interface OperationBackgroundCallBack {
-        Object operationDoInBackground();
-    }
-
-    public interface OperationCompletionCallBack {
-        void operationCompletion(Object object);
-    }
-
-    public interface OperationCancelCallBack {
-        void operationCancelled();
-    }
-
-}