From 650f62e3c7b1c0c974111006ffaeef53daae5207 Mon Sep 17 00:00:00 2001 From: Jenly Date: Mon, 6 Jun 2022 09:54:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=86=E8=8A=82(#194)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/king/zxing/ViewfinderView.java | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/zxing-lite/src/main/java/com/king/zxing/ViewfinderView.java b/zxing-lite/src/main/java/com/king/zxing/ViewfinderView.java index 00ce6dd..f43fb2e 100644 --- a/zxing-lite/src/main/java/com/king/zxing/ViewfinderView.java +++ b/zxing-lite/src/main/java/com/king/zxing/ViewfinderView.java @@ -115,15 +115,6 @@ public class ViewfinderView extends View { */ public int scannerEnd = 0; - /** - * 扫码初始框宽 - */ - private int initFrameWidth; - /** - * 扫码初始框高 - */ - private int initFrameHeight; - /** * 扫码框宽 */ @@ -289,8 +280,8 @@ public class ViewfinderView extends View { labelTextWidth = array.getDimensionPixelSize(R.styleable.ViewfinderView_labelTextWidth,0); labelTextLocation = TextLocation.getFromInt(array.getInt(R.styleable.ViewfinderView_labelTextLocation,0)); - initFrameWidth = array.getDimensionPixelSize(R.styleable.ViewfinderView_frameWidth,0); - initFrameHeight = array.getDimensionPixelSize(R.styleable.ViewfinderView_frameHeight,0); + frameWidth = array.getDimensionPixelSize(R.styleable.ViewfinderView_frameWidth,0); + frameHeight = array.getDimensionPixelSize(R.styleable.ViewfinderView_frameHeight,0); laserStyle = LaserStyle.getFromInt(array.getInt(R.styleable.ViewfinderView_laserStyle,LaserStyle.LINE.mValue)); gridColumn = array.getInt(R.styleable.ViewfinderView_gridColumn,20); @@ -358,11 +349,11 @@ public class ViewfinderView extends View { int size = (int)(Math.min(width,height) * frameRatio); - if(initFrameWidth <= 0 || initFrameWidth > width){ + if(frameWidth <= 0 || frameWidth > width){ frameWidth = size; } - if(initFrameHeight <= 0 || initFrameHeight > height){ + if(frameHeight <= 0 || frameHeight > height){ frameHeight = size; }