2019-12-31

Author: shouzhong

README.md

@@ -19,7 +19,7 @@
 ## 使用
 ### 依赖
 ```
-implementation 'com.shouzhong:Scanner:1.1.1'
+implementation 'com.shouzhong:Scanner:1.1.2-beta1'
 ```
 以下选择自己需要的
 ```

app/src/main/java/com/shouzhong/scanner/demo/ScannerActivity.java

@@ -145,9 +145,9 @@ private void startVibrator() {
 
     class ViewFinder extends View implements IViewFinder {
         private Rect framingRect;//扫码框所占区域
-        private float widthRatio = 0.8f;//扫码框宽度占view总宽度的比例
+        private float widthRatio = 0.9f;//扫码框宽度占view总宽度的比例
         private float heightRatio = 0.8f;
-        private float heightWidthRatio = 1f;//扫码框的高宽比
+        private float heightWidthRatio = 0.5626f;//扫码框的高宽比
         private int leftOffset = -1;//扫码框相对于左边的偏移量，若为负值，则扫码框会水平居中
         private int topOffset = -1;//扫码框相对于顶部的偏移量，若为负值，则扫码框会竖直居中
 
@@ -254,8 +254,8 @@ private synchronized void updateFramingRect() {
             Point viewSize = new Point(getWidth(), getHeight());
             int width = getWidth() * 801 / 1080, height = getWidth() * 811 / 1080;
             width = (int) (getWidth() * widthRatio);
-            height = (int) (getHeight() * heightRatio);
-//            height = (int) (heightWidthRatio * width);
+//            height = (int) (getHeight() * heightRatio);
+            height = (int) (heightWidthRatio * width);
 
             int left, top;
             if (leftOffset < 0) {

lib/src/main/java/com/shouzhong/scanner/Utils.java

@@ -355,6 +355,7 @@ static final Result decodeIdCard(byte[] bResultBuf, int resLen) throws Exception
             rdCount++;
         }
         if (idCard.type != Result.TYPE_ID_CARD_FRONT && idCard.type != Result.TYPE_ID_CARD_BACK) return null;
+        idCard.data = out.toString();
         return idCard;
     }
 }