aqhby/ZXingLite
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix#81

Browse Source
This commit is contained in:
Jenly
2020-03-29 17:01:42 +08:00
parent 5c16340d78
commit 888687e06a
7 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
README.md
View File

@@ -3,13 +3,14 @@
![Image](app/src/main/ic_launcher-web.png)
[![Download](https://img.shields.io/badge/download-App-blue.svg)](https://raw.githubusercontent.com/jenly1314/ZXingLite/master/app/release/app-release.apk)
[![JCenter](https://img.shields.io/badge/JCenter-1.1.7-46C018.svg)](https://bintray.com/beta/#/jenly/maven/zxing-lite)
[![JitPack](https://jitpack.io/v/jenly1314/ZXingLite.svg)](https://jitpack.io/#jenly1314/ZXingLite)
[![CI](https://travis-ci.org/jenly1314/ZXingLite.svg?branch=master)](https://travis-ci.org/jenly1314/ZXingLite)
[![CircleCI](https://circleci.com/gh/jenly1314/ZXingLite.svg?style=svg)](https://circleci.com/gh/jenly1314/ZXingLite)
[![API](https://img.shields.io/badge/API-16%2B-blue.svg?style=flat)](https://android-arsenal.com/api?level=16)
[![License](https://img.shields.io/badge/license-Apche%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
[![Blog](https://img.shields.io/badge/blog-Jenly-9933CC.svg)](https://jenly1314.github.io/)
[![QQGroup](https://img.shields.io/badge/QQGroup-20867961-blue.svg)](http://shang.qq.com/wpa/qunwpa?idkey=8fcc6a2f88552ea44b1.1.682c94fd124f7bb3ec227e2a400dbbfaad3dc2f5ad)
[![QQGroup](https://img.shields.io/badge/QQGroup-20867961-blue.svg)](http://shang.qq.com/wpa/qunwpa?idkey=8fcc6a2f88552ea44b1.1.782c94fd124f7bb3ec227e2a400dbbfaad3dc2f5ad)
ZXingLite for Android 是ZXing的精简版，基于ZXing库优化扫码和生成二维码/条形码功能，扫码界面完全支持自定义，也可一行代码使用默认实现的扫码功能。总之你想要的都在这里。
>简单如斯，你不试试？ Come on~
@@ -56,21 +57,21 @@ ZXingLite for Android 是ZXing的精简版，基于ZXing库优化扫码和生成
<dependency>
<groupId>com.king.zxing</groupId>
<artifactId>zxing-lite</artifactId>
<version>1.1.6</version>
<version>1.1.7</version>
<type>pom</type>
</dependency>
```
### Gradle:
```gradle
//AndroidX 版本
implementation 'com.king.zxing:zxing-lite:1.1.6-androidx'
implementation 'com.king.zxing:zxing-lite:1.1.7-androidx'
//Android 版本
implementation 'com.king.zxing:zxing-lite:1.1.6'
implementation 'com.king.zxing:zxing-lite:1.1.7'
```
### Lvy:
```lvy
<dependency org='com.king.zxing' name='zxing-lite' rev='1.1.6'>
<dependency org='com.king.zxing' name='zxing-lite' rev='1.1.7'>
<artifact name='$AID' ext='pom'></artifact>
</dependency>
```
@@ -171,6 +172,10 @@ api 'com.google.zxing:core:3.3.3'
## 版本记录
#### v1.1.7：2020-3-29
* 优化一些默认参数配置
* 修复扫码界面开启闪光灯并切到后台时，手电筒按钮状态未同步问题（fix#81）
#### v1.1.6：2019-12-27
* 生成条形码/二维码时支持自定义配置颜色
* 支持识别反色码（增强识别率，默认不支持，需通过CaptureHelper.supportLuminanceInvert(true)开启）
@@ -242,11 +247,11 @@ api 'com.google.zxing:core:3.3.3'
CSDN: <a title="CSDN博客" href="http://blog.csdn.net/jenly121" target="_blank">jenly121</a>
博客园: <a title="博客园" href="https://www.cnblogs.com/jenly" target="_blank">jenly</a>
CNBlogs: <a title="博客园" href="https://www.cnblogs.com/jenly" target="_blank">jenly</a>
Github: <a title="Github开源项目" href="https://github.com/jenly1314" target="_blank">jenly1314</a>
加入QQ群: <a title="点击加入QQ群" href="http://shang.qq.com/wpa/qunwpa?idkey=8fcc6a2f88552ea44b1.1.682c94fd124f7bb3ec227e2a400dbbfaad3dc2f5ad" target="_blank">20867961</a>
加入QQ群: <a title="点击加入QQ群" href="http://shang.qq.com/wpa/qunwpa?idkey=8fcc6a2f88552ea44b1.1.782c94fd124f7bb3ec227e2a400dbbfaad3dc2f5ad" target="_blank">20867961</a>
<div>
<img src="https://jenly1314.github.io/image/jenly666.png">
<img src="https://jenly1314.github.io/image/qqgourp.png">

BIN
app/release/app-release.apk
View File

Binary file not shown.

1
app/release/output.json
View File

@@ -1 +0,0 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":19,"versionName":"1.1.6","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

5
lib/src/main/java/com/king/zxing/CaptureHelper.java
View File

@@ -246,6 +246,10 @@ public class CaptureHelper implements CaptureLifecycle,CaptureTouchEvent,Capture
if (!hasSurface) {
surfaceHolder.removeCallback(this);
}
if(ivTorch != null && ivTorch.getVisibility() == View.VISIBLE){
ivTorch.setSelected(false);
ivTorch.setVisibility(View.INVISIBLE);
}
}
@@ -302,6 +306,7 @@ public class CaptureHelper implements CaptureLifecycle,CaptureTouchEvent,Capture
}
});
cameraManager.setOnSensorListener((torch, tooDark, ambientLightLux) -> {
Log.d(TAG,"ambientLightLux:" + ambientLightLux);
if(tooDark){
if(ivTorch.getVisibility() != View.VISIBLE){
ivTorch.setVisibility(View.VISIBLE);

5
lib/src/main/java/com/king/zxing/camera/CameraManager.java
View File

@@ -155,6 +155,10 @@ public final class CameraManager {
framingRect = null;
framingRectInPreview = null;
}
isTorch = false;
if(onTorchListener!=null){
onTorchListener.onTorchChanged(false);
}
}
/**
@@ -182,6 +186,7 @@ public final class CameraManager {
previewCallback.setHandler(null, 0);
previewing = false;
}
}
/**

16
lib/src/main/java/com/king/zxing/util/CodeUtils.java
View File

@@ -25,6 +25,7 @@ import android.support.annotation.FloatRange;
import android.support.annotation.NonNull;
import android.text.TextPaint;
import android.text.TextUtils;
import android.util.Log;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.BinaryBitmap;
@@ -41,6 +42,7 @@ import com.google.zxing.common.HybridBinarizer;
import com.google.zxing.qrcode.QRCodeReader;
import com.google.zxing.qrcode.QRCodeWriter;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import com.king.zxing.CaptureHelper;
import com.king.zxing.DecodeFormatManager;
import java.util.HashMap;
@@ -182,7 +184,7 @@ public final class CodeUtils {
return bitmap;
} catch (WriterException e) {
e.printStackTrace();
Log.w(CaptureHelper.TAG,e.getMessage());
}
return null;
@@ -230,7 +232,7 @@ public final class CodeUtils {
canvas.restore();
} catch (Exception e) {
bitmap = null;
e.printStackTrace();
Log.w(CaptureHelper.TAG,e.getMessage());
}
return bitmap;
@@ -244,6 +246,7 @@ public final class CodeUtils {
public static String parseQRCode(String bitmapPath) {
Map<DecodeHintType, Object> hints = new HashMap<>();
hints.put(DecodeHintType.CHARACTER_SET, "utf-8");
hints.put(DecodeHintType.TRY_HARDER, Boolean.TRUE);
return parseQRCode(bitmapPath,hints);
}
@@ -317,7 +320,7 @@ public final class CodeUtils {
}
}catch (Exception e){
e.printStackTrace();
Log.w(CaptureHelper.TAG,e.getMessage());
}
return result;
@@ -338,6 +341,7 @@ public final class CodeUtils {
decodeFormats.addAll(DecodeFormatManager.AZTEC_FORMATS);
decodeFormats.addAll(DecodeFormatManager.PDF417_FORMATS);
hints.put(DecodeHintType.CHARACTER_SET, "utf-8");
hints.put(DecodeHintType.TRY_HARDER,Boolean.TRUE);
hints.put(DecodeHintType.POSSIBLE_FORMATS, decodeFormats);
return parseCode(bitmapPath,hints);
@@ -414,7 +418,7 @@ public final class CodeUtils {
}
}catch (Exception e){
e.printStackTrace();
Log.w(CaptureHelper.TAG,e.getMessage());
}
return result;
@@ -604,7 +608,7 @@ public final class CodeUtils {
}
return bitmap;
} catch (WriterException e) {
e.printStackTrace();
Log.w(CaptureHelper.TAG,e.getMessage());
}
return null;
}
@@ -647,7 +651,7 @@ public final class CodeUtils {
canvas.restore();
} catch (Exception e) {
bitmap = null;
e.printStackTrace();
Log.w(CaptureHelper.TAG,e.getMessage());
}
return bitmap;

4
versions.gradle
View File

@@ -1,7 +1,7 @@
//App
def app_version = [:]
app_version.versionCode = 19 //androidx 20
app_version.versionName = "1.1.6"
app_version.versionCode = 21 //androidx 22
app_version.versionName = "1.1.7"
ext.app_version = app_version
//build version