update

Author: devilsen

czxing/src/main/java/me/devilsen/czxing/thread/ExecutorUtil.java

@@ -5,6 +5,7 @@
 
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadFactory;
@@ -16,9 +17,9 @@ public class ExecutorUtil {
 
  private static Executor sMainExecutor;
  private static Handler sMainHandler;
- private static Executor sCalculateExecutor;
- private static Executor sSingleThreadExecutor;
- private static Executor sIOExecutor;
+ private static ExecutorService sCalculateExecutor;
+ private static ExecutorService sSingleThreadExecutor;
+ private static ExecutorService sIOExecutor;
 
 
  private synchronized static Executor getMainExecutor() {
@@ -34,7 +35,7 @@ public void execute(Runnable command) {
  return sMainExecutor;
  }
 
- public synchronized static Executor getIOExecutor() {
+ public synchronized static ExecutorService getIOExecutor() {
  if (sIOExecutor == null) {
  sIOExecutor = new ThreadPoolExecutor(0, Integer.MAX_VALUE,
  60L, TimeUnit.SECONDS,
@@ -44,7 +45,7 @@ public synchronized static Executor getIOExecutor() {
  return sIOExecutor;
  }
 
- public synchronized static Executor getCalculateExecutor() {
+ public synchronized static ExecutorService getCalculateExecutor() {
  if (sCalculateExecutor == null) {
  int processors = Runtime.getRuntime().availableProcessors();
  sCalculateExecutor = new ThreadPoolExecutor(processors, processors,
@@ -56,7 +57,7 @@ public synchronized static Executor getCalculateExecutor() {
  return sCalculateExecutor;
  }
 
- public synchronized static Executor getSingleThreadExecutor() {
+ public synchronized static ExecutorService getSingleThreadExecutor() {
  if (sSingleThreadExecutor == null) {
  sSingleThreadExecutor = Executors.newSingleThreadExecutor();
  }

czxing/src/main/java/me/devilsen/czxing/view/scanview/DetectView.java

@@ -8,6 +8,7 @@
 import me.devilsen.czxing.code.BarcodeDecoder;
 import me.devilsen.czxing.code.BarcodeFormat;
 import me.devilsen.czxing.code.CodeResult;
+import me.devilsen.czxing.thread.ExecutorUtil;
 
 /**
  * @author : dongSen
@@ -90,6 +91,8 @@ public void stopDetect() {
  public void onDestroy() {
  super.onDestroy();
  isStop = true;
+ ExecutorUtil.getCalculateExecutor().shutdownNow();
+ ExecutorUtil.getSingleThreadExecutor().shutdownNow();
  if (mDecoder != null) {
  mDecoder.destroy();
  mDecoder = null;

sample/src/main/java/me/sam/czxing/MainActivity.java

@@ -87,7 +87,7 @@ public void openScan(View view) {
  .setCornerColor(resources.getColor(R.color.corner))
  .setScanLineColors(scanColors)
 // .setHorizontalScanLine()
- .setBarcodeFormat(BarcodeFormat.EAN_13)
+// .setBarcodeFormat(BarcodeFormat.EAN_13)
  .setTitle("")
  .showAlbum(true)
  .setScanNoticeText("扫描二维码")