发布v2.2.0

jenly1314 · jenly1314 · commit 21044b683c85 · 2024-07-11T22:21:00.000+08:00
diff --git a/README.md b/README.md
@@ -105,37 +105,37 @@ Camera：为各个子库提供相机预览分析的核心库
 
     ```gradle
     
-    //公共库 (*必须) （1.3.0新增：当使用到MLKit下面的子库时，需依赖公共库）
-    implementation 'com.github.jenly1314.MLKit:mlkit-common:2.1.0'
+    //公共库 (*必须) 
+    implementation 'com.github.jenly1314.MLKit:mlkit-common:2.2.0'
     
     //--------------------------
     
     //条码识别 (可选)
-    implementation 'com.github.jenly1314.MLKit:mlkit-barcode-scanning:2.1.0'
+    implementation 'com.github.jenly1314.MLKit:mlkit-barcode-scanning:2.2.0'
     
     //人脸检测 (可选)
-    implementation 'com.github.jenly1314.MLKit:mlkit-face-detection:2.1.0'
+    implementation 'com.github.jenly1314.MLKit:mlkit-face-detection:2.2.0'
     
     //人脸网格检测 (可选)
-    implementation 'com.github.jenly1314.MLKit:mlkit-face-mesh-detection:2.1.0'
+    implementation 'com.github.jenly1314.MLKit:mlkit-face-mesh-detection:2.2.0'
     
     //图像标签 (可选)
-    implementation 'com.github.jenly1314.MLKit:mlkit-image-labeling:2.1.0'
+    implementation 'com.github.jenly1314.MLKit:mlkit-image-labeling:2.2.0'
     
     //对象检测 (可选)
-    implementation 'com.github.jenly1314.MLKit:mlkit-object-detection:2.1.0'
+    implementation 'com.github.jenly1314.MLKit:mlkit-object-detection:2.2.0'
     
     //姿势检测 (可选)
-    implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection:2.1.0'
+    implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection:2.2.0'
     
     //姿势检测精确版 (可选)
-    implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection-accurate:2.1.0'
+    implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection-accurate:2.2.0'
     
     //自拍分割 (可选)
-    implementation 'com.github.jenly1314.MLKit:mlkit-segmentation-selfie:2.1.0'
+    implementation 'com.github.jenly1314.MLKit:mlkit-segmentation-selfie:2.2.0'
     
     //文字识别 (可选)
-    implementation 'com.github.jenly1314.MLKit:mlkit-text-recognition:2.1.0'
+    implementation 'com.github.jenly1314.MLKit:mlkit-text-recognition:2.2.0'
     
     ```
 
