diff --git a/app/release/app-release.apk b/app/release/app-release.apk
index 2b8d3b7..6c39367 100644
Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index ecc8fe3..9bf3e43 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":20,"versionName":"1.1.6-androidx","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":22,"versionName":"1.1.7-androidx","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/lib/src/main/java/com/king/zxing/CaptureHelper.java b/lib/src/main/java/com/king/zxing/CaptureHelper.java
index 8831919..d249ffe 100644
--- a/lib/src/main/java/com/king/zxing/CaptureHelper.java
+++ b/lib/src/main/java/com/king/zxing/CaptureHelper.java
@@ -247,6 +247,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);
+ }
}
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 8dc218e..1448262 100644
--- a/lib/src/main/java/com/king/zxing/camera/CameraManager.java
+++ b/lib/src/main/java/com/king/zxing/camera/CameraManager.java
@@ -156,6 +156,10 @@ public final class CameraManager {
framingRect = null;
framingRectInPreview = null;
}
+ isTorch = false;
+ if(onTorchListener!=null){
+ onTorchListener.onTorchChanged(false);
+ }
}
/**
diff --git a/lib/src/main/java/com/king/zxing/util/CodeUtils.java b/lib/src/main/java/com/king/zxing/util/CodeUtils.java
index 9a13824..8eed17d 100644
--- a/lib/src/main/java/com/king/zxing/util/CodeUtils.java
+++ b/lib/src/main/java/com/king/zxing/util/CodeUtils.java
@@ -22,6 +22,7 @@ import android.graphics.Color;
import android.graphics.Paint;
import android.text.TextPaint;
import android.text.TextUtils;
+import android.util.Log;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.BinaryBitmap;
@@ -39,6 +40,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;
@@ -184,7 +186,7 @@ public final class CodeUtils {
return bitmap;
} catch (WriterException e) {
- e.printStackTrace();
+ Log.w(CaptureHelper.TAG,e.getMessage());
}
return null;
@@ -232,7 +234,7 @@ public final class CodeUtils {
canvas.restore();
} catch (Exception e) {
bitmap = null;
- e.printStackTrace();
+ Log.w(CaptureHelper.TAG,e.getMessage());
}
return bitmap;
@@ -246,6 +248,7 @@ public final class CodeUtils {
public static String parseQRCode(String bitmapPath) {
Map
hints = new HashMap<>();
hints.put(DecodeHintType.CHARACTER_SET, "utf-8");
+ hints.put(DecodeHintType.TRY_HARDER, Boolean.TRUE);
return parseQRCode(bitmapPath,hints);
}
@@ -319,7 +322,7 @@ public final class CodeUtils {
}
}catch (Exception e){
- e.printStackTrace();
+ Log.w(CaptureHelper.TAG,e.getMessage());
}
return result;
@@ -340,6 +343,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);
@@ -416,7 +420,7 @@ public final class CodeUtils {
}
}catch (Exception e){
- e.printStackTrace();
+ Log.w(CaptureHelper.TAG,e.getMessage());
}
return result;
@@ -606,7 +610,7 @@ public final class CodeUtils {
}
return bitmap;
} catch (WriterException e) {
- e.printStackTrace();
+ Log.w(CaptureHelper.TAG,e.getMessage());
}
return null;
}
@@ -649,7 +653,7 @@ public final class CodeUtils {
canvas.restore();
} catch (Exception e) {
bitmap = null;
- e.printStackTrace();
+ Log.w(CaptureHelper.TAG,e.getMessage());
}
return bitmap;
diff --git a/versions.gradle b/versions.gradle
index a187442..33d8866 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -1,7 +1,7 @@
//App
def app_version = [:]
-app_version.versionCode = 20
-app_version.versionName = "1.1.6-androidx"
+app_version.versionCode = 22
+app_version.versionName = "1.1.7-androidx"
ext.app_version = app_version
//build version