发布v3.1.1

jenly1314 · Apr 29, 2024 · bb061d1 · bb061d1
1 parent e26dfc2
commit bb061d1
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -139,7 +139,7 @@ public class QRCodeScanActivity extends BarcodeCameraScanActivity {
                 .setAreaRectVerticalOffset(0)//设置识别区域垂直方向偏移量，默认为0，为0表示居中，可以为负数
                 .setAreaRectHorizontalOffset(0);//设置识别区域水平方向偏移量，默认为0，为0表示居中，可以为负数
         // BarcodeCameraScanActivity默认使用的MultiFormatAnalyzer，这里可以改为使用QRCodeAnalyzer
-        return new QRCodeAnalyzer(decodeConfig);
+        return new MultiFormatAnalyzer(decodeConfig);
     }
 
     /**
@@ -202,6 +202,10 @@ dependencies {
 
 ## 版本记录
 
+#### v3.1.1：2024-04-29
+* 更新CameraScan至v1.1.1
+* 更新zxing至v3.5.3
+
 #### v3.1.0：2023-12-31
 * 更新CameraScan至v1.1.0
 * 更新zxing至v3.5.2
@@ -225,16 +229,6 @@ dependencies {
 * 优化ImageAnalyzer中YUV数据的处理
 * 更新CameraX至v1.2.2
 
-#### v2.3.1：2023-3-4
-* 更新CameraX至v1.2.1
-* 更新Gradle至v7.5
-* 优化细节
-
-#### v2.3.0：2022-12-11
-* 更新CameraX至v1.2.0
-* 更新zxing至v3.5.1
-* 更新compileSdkVersion至33
-
 #### [查看更多版本记录](change_log.md)
 
 ## 赞赏

diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 40,
-      "versionName": "3.1.0",
+      "versionCode": 41,
+      "versionName": "3.1.1",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/java/com/king/zxing/app/FullScreenQRCodeScanActivity.kt b/app/src/main/java/com/king/zxing/app/FullScreenQRCodeScanActivity.kt
@@ -73,8 +73,8 @@ class FullScreenQRCodeScanActivity : BarcodeCameraScanActivity() {
      * 显示结果点
      */
     private fun displayResultPoint(result: AnalyzeResult<Result>) {
-        var width = result.bitmapWidth
-        var height = result.bitmapHeight
+        var width = result.imageWidth
+        var height = result.imageHeight
 
         val resultPoints = result.result.resultPoints
         val size = resultPoints.size

diff --git a/change_log.md b/change_log.md
@@ -1,5 +1,9 @@
 ## 版本记录
 
+#### v3.1.1：2024-04-29
+* 更新CameraScan至v1.1.1
+* 更新zxing至v3.5.3
+
 #### v3.1.0：2023-12-31
 * 更新CameraScan至v1.1.0
 * 更新zxing至v3.5.2

diff --git a/gradle.properties b/gradle.properties
@@ -18,8 +18,8 @@ android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 
-VERSION_NAME=3.1.0
-VERSION_CODE=40
+VERSION_NAME=3.1.1
+VERSION_CODE=41
 GROUP=com.github.jenly1314
 
 POM_DESCRIPTION=ZXingLite for Android

diff --git a/versions.gradle b/versions.gradle
@@ -1,7 +1,7 @@
 // App
 def app_version = [:]
-app_version.versionCode = 40
-app_version.versionName = "3.1.0"
+app_version.versionCode = 41
+app_version.versionName = "3.1.1"
 ext.app_version = app_version
 
 // build version
@@ -47,10 +47,10 @@ test.espresso = "androidx.test.espresso:espresso-core:$versions.espresso"
 deps.test = test
 
 // zxing
-deps.zxing = "com.google.zxing:core:3.5.2"
+deps.zxing = "com.google.zxing:core:3.5.3"
 
 // CameraScan
-deps.camera_scan = "com.github.jenly1314:camera-scan:1.1.0"
+deps.camera_scan = "com.github.jenly1314:camera-scan:1.1.1"
 // ViewfinderView
 deps.viewfinderview = "com.github.jenly1314:viewfinderview:1.1.0"