diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 6f37571..ee955aa 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/README.md b/README.md index 3376057..daab93e 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 6: 完全自定义遮罩层 ## 截图: -![image](https://github.com/maning0303/MNZXingCode/blob/master/screenshots/mn_zxing_screenshot_000.jpeg) +![image](https://github.com/maning0303/MNZXingCode/blob/master/screenshots/mn_zxing_screenshot_000.jpg) ![image](https://github.com/maning0303/MNZXingCode/blob/master/screenshots/mn_zxing_screenshot_001.jpeg) #### 默认扫描 @@ -243,7 +243,7 @@ 1.优化代码 2.可以自定义Activity添加扫描 3.全屏扫描背景色自动透明 - 4.扫描文件移动到扫描框下方 + 4.扫描文字移动到扫描框下方 v2.1.3: 1.全屏模式去掉扫描框 diff --git a/libraryzxing/src/main/java/com/google/zxing/client/android/view/ViewfinderView.java b/libraryzxing/src/main/java/com/google/zxing/client/android/view/ViewfinderView.java index bad1e86..0db2372 100755 --- a/libraryzxing/src/main/java/com/google/zxing/client/android/view/ViewfinderView.java +++ b/libraryzxing/src/main/java/com/google/zxing/client/android/view/ViewfinderView.java @@ -120,7 +120,7 @@ private void initSize() { //间距 margin = CommonUtils.dip2px(context, 4); //扫描线的宽度 - laserLineW = CommonUtils.dip2px(context, 3); + laserLineW = CommonUtils.dip2px(context, 4); //四角线块 cornerLineH = CommonUtils.dip2px(context, 2); cornerLineW = CommonUtils.dip2px(context, 14); @@ -271,7 +271,11 @@ public void onDraw(Canvas canvas) { //全屏透明 paint.setColor(Color.TRANSPARENT); canvas.drawRect(0, 0, width, height, paint); + //扫描线的宽度 + laserLineW = CommonUtils.dip2px(context, 4); } else { + //扫描线的宽度 + laserLineW = CommonUtils.dip2px(context, 2); // 半透明背景 paint.setColor(maskColor); diff --git a/screenshots/mn_zxing_screenshot_000.jpeg b/screenshots/mn_zxing_screenshot_000.jpeg deleted file mode 100644 index bacae03..0000000 Binary files a/screenshots/mn_zxing_screenshot_000.jpeg and /dev/null differ diff --git a/screenshots/mn_zxing_screenshot_000.jpg b/screenshots/mn_zxing_screenshot_000.jpg new file mode 100644 index 0000000..f11363e Binary files /dev/null and b/screenshots/mn_zxing_screenshot_000.jpg differ