diff --git a/app/release/app-release.apk b/app/release/app-release.apk
deleted file mode 100644
index a4fa64d..0000000
Binary files a/app/release/app-release.apk and /dev/null differ
diff --git a/app/release/output.json b/app/release/output.json
deleted file mode 100644
index fa64104..0000000
--- a/app/release/output.json
+++ /dev/null
@@ -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":{}}]
\ 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 bce7c30..d0e5001 100644
--- a/lib/src/main/java/com/king/zxing/CaptureHelper.java
+++ b/lib/src/main/java/com/king/zxing/CaptureHelper.java
@@ -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);
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 8482616..23af7c8 100644
--- a/lib/src/main/java/com/king/zxing/camera/CameraManager.java
+++ b/lib/src/main/java/com/king/zxing/camera/CameraManager.java
@@ -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;
}
+
}
/**
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 aec61c5..47c60bd 100644
--- a/lib/src/main/java/com/king/zxing/util/CodeUtils.java
+++ b/lib/src/main/java/com/king/zxing/util/CodeUtils.java
@@ -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
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;
diff --git a/versions.gradle b/versions.gradle
index 715d0fe..77fb8fb 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -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