From c03872aef534dc514b33cba975f2f40499a2705f Mon Sep 17 00:00:00 2001
From: Jenly <jenly1314@gmail.com>
Date: Tue, 20 Apr 2021 14:52:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/src/main/java/com/king/zxing/ViewfinderView.java | 8 --------
 lib/src/main/java/com/king/zxing/util/CodeUtils.java | 3 ++-
 lib/src/main/java/com/king/zxing/util/LogUtils.java  | 8 +++-----
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/lib/src/main/java/com/king/zxing/ViewfinderView.java b/lib/src/main/java/com/king/zxing/ViewfinderView.java
index 8151408..db7e943 100644
--- a/lib/src/main/java/com/king/zxing/ViewfinderView.java
+++ b/lib/src/main/java/com/king/zxing/ViewfinderView.java
@@ -17,8 +17,6 @@ package com.king.zxing;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.LinearGradient;
@@ -36,12 +34,6 @@ import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.View;
 
-import com.google.zxing.Result;
-import com.google.zxing.ResultPoint;
-
-import java.util.ArrayList;
-import java.util.List;
-
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
 import androidx.annotation.Nullable;
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 7d8063a..ce751fe 100644
--- a/lib/src/main/java/com/king/zxing/util/CodeUtils.java
+++ b/lib/src/main/java/com/king/zxing/util/CodeUtils.java
@@ -641,8 +641,9 @@ public final class CodeUtils {
             return null;
         }
 
-        Bitmap bitmap = Bitmap.createBitmap(srcWidth, srcHeight + textSize + offset * 2, Bitmap.Config.ARGB_8888);
+        Bitmap bitmap;
         try {
+            bitmap = Bitmap.createBitmap(srcWidth, srcHeight + textSize + offset * 2, Bitmap.Config.ARGB_8888);
             Canvas canvas = new Canvas(bitmap);
             canvas.drawBitmap(src, 0, 0, null);
             TextPaint paint = new TextPaint();
diff --git a/lib/src/main/java/com/king/zxing/util/LogUtils.java b/lib/src/main/java/com/king/zxing/util/LogUtils.java
index ce5f59f..0c087dc 100644
--- a/lib/src/main/java/com/king/zxing/util/LogUtils.java
+++ b/lib/src/main/java/com/king/zxing/util/LogUtils.java
@@ -26,8 +26,6 @@ public class LogUtils {
 
     public static final String TAG = "ZXingLite";
 
-    public static final String COLON = ":";
-
     public static final String VERTICAL = "|";
 
     /** 是否显示Log日志 */
@@ -71,7 +69,7 @@ public class LogUtils {
      */
     public static final int ASSERT = 7;
 
-    public static final String TAG_FORMAT = "%s.%s(L:%d)";
+    public static final String TAG_FORMAT = "%s.%s(%s:%d)";
 
     private LogUtils(){
         throw new AssertionError();
@@ -99,13 +97,13 @@ public class LogUtils {
 
     /**
      * 根据堆栈生成TAG
-     * @return TAG|className.methodName(L:lineNumber)
+     * @return TAG|className.methodName(fileName:lineNumber)
      */
     private static String generateTag(StackTraceElement caller) {
         String tag = TAG_FORMAT;
         String callerClazzName = caller.getClassName();
         callerClazzName = callerClazzName.substring(callerClazzName.lastIndexOf(".") + 1);
-        tag = String.format(tag,new Object[] { callerClazzName, caller.getMethodName(),Integer.valueOf(caller.getLineNumber()) });
+        tag = String.format(tag,new Object[] { callerClazzName, caller.getMethodName(),caller.getFileName(),Integer.valueOf(caller.getLineNumber()) });
         return new StringBuilder().append(TAG).append(VERTICAL).append(tag).toString();
     }