@@ -311,12 +311,12 @@ BarcodeDecoder.process(bitmap).addOnSuccessListener(this) {
 
 #### JDK版本
 
-需使用JDK11+编译，在你项目中的build.gradle的android{}中添加配置：
+需使用JDK8+编译，在你项目中的build.gradle的android{}中添加配置：
 
 ```gradle
 compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
 }
 ```
 
@@ -329,6 +329,11 @@ compileOptions {
 
 ## 版本记录
 
+#### v2.2.0：2024-7-11
+* 更新CameraScan至v1.2.0
+* 更新ViewfinderView至v1.2.0
+* 更新MLKit相关依赖库版本
+
 #### v2.1.0：2023-12-31
 * 更新CameraScan至v1.1.0
 * 更新compileSdkVersion至34
diff --git a/app/build.gradle b/app/build.gradle
@@ -29,12 +29,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
     lint {
         abortOnError false
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": 11,
-      "versionName": "2.1.0",
+      "versionCode": 12,
+      "versionName": "2.2.0",
       "outputFile": "app-release.apk"
     }
   ],
diff --git a/change_log.md b/change_log.md
@@ -1,5 +1,10 @@
 ## 版本记录
 
+#### v2.2.0：2024-7-11
+* 更新CameraScan至v1.2.0
+* 更新ViewfinderView至v1.2.0
+* 更新MLKit相关依赖库版本
+
 #### v2.1.0：2023-12-31
 * 更新CameraScan至v1.1.0
 * 更新compileSdkVersion至34
diff --git a/gradle.properties b/gradle.properties
@@ -24,8 +24,8 @@ android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 
-VERSION_NAME=2.1.0
-VERSION_CODE=11
+VERSION_NAME=2.2.0
+VERSION_CODE=12
 GROUP=com.github.jenly1314.MLKit
 
 POM_DESCRIPTION=MLKit for Android
diff --git a/mlkit-barcode-scanning/build.gradle b/mlkit-barcode-scanning/build.gradle
@@ -22,8 +22,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     lint {
         abortOnError false
diff --git a/mlkit-barcode-scanning/src/main/java/com/king/mlkit/vision/barcode/analyze/BarcodeScanningAnalyzer.java b/mlkit-barcode-scanning/src/main/java/com/king/mlkit/vision/barcode/analyze/BarcodeScanningAnalyzer.java
@@ -34,7 +34,7 @@
  */
 public class BarcodeScanningAnalyzer extends CommonAnalyzer<List<Barcode>> {
 
-    private BarcodeScanner mDetector;
+    private final BarcodeScanner mDetector;
 
     public BarcodeScanningAnalyzer() {
         mDetector = BarcodeScanning.getClient();
diff --git a/mlkit-common/build.gradle b/mlkit-common/build.gradle
@@ -22,8 +22,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     lint {
         abortOnError false
diff --git a/mlkit-common/src/main/java/com/king/mlkit/vision/common/analyze/CommonAnalyzer.java b/mlkit-common/src/main/java/com/king/mlkit/vision/common/analyze/CommonAnalyzer.java
@@ -62,10 +62,10 @@ public void analyze(@NonNull ImageProxy imageProxy, @NonNull OnAnalyzeListener<T
             queue.add(bytes);
             joinQueue.set(true);
         }
-        if (queue.isEmpty()) {
+        final byte[] nv21Data = queue.poll();
+        if(nv21Data == null) {
             return;
         }
-        final byte[] nv21Data = queue.poll();
         try {
             ImageUtils.yuv_420_888toNv21(imageProxy, nv21Data);
             InputImage inputImage = InputImage.fromByteArray(
diff --git a/mlkit-face-detection/build.gradle b/mlkit-face-detection/build.gradle
@@ -22,8 +22,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     lint {
         abortOnError false
diff --git a/mlkit-face-detection/src/main/java/com/king/mlkit/vision/face/analyze/FaceDetectionAnalyzer.java b/mlkit-face-detection/src/main/java/com/king/mlkit/vision/face/analyze/FaceDetectionAnalyzer.java
@@ -34,7 +34,7 @@
  */
 public class FaceDetectionAnalyzer extends CommonAnalyzer<List<Face>> {
 
-    private FaceDetector mDetector;
+    private final FaceDetector mDetector;
 
     public FaceDetectionAnalyzer() {
         this(null);
diff --git a/mlkit-face-mesh-detection/build.gradle b/mlkit-face-mesh-detection/build.gradle
@@ -22,8 +22,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     lint {
         abortOnError false
diff --git a/mlkit-face-mesh-detection/src/main/java/com/king/mlkit/vision/facemesh/analyze/FaceMeshDetectionAnalyzer.java b/mlkit-face-mesh-detection/src/main/java/com/king/mlkit/vision/facemesh/analyze/FaceMeshDetectionAnalyzer.java
@@ -34,7 +34,7 @@
  */
 public class FaceMeshDetectionAnalyzer extends CommonAnalyzer<List<FaceMesh>> {
 
-    private FaceMeshDetector mDetector;
+    private final FaceMeshDetector mDetector;
 
     public FaceMeshDetectionAnalyzer() {
         this(null);
diff --git a/mlkit-image-labeling/build.gradle b/mlkit-image-labeling/build.gradle
@@ -22,8 +22,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     lint {
         abortOnError false
diff --git a/mlkit-image-labeling/src/main/java/com/king/mlkit/vision/image/analyze/ImageLabelingAnalyzer.java b/mlkit-image-labeling/src/main/java/com/king/mlkit/vision/image/analyze/ImageLabelingAnalyzer.java
@@ -35,7 +35,7 @@
  */
 public class ImageLabelingAnalyzer extends CommonAnalyzer<List<ImageLabel>> {
 
-    private ImageLabeler mDetector;
+    private final ImageLabeler mDetector;
 
     public ImageLabelingAnalyzer() {
         this(null);
diff --git a/mlkit-object-detection/build.gradle b/mlkit-object-detection/build.gradle
@@ -22,8 +22,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     lint {
         abortOnError false
diff --git a/mlkit-object-detection/src/main/java/com/king/mlkit/vision/object/analyze/ObjectDetectionAnalyzer.java b/mlkit-object-detection/src/main/java/com/king/mlkit/vision/object/analyze/ObjectDetectionAnalyzer.java
@@ -35,7 +35,7 @@
  */
 public class ObjectDetectionAnalyzer extends CommonAnalyzer<List<DetectedObject>> {
 
-    private ObjectDetector mDetector;
+    private final ObjectDetector mDetector;
 
     public ObjectDetectionAnalyzer() {
         this(null);
diff --git a/mlkit-pose-detection-accurate/build.gradle b/mlkit-pose-detection-accurate/build.gradle
@@ -22,8 +22,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     lint {
         abortOnError false
diff --git a/mlkit-pose-detection-accurate/src/main/java/com/king/mlkit/vision/pose/accurate/analyze/AccuratePoseDetectionAnalyzer.java b/mlkit-pose-detection-accurate/src/main/java/com/king/mlkit/vision/pose/accurate/analyze/AccuratePoseDetectionAnalyzer.java
@@ -33,7 +33,7 @@
  */
 public class AccuratePoseDetectionAnalyzer extends CommonAnalyzer<Pose> {
 
-    private PoseDetector mDetector;
+    private final PoseDetector mDetector;
 
     public AccuratePoseDetectionAnalyzer() {
         this(null);
diff --git a/mlkit-pose-detection/build.gradle b/mlkit-pose-detection/build.gradle
@@ -22,8 +22,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     lint {
         abortOnError false
diff --git a/mlkit-pose-detection/src/main/java/com/king/mlkit/vision/pose/analyze/PoseDetectionAnalyzer.java b/mlkit-pose-detection/src/main/java/com/king/mlkit/vision/pose/analyze/PoseDetectionAnalyzer.java
@@ -33,7 +33,7 @@
  */
 public class PoseDetectionAnalyzer extends CommonAnalyzer<Pose> {
 
-    private PoseDetector mDetector;
+    private final PoseDetector mDetector;
 
     public PoseDetectionAnalyzer() {
         this(null);
diff --git a/mlkit-segmentation-selfie/build.gradle b/mlkit-segmentation-selfie/build.gradle
@@ -22,8 +22,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     lint {
         abortOnError false
diff --git a/mlkit-segmentation-selfie/src/main/java/com/king/mlkit/vision/segmentation/analyze/SegmentationAnalyzer.java b/mlkit-segmentation-selfie/src/main/java/com/king/mlkit/vision/segmentation/analyze/SegmentationAnalyzer.java
@@ -32,7 +32,7 @@
  */
 public class SegmentationAnalyzer extends CommonAnalyzer<SegmentationMask> {
 
-    private Segmenter mDetector;
+    private final Segmenter mDetector;
 
     public SegmentationAnalyzer() {
         this(null);
diff --git a/mlkit-text-recognition/build.gradle b/mlkit-text-recognition/build.gradle
@@ -22,8 +22,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     lint {
         abortOnError false
diff --git a/mlkit-text-recognition/src/main/java/com/king/mlkit/vision/text/analyze/TextRecognitionAnalyzer.java b/mlkit-text-recognition/src/main/java/com/king/mlkit/vision/text/analyze/TextRecognitionAnalyzer.java
@@ -33,7 +33,7 @@
  */
 public class TextRecognitionAnalyzer extends CommonAnalyzer<Text> {
 
-    private TextRecognizer mDetector;
+    private final TextRecognizer mDetector;
 
     public TextRecognitionAnalyzer() {
         this(null);
diff --git a/versions.gradle b/versions.gradle
@@ -1,7 +1,7 @@
 //App
 def app_version = [:]
-app_version.versionCode = 11
-app_version.versionName = "2.1.0"
+app_version.versionCode = 12
+app_version.versionName = "2.2.0"
 ext.app_version = app_version
 
 //build version
@@ -53,15 +53,15 @@ deps.kotlin = "org.jetbrains.kotlin:kotlin-stdlib:$versions.kotlin"
 deps.corektx = "androidx.core:core-ktx:$versions.coreKtx"
 
 deps.google_mlkit_vision_common = "com.google.mlkit:vision-common:17.3.0"
-deps.google_mlkit_vision_interfaces = "com.google.mlkit:vision-interfaces:16.2.0"
+deps.google_mlkit_vision_interfaces = "com.google.mlkit:vision-interfaces:16.3.0"
 deps.google_mlkit_barcode_scanning = "com.google.mlkit:barcode-scanning:17.2.0"
-deps.google_mlkit_face_detection = "com.google.mlkit:face-detection:16.1.5"
-deps.google_mlkit_face_mesh_detection = "com.google.mlkit:face-mesh-detection:16.0.0-beta1"
-deps.google_mlkit_image_labeling = "com.google.mlkit:image-labeling:17.0.7"
-deps.google_mlkit_object_detection = "com.google.mlkit:object-detection:17.0.0"
-deps.google_mlkit_pose_detection = "com.google.mlkit:pose-detection:18.0.0-beta3"
-deps.google_mlkit_pose_detection_accurate = "com.google.mlkit:pose-detection-accurate:18.0.0-beta3"
-deps.google_mlkit_segmentation_selfie = "com.google.mlkit:segmentation-selfie:16.0.0-beta4"
+deps.google_mlkit_face_detection = "com.google.mlkit:face-detection:16.1.6"
+deps.google_mlkit_face_mesh_detection = "com.google.mlkit:face-mesh-detection:16.0.0-beta2"
+deps.google_mlkit_image_labeling = "com.google.mlkit:image-labeling:17.0.8"
+deps.google_mlkit_object_detection = "com.google.mlkit:object-detection:17.0.1"
+deps.google_mlkit_pose_detection = "com.google.mlkit:pose-detection:18.0.0-beta4"
+deps.google_mlkit_pose_detection_accurate = "com.google.mlkit:pose-detection-accurate:18.0.0-beta4"
+deps.google_mlkit_segmentation_selfie = "com.google.mlkit:segmentation-selfie:16.0.0-beta5"
 deps.google_mlkit_text_recognition = "com.google.mlkit:text-recognition:16.0.0"
 deps.google_mlkit_text_recognition_chinese = "com.google.mlkit:text-recognition-chinese:16.0.0"
 

Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,12 @@ android {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`compileOptions {`
`32`		`- sourceCompatibility JavaVersion.VERSION_11`
`33`		`- targetCompatibility JavaVersion.VERSION_11`
	`32`	`+ sourceCompatibility JavaVersion.VERSION_1_8`
	`33`	`+ targetCompatibility JavaVersion.VERSION_1_8`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`kotlinOptions {`
`37`		`- jvmTarget = JavaVersion.VERSION_11.toString()`
	`37`	`+ jvmTarget = JavaVersion.VERSION_1_8.toString()`
`38`	`38`	`}`
`39`	`39`	`lint {`
`40`	`40`	`abortOnError false`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ android {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`compileOptions {`
`25`		`- sourceCompatibility JavaVersion.VERSION_11`
`26`		`- targetCompatibility JavaVersion.VERSION_11`
	`25`	`+ sourceCompatibility JavaVersion.VERSION_1_8`
	`26`	`+ targetCompatibility JavaVersion.VERSION_1_8`
`27`	`27`	`}`
`28`	`28`	`lint {`
`29`	`29`	`abortOnError false`
Original file line number	Diff line number	Diff line change
`@@ -62,10 +62,10 @@ public void analyze(@NonNull ImageProxy imageProxy, @NonNull OnAnalyzeListener<T`
`62`	`62`	`queue.add(bytes);`
`63`	`63`	`joinQueue.set(true);`
`64`	`64`	`}`
`65`		`- if (queue.isEmpty()) {`
	`65`	`+ final byte[] nv21Data = queue.poll();`
	`66`	`+ if(nv21Data == null) {`
`66`	`67`	`return;`
`67`	`68`	`}`
`68`		`- final byte[] nv21Data = queue.poll();`
`69`	`69`	`try {`
`70`	`70`	`ImageUtils.yuv_420_888toNv21(imageProxy, nv21Data);`
`71`	`71`	`InputImage inputImage = InputImage.fromByteArray(`