Split a query string into a list of name-value pairs.
- *
- * This is an alternative to the {@link Uri#getQueryParameterNames()} and
- * {@link Uri#getQueryParameters(String)}, which are quirky and not suitable
- * for exist-only Uri parameters.
- *
- * This method ignores multiple parameters with the same name and returns the
- * first one only. This is technically incorrect, but should be acceptable due
- * to the method of processing Hints: no multiple values for a hint.
- *
- * @param query query to split
- * @return name-value pairs
- */
- private static Map splitQuery(String query) {
- Map map = new HashMap<>();
- int pos = 0;
- while (pos < query.length()) {
- if (query.charAt(pos) == '&') {
- // Skip consecutive ampersand separators.
- pos ++;
- continue;
- }
- int amp = query.indexOf('&', pos);
- int equ = query.indexOf('=', pos);
- if (amp < 0) {
- // This is the last element in the query, no more ampersand elements.
- String name;
- String text;
- if (equ < 0) {
- // No equal sign
- name = query.substring(pos);
- name = name.replace('+', ' '); // Preemptively decode +
- name = Uri.decode(name);
- text = "";
- } else {
- // Split name and text.
- name = query.substring(pos, equ);
- name = name.replace('+', ' '); // Preemptively decode +
- name = Uri.decode(name);
- text = query.substring(equ + 1);
- text = text.replace('+', ' '); // Preemptively decode +
- text = Uri.decode(text);
- }
- if (!map.containsKey(name)) {
- map.put(name, text);
- }
- break;
- }
- if (equ < 0 || equ > amp) {
- // No equal sign until the &: this is a simple parameter with no value.
- String name = query.substring(pos, amp);
- name = name.replace('+', ' '); // Preemptively decode +
- name = Uri.decode(name);
- if (!map.containsKey(name)) {
- map.put(name, "");
- }
- pos = amp + 1;
- continue;
- }
- String name = query.substring(pos, equ);
- name = name.replace('+', ' '); // Preemptively decode +
- name = Uri.decode(name);
- String text = query.substring(equ + 1, amp);
- text = text.replace('+', ' '); // Preemptively decode +
- text = Uri.decode(text);
- if (!map.containsKey(name)) {
- map.put(name, text);
- }
- pos = amp + 1;
- }
- return map;
- }
-
- static Map parseDecodeHints(Uri inputUri) {
- String query = inputUri.getEncodedQuery();
- if (query == null || query.isEmpty()) {
- return null;
- }
-
- // Extract parameters
- Map parameters = splitQuery(query);
-
- Map hints = new EnumMap<>(DecodeHintType.class);
-
- for (DecodeHintType hintType: DecodeHintType.values()) {
-
- if (hintType == DecodeHintType.CHARACTER_SET ||
- hintType == DecodeHintType.NEED_RESULT_POINT_CALLBACK ||
- hintType == DecodeHintType.POSSIBLE_FORMATS) {
- continue; // This hint is specified in another way
- }
-
- String parameterName = hintType.name();
- String parameterText = parameters.get(parameterName);
- if (parameterText == null) {
- continue;
- }
- if (hintType.getValueType().equals(Object.class)) {
- // This is an unspecified type of hint content. Use the value as is.
- // TODO: Can we make a different assumption on this?
- hints.put(hintType, parameterText);
- continue;
- }
- if (hintType.getValueType().equals(Void.class)) {
- // Void hints are just flags: use the constant specified by DecodeHintType
- hints.put(hintType, Boolean.TRUE);
- continue;
- }
- if (hintType.getValueType().equals(String.class)) {
- // A string hint: use the decoded value.
- hints.put(hintType, parameterText);
- continue;
- }
- if (hintType.getValueType().equals(Boolean.class)) {
- // A boolean hint: a few values for false, everything else is true.
- // An empty parameter is simply a flag-style parameter, assuming true
- if (parameterText.isEmpty()) {
- hints.put(hintType, Boolean.TRUE);
- } else if ("0".equals(parameterText) ||
- "false".equalsIgnoreCase(parameterText) ||
- "no".equalsIgnoreCase(parameterText)) {
- hints.put(hintType, Boolean.FALSE);
- } else {
- hints.put(hintType, Boolean.TRUE);
- }
-
- continue;
- }
- if (hintType.getValueType().equals(int[].class)) {
- // An integer array. Used to specify valid lengths.
- // Strip a trailing comma as in Java style array initialisers.
- if (!parameterText.isEmpty() && parameterText.charAt(parameterText.length() - 1) == ',') {
- parameterText = parameterText.substring(0, parameterText.length() - 1);
- }
- String[] values = COMMA.split(parameterText);
- int[] array = new int[values.length];
- for (int i = 0; i < values.length; i++) {
- try {
- array[i] = Integer.parseInt(values[i]);
- } catch (NumberFormatException ignored) {
- Log.w(TAG, "Skipping array of integers hint " + hintType + " due to invalid numeric value: '" + values[i] + '\'');
- array = null;
- break;
- }
- }
- if (array != null) {
- hints.put(hintType, array);
- }
- continue;
- }
- Log.w(TAG, "Unsupported hint type '" + hintType + "' of type " + hintType.getValueType());
- }
-
- Log.i(TAG, "Hints from the URI: " + hints);
- return hints;
- }
-
- static Map parseDecodeHints(Intent intent) {
- Bundle extras = intent.getExtras();
- if (extras == null || extras.isEmpty()) {
- return null;
- }
- Map hints = new EnumMap<>(DecodeHintType.class);
-
- for (DecodeHintType hintType: DecodeHintType.values()) {
-
- if (hintType == DecodeHintType.CHARACTER_SET ||
- hintType == DecodeHintType.NEED_RESULT_POINT_CALLBACK ||
- hintType == DecodeHintType.POSSIBLE_FORMATS) {
- continue; // This hint is specified in another way
- }
-
- String hintName = hintType.name();
- if (extras.containsKey(hintName)) {
- if (hintType.getValueType().equals(Void.class)) {
- // Void hints are just flags: use the constant specified by the DecodeHintType
- hints.put(hintType, Boolean.TRUE);
- } else {
- Object hintData = extras.get(hintName);
- if (hintType.getValueType().isInstance(hintData)) {
- hints.put(hintType, hintData);
- } else {
- Log.w(TAG, "Ignoring hint " + hintType + " because it is not assignable from " + hintData);
- }
- }
- }
- }
-
- Log.i(TAG, "Hints from the Intent: " + hints);
- return hints;
- }
-
-}
\ No newline at end of file
diff --git a/lib/src/main/java/com/king/zxing/ViewfinderResultPointCallback.java b/lib/src/main/java/com/king/zxing/ViewfinderResultPointCallback.java
deleted file mode 100644
index 5f475cf..0000000
--- a/lib/src/main/java/com/king/zxing/ViewfinderResultPointCallback.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.king.zxing;
-
-/*
- * Copyright (C) 2009 ZXing authors
- *
- * 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.
- */
-
-
-import com.google.zxing.ResultPoint;
-import com.google.zxing.ResultPointCallback;
-
-final class ViewfinderResultPointCallback implements ResultPointCallback {
-
- private final ViewfinderView viewfinderView;
-
- ViewfinderResultPointCallback(ViewfinderView viewfinderView) {
- this.viewfinderView = viewfinderView;
- }
-
- @Override
- public void foundPossibleResultPoint(ResultPoint point) {
- viewfinderView.addPossibleResultPoint(point);
- }
-
-}
\ No newline at end of file
diff --git a/lib/src/main/java/com/king/zxing/ViewfinderView.java b/lib/src/main/java/com/king/zxing/ViewfinderView.java
index 71d35a4..c8693bf 100644
--- a/lib/src/main/java/com/king/zxing/ViewfinderView.java
+++ b/lib/src/main/java/com/king/zxing/ViewfinderView.java
@@ -27,9 +27,11 @@ import android.graphics.LinearGradient;
import android.graphics.Matrix;
import android.graphics.Paint;
import android.graphics.Path;
+import android.graphics.PointF;
import android.graphics.Rect;
import android.graphics.RectF;
import android.graphics.Shader;
+import android.support.annotation.ColorInt;
import android.support.annotation.ColorRes;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
@@ -39,6 +41,7 @@ import android.text.TextPaint;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
+import android.util.Log;
import android.util.TypedValue;
import android.view.View;
@@ -58,7 +61,7 @@ public final class ViewfinderView extends View {
private static final long ANIMATION_DELAY = 15L;
private static final int CURRENT_POINT_OPACITY = 0xA0;
private static final int MAX_RESULT_POINTS = 20;
- private static final int POINT_SIZE = 8;
+ private static final int POINT_SIZE = 20;
private static final int CORNER_RECT_WIDTH = 8; //扫描区边角的宽
private static final int CORNER_RECT_HEIGHT = 40; //扫描区边角的高
@@ -67,7 +70,6 @@ public final class ViewfinderView extends View {
private Paint paint;
private TextPaint textPaint;
- private Bitmap resultBitmap;
private int maskColor;
//扫描区域边框颜色
private int frameColor;
@@ -217,7 +219,7 @@ public final class ViewfinderView extends View {
this.labelText = labelText;
}
- public void setLabelTextColor(int color) {
+ public void setLabelTextColor(@ColorInt int color) {
this.labelTextColor = color;
}
@@ -256,31 +258,23 @@ public final class ViewfinderView extends View {
// Draw the exterior (i.e. outside the framing rect) darkened
drawExterior(canvas,frame,width,height);
-
- if (resultBitmap != null) {
- // Draw the opaque result bitmap over the scanning rectangle
- paint.setAlpha(CURRENT_POINT_OPACITY);
- canvas.drawBitmap(resultBitmap, null, frame, paint);
- } else {
-
- // Draw a red "laser scanner" line through the middle to show decoding is active
- drawLaserScanner(canvas,frame);
- // Draw a two pixel solid black border inside the framing rect
- drawFrame(canvas, frame);
- // 绘制边角
- drawCorner(canvas, frame);
- //绘制提示信息
- drawTextInfo(canvas, frame);
- //绘制扫码结果点
- drawResultPoint(canvas,frame);
- // Request another update at the animation interval, but only repaint the laser line,
- // not the entire viewfinder mask.
- postInvalidateDelayed(ANIMATION_DELAY,
- frame.left - POINT_SIZE,
- frame.top - POINT_SIZE,
- frame.right + POINT_SIZE,
- frame.bottom + POINT_SIZE);
- }
+ // Draw a red "laser scanner" line through the middle to show decoding is active
+ drawLaserScanner(canvas,frame);
+ // Draw a two pixel solid black border inside the framing rect
+ drawFrame(canvas, frame);
+ // 绘制边角
+ drawCorner(canvas, frame);
+ //绘制提示信息
+ drawTextInfo(canvas, frame);
+ //绘制扫码结果点
+ drawResultPoint(canvas,frame);
+ // Request another update at the animation interval, but only repaint the laser line,
+ // not the entire viewfinder mask.
+ postInvalidateDelayed(ANIMATION_DELAY,
+ frame.left - POINT_SIZE,
+ frame.top - POINT_SIZE,
+ frame.right + POINT_SIZE,
+ frame.bottom + POINT_SIZE);
}
/**
@@ -469,12 +463,9 @@ public final class ViewfinderView extends View {
paint.setAlpha(CURRENT_POINT_OPACITY);
paint.setColor(resultPointColor);
synchronized (currentPossible) {
+ float radius = POINT_SIZE / 2.0f;
for (ResultPoint point : currentPossible) {
- if(point.getX()frame.right ||
- point.getY()frame.bottom){
- continue;
- }
- canvas.drawCircle( point.getX(),point.getY(), POINT_SIZE, paint);
+ canvas.drawCircle( point.getX(),point.getY(), radius, paint);
}
}
}
@@ -484,10 +475,6 @@ public final class ViewfinderView extends View {
synchronized (currentLast) {
float radius = POINT_SIZE / 2.0f;
for (ResultPoint point : currentLast) {
- if(point.getX()frame.right ||
- point.getY()frame.bottom){
- continue;
- }
canvas.drawCircle( point.getX(),point.getY(), radius, paint);
}
}
@@ -495,11 +482,6 @@ public final class ViewfinderView extends View {
}
public void drawViewfinder() {
- Bitmap resultBitmap = this.resultBitmap;
- this.resultBitmap = null;
- if (resultBitmap != null) {
- resultBitmap.recycle();
- }
invalidate();
}
@@ -519,15 +501,6 @@ public final class ViewfinderView extends View {
isShowResultPoint = showResultPoint;
}
-// /**
-// * Draw a bitmap with the result points highlighted instead of the live scanning display.
-// *
-// * @param barcode An image of the decoded barcode.
-// */
-// public void drawResultBitmap(Bitmap barcode) {
-// resultBitmap = barcode;
-// invalidate();
-// }
public void addPossibleResultPoint(ResultPoint point) {
if(isShowResultPoint){
@@ -544,4 +517,6 @@ public final class ViewfinderView extends View {
}
+
+
}
\ No newline at end of file
diff --git a/lib/src/main/java/com/king/zxing/camera/CameraManager.java b/lib/src/main/java/com/king/zxing/camera/CameraManager.java
index 2221b4f..4319b79 100644
--- a/lib/src/main/java/com/king/zxing/camera/CameraManager.java
+++ b/lib/src/main/java/com/king/zxing/camera/CameraManager.java
@@ -21,6 +21,7 @@ import android.content.Context;
import android.graphics.Point;
import android.graphics.Rect;
import android.hardware.Camera;
+import android.media.FaceDetector;
import android.os.Handler;
import android.util.Log;
import android.view.SurfaceHolder;
@@ -58,6 +59,7 @@ public final class CameraManager {
private int requestedCameraId = OpenCameraInterface.NO_REQUESTED_CAMERA;
private int requestedFramingRectWidth;
private int requestedFramingRectHeight;
+ private boolean isFullScreenScan;
/**
* Preview frames are delivered here, which we pass on to the registered handler. Make sure to
@@ -221,35 +223,29 @@ public final class CameraManager {
if (camera == null) {
return null;
}
- Point screenResolution = configManager.getScreenResolution();
- if (screenResolution == null) {
+ Point point = configManager.getCameraResolution();
+ if (point == null) {
// Called early, before init even finished
return null;
}
- int width = findDesiredDimensionInRange(screenResolution.x, MIN_FRAME_WIDTH, MAX_FRAME_WIDTH);
- int height = findDesiredDimensionInRange(screenResolution.y, MIN_FRAME_HEIGHT, MAX_FRAME_HEIGHT);
+ int width = point.x;
+ int height = point.y;
- int size = Math.min(width,height);
+ if(isFullScreenScan){
+ framingRect = new Rect(0,0,width,height);
+ }else{
+ int size = Math.min(width,height);
+
+ int leftOffset = (width - size) / 2;
+ int topOffset = (height - size) / 2;
+ framingRect = new Rect(leftOffset, topOffset, leftOffset + size, topOffset + size);
+ }
- int leftOffset = (screenResolution.x - size) / 2;
- int topOffset = (screenResolution.y - size) / 2;
- framingRect = new Rect(leftOffset, topOffset, leftOffset + size, topOffset + size);
- Log.d(TAG, "Calculated framing rect: " + framingRect);
}
return framingRect;
}
- private static int findDesiredDimensionInRange(int resolution, int hardMin, int hardMax) {
- int dim = 5 * resolution / 8; // Target 5/8 of each dimension
- if (dim < hardMin) {
- return hardMin;
- }
- if (dim > hardMax) {
- return hardMax;
- }
- return dim;
- }
/**
* Like {@link #getFramingRect} but coordinates are in terms of the preview frame,
@@ -270,6 +266,7 @@ public final class CameraManager {
// Called early, before init even finished
return null;
}
+
// rect.left = rect.left * cameraResolution.x / screenResolution.x;
// rect.right = rect.right * cameraResolution.x / screenResolution.x;
// rect.top = rect.top * cameraResolution.y / screenResolution.y;
@@ -280,11 +277,28 @@ public final class CameraManager {
rect.top = rect.top * cameraResolution.x / screenResolution.y;
rect.bottom = rect.bottom * cameraResolution.x / screenResolution.y;
+
framingRectInPreview = rect;
}
+
return framingRectInPreview;
}
+ public boolean isFullScreenScan() {
+ return isFullScreenScan;
+ }
+
+ public void setFullScreenScan(boolean fullScreenScan) {
+ isFullScreenScan = fullScreenScan;
+ }
+
+ public Point getCameraResolution() {
+ return configManager.getCameraResolution();
+ }
+
+ public Point getScreenResolution() {
+ return configManager.getScreenResolution();
+ }
/**
* Allows third party apps to specify the camera ID, rather than determine
@@ -337,12 +351,16 @@ public final class CameraManager {
if (rect == null) {
return null;
}
+
+ if(isFullScreenScan){
+ return new PlanarYUVLuminanceSource(data,width,height,0,0,width,height,false);
+ }
int size = Math.min(width,height);
int left = (width-size)/2;
int top = (height-size)/2;
// Go ahead and assume it's YUV rather than die.
return new PlanarYUVLuminanceSource(data, width, height, left, top,
- left + size, top + size, false);
+ size, size, false);
}
}
\ No newline at end of file
diff --git a/versions.gradle b/versions.gradle
index 43184be..6fd6860 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -1,7 +1,7 @@
//App
def app_version = [:]
-app_version.versionCode = 9
-app_version.versionName = "1.1.0"
+app_version.versionCode = 10
+app_version.versionName = "1.1.1"
ext.app_version = app_version
//build version