发布v2.0.1

jenly1314 · Sep 12, 2023 · 1f411a1 · 1f411a1
1 parent 3086f73
commit 1f411a1
Show file tree

Hide file tree

Showing 27 changed files with 170 additions and 140 deletions.
diff --git a/README.md b/README.md
@@ -96,51 +96,51 @@ Camera：为各个子库提供相机预览分析的核心库
 
 1. 在Project的 **build.gradle** 或 **setting.gradle** 中添加远程仓库
 
-```gradle
-repositories {
-    //...
-    mavenCentral()
-    maven { url 'https://jitpack.io' }
-}
-```
+    ```gradle
+    repositories {
+        //...
+        mavenCentral()
+        maven { url 'https://jitpack.io' }
+    }
+    ```
 
 2. 在Module的 **build.gradle** 里面添加引入依赖项
 
-```gradle
-
-//公共库 (*必须) （1.3.0新增：当使用到MLKit下面的子库时，需依赖公共库）
-implementation 'com.github.jenly1314.MLKit:mlkit-common:2.0.0'
-
-//--------------------------
-
-//条码识别 (可选)
-implementation 'com.github.jenly1314.MLKit:mlkit-barcode-scanning:2.0.0'
-
-//人脸检测 (可选)
-implementation 'com.github.jenly1314.MLKit:mlkit-face-detection:2.0.0'
-
-//人脸网格检测 (可选)
-implementation 'com.github.jenly1314.MLKit:mlkit-face-mesh-detection:2.0.0'
-
-//图像标签 (可选)
-implementation 'com.github.jenly1314.MLKit:mlkit-image-labeling:2.0.0'
-
-//对象检测 (可选)
-implementation 'com.github.jenly1314.MLKit:mlkit-object-detection:2.0.0'
-
-//姿势检测 (可选)
-implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection:2.0.0'
-
-//姿势检测精确版 (可选)
-implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection-accurate:2.0.0'
-
-//自拍分割 (可选)
-implementation 'com.github.jenly1314.MLKit:mlkit-segmentation-selfie:2.0.0'
-
-//文字识别 (可选)
-implementation 'com.github.jenly1314.MLKit:mlkit-text-recognition:2.0.0'
-
-```
+    ```gradle
+    
+    //公共库 (*必须) （1.3.0新增：当使用到MLKit下面的子库时，需依赖公共库）
+    implementation 'com.github.jenly1314.MLKit:mlkit-common:2.0.1'
+    
+    //--------------------------
+    
+    //条码识别 (可选)
+    implementation 'com.github.jenly1314.MLKit:mlkit-barcode-scanning:2.0.1'
+    
+    //人脸检测 (可选)
+    implementation 'com.github.jenly1314.MLKit:mlkit-face-detection:2.0.1'
+    
+    //人脸网格检测 (可选)
+    implementation 'com.github.jenly1314.MLKit:mlkit-face-mesh-detection:2.0.1'
+    
+    //图像标签 (可选)
+    implementation 'com.github.jenly1314.MLKit:mlkit-image-labeling:2.0.1'
+    
+    //对象检测 (可选)
+    implementation 'com.github.jenly1314.MLKit:mlkit-object-detection:2.0.1'
+    
+    //姿势检测 (可选)
+    implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection:2.0.1'
+    
+    //姿势检测精确版 (可选)
+    implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection-accurate:2.0.1'
+    
+    //自拍分割 (可选)
+    implementation 'com.github.jenly1314.MLKit:mlkit-segmentation-selfie:2.0.1'
+    
+    //文字识别 (可选)
+    implementation 'com.github.jenly1314.MLKit:mlkit-text-recognition:2.0.1'
+    
+    ```
 
 ### 温馨提示
 
@@ -328,6 +328,10 @@ compileOptions {
 
 ## 版本记录
 
+#### v2.0.1：2023-9-13
+* 更新CameraScan至v1.0.1
+* 更新ViewfinderView至v1.1.0
+
 #### v2.0.0：2023-8-13
 * 移除相机核心库（**mlkit-camera-core**），改为依赖[CameraScan](https://github.com/jenly1314/CameraScan) 
 * 移除**mlkit-barcode-scanning** 中的 **ViewfinderView**，改为依赖[ViewfinderView](https://github.com/jenly1314/ViewfinderView)

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": 9,
-      "versionName": "2.0.0",
+      "versionCode": 10,
+      "versionName": "2.0.1",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/java/com/king/mlkit/vision/app/barcode/BarcodeScanningActivity.kt b/app/src/main/java/com/king/mlkit/vision/app/barcode/BarcodeScanningActivity.kt
@@ -26,6 +26,7 @@ import com.king.mlkit.vision.app.drawRect
 import com.king.mlkit.vision.barcode.BarcodeCameraScanActivity
 
 /**
+ * 条形码/二维码扫描示例
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
  */
 class BarcodeScanningActivity : BarcodeCameraScanActivity() {

diff --git a/app/src/main/java/com/king/mlkit/vision/app/barcode/MultipleQRCodeScanningActivity.kt b/app/src/main/java/com/king/mlkit/vision/app/barcode/MultipleQRCodeScanningActivity.kt
@@ -26,6 +26,7 @@ import com.king.mlkit.vision.app.drawRect
 import com.king.mlkit.vision.barcode.QRCodeCameraScanActivity
 
 /**
+ * 扫描多个二维码示例
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
  */
 class MultipleQRCodeScanningActivity : QRCodeCameraScanActivity() {

diff --git a/app/src/main/java/com/king/mlkit/vision/app/barcode/QRCodeScanningActivity.kt b/app/src/main/java/com/king/mlkit/vision/app/barcode/QRCodeScanningActivity.kt
@@ -26,6 +26,7 @@ import com.king.mlkit.vision.app.R
 import com.king.mlkit.vision.barcode.QRCodeCameraScanActivity
 
 /**
+ * 扫描二维码示例
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
  */
 class QRCodeScanningActivity : QRCodeCameraScanActivity() {
@@ -67,13 +68,8 @@ class QRCodeScanningActivity : QRCodeCameraScanActivity() {
         //取预览当前帧图片并显示，为结果点提供参照
         ivResult.setImageBitmap(previewView.bitmap)
         val points = ArrayList<Point>()
-        val frameMetadata = result.frameMetadata
-        var width = frameMetadata.width
-        var height = frameMetadata.height
-        if(frameMetadata.rotation == 90 || frameMetadata.rotation == 270) {
-            width = frameMetadata.height
-            height = frameMetadata.width
-        }
+        var width = result.bitmapWidth
+        var height = result.bitmapHeight
         for (barcode in results) {
             barcode.boundingBox?.let { box ->
                 //将实际的结果中心点坐标转换成界面预览的坐标
@@ -115,5 +111,4 @@ class QRCodeScanningActivity : QRCodeCameraScanActivity() {
 
     }
 
-
 }
diff --git a/app/src/main/java/com/king/mlkit/vision/app/face/FaceDetectionActivity.kt b/app/src/main/java/com/king/mlkit/vision/app/face/FaceDetectionActivity.kt
@@ -25,6 +25,7 @@ import com.king.mlkit.vision.app.drawRect
 import com.king.mlkit.vision.face.FaceCameraScanActivity
 
 /**
+ * 人脸检测示例
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
  */
 open class FaceDetectionActivity : FaceCameraScanActivity() {

diff --git a/app/src/main/java/com/king/mlkit/vision/app/face/FaceMeshDetectionActivity.kt b/app/src/main/java/com/king/mlkit/vision/app/face/FaceMeshDetectionActivity.kt
@@ -25,6 +25,7 @@ import com.king.mlkit.vision.app.drawRect
 import com.king.mlkit.vision.facemesh.FaceMeshCameraScanActivity
 
 /**
+ * 人脸网格检测示例
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
  */
 open class FaceMeshDetectionActivity : FaceMeshCameraScanActivity() {

diff --git a/app/src/main/java/com/king/mlkit/vision/app/face/MultipleFaceDetectionActivity.kt b/app/src/main/java/com/king/mlkit/vision/app/face/MultipleFaceDetectionActivity.kt
@@ -6,6 +6,7 @@ import com.king.camera.scan.analyze.Analyzer
 import com.king.mlkit.vision.face.analyze.FaceDetectionAnalyzer
 
 /**
+ * 多个人脸检测示例
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
  */
 class MultipleFaceDetectionActivity : FaceDetectionActivity() {

diff --git a/app/src/main/java/com/king/mlkit/vision/app/image/ImageLabelingActivity.kt b/app/src/main/java/com/king/mlkit/vision/app/image/ImageLabelingActivity.kt
@@ -22,6 +22,7 @@ import com.king.camera.scan.AnalyzeResult
 import com.king.mlkit.vision.image.ImageCameraScanActivity
 
 /**
+ * 图像标签示例
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
  */
 class ImageLabelingActivity : ImageCameraScanActivity() {

diff --git a/app/src/main/java/com/king/mlkit/vision/app/object/MultipleObjectDetectionActivity.kt b/app/src/main/java/com/king/mlkit/vision/app/object/MultipleObjectDetectionActivity.kt
@@ -6,6 +6,7 @@ import com.king.camera.scan.analyze.Analyzer
 import com.king.mlkit.vision.`object`.analyze.ObjectDetectionAnalyzer
 
 /**
+ * 多个对象检测示例
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
  */
 class MultipleObjectDetectionActivity : ObjectDetectionActivity() {

diff --git a/app/src/main/java/com/king/mlkit/vision/app/object/ObjectDetectionActivity.kt b/app/src/main/java/com/king/mlkit/vision/app/object/ObjectDetectionActivity.kt
@@ -25,6 +25,7 @@ import com.king.mlkit.vision.app.drawRect
 import com.king.mlkit.vision.`object`.ObjectCameraScanActivity
 
 /**
+ * 对象检测示例
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
  */
 open class ObjectDetectionActivity : ObjectCameraScanActivity() {

diff --git a/app/src/main/java/com/king/mlkit/vision/app/pose/AccuratePoseDetectionActivity.kt b/app/src/main/java/com/king/mlkit/vision/app/pose/AccuratePoseDetectionActivity.kt
@@ -10,6 +10,7 @@ import com.king.mlkit.vision.app.drawRect
 import com.king.mlkit.vision.pose.accurate.AccuratePoseCameraScanActivity
 
 /**
+ * 姿势检测（精确版）示例
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
  */
 class AccuratePoseDetectionActivity : AccuratePoseCameraScanActivity() {

diff --git a/app/src/main/java/com/king/mlkit/vision/app/pose/PoseDetectionActivity.kt b/app/src/main/java/com/king/mlkit/vision/app/pose/PoseDetectionActivity.kt
@@ -10,6 +10,7 @@ import com.king.mlkit.vision.app.drawRect
 import com.king.mlkit.vision.pose.PoseCameraScanActivity
 
 /**
+ * 姿势检测示例
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
  */
 class PoseDetectionActivity : PoseCameraScanActivity() {

diff --git a/app/src/main/java/com/king/mlkit/vision/app/segmentation/SelfieSegmentationActivity.kt b/app/src/main/java/com/king/mlkit/vision/app/segmentation/SelfieSegmentationActivity.kt
@@ -11,6 +11,7 @@ import com.king.mlkit.vision.app.R
 import com.king.mlkit.vision.segmentation.SegmentationCameraScanActivity
 
 /**
+ * 自拍分割示例
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
  */
 class SelfieSegmentationActivity : SegmentationCameraScanActivity() {

diff --git a/app/src/main/java/com/king/mlkit/vision/app/text/TextRecognitionActivity.kt b/app/src/main/java/com/king/mlkit/vision/app/text/TextRecognitionActivity.kt
@@ -28,6 +28,7 @@ import com.king.mlkit.vision.text.TextCameraScanActivity
 import com.king.mlkit.vision.text.analyze.TextRecognitionAnalyzer
 
 /**
+ * 文字识别示例
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
  */
 class TextRecognitionActivity : TextCameraScanActivity() {

diff --git a/gitpack.yml b/gitpack.yml
@@ -0,0 +1,2 @@
+jdk:
+  - openjdk11
diff --git a/gradle.properties b/gradle.properties
@@ -20,8 +20,8 @@ android.enableJetifier = true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style      = official
 
-VERSION_NAME=2.0.0
-VERSION_CODE=9
+VERSION_NAME=2.0.1
+VERSION_CODE=10
 GROUP=com.github.jenly1314.MLKit
 
 POM_DESCRIPTION=MLKit for Android

diff --git a/...rcode-scanning/src/main/java/com/king/mlkit/vision/barcode/BarcodeCameraScanActivity.java b/...rcode-scanning/src/main/java/com/king/mlkit/vision/barcode/BarcodeCameraScanActivity.java
@@ -15,10 +15,13 @@
  */
 package com.king.mlkit.vision.barcode;
 
+import android.view.View;
+
 import com.google.mlkit.vision.barcode.common.Barcode;
 import com.king.camera.scan.BaseCameraScanActivity;
 import com.king.camera.scan.analyze.Analyzer;
 import com.king.mlkit.vision.barcode.analyze.BarcodeScanningAnalyzer;
+import com.king.view.viewfinderview.ViewfinderView;
 
 import java.util.List;
 
@@ -33,6 +36,17 @@
  */
 public abstract class BarcodeCameraScanActivity extends BaseCameraScanActivity<List<Barcode>> {
 
+    protected ViewfinderView viewfinderView;
+
+    @Override
+    public void initUI() {
+        int viewfinderViewId = getViewfinderViewId();
+        if (viewfinderViewId != View.NO_ID && viewfinderViewId != 0) {
+            viewfinderView = findViewById(viewfinderViewId);
+        }
+        super.initUI();
+    }
+
     /**
      * 创建分析器，默认分析所有条码格式
      *
@@ -44,4 +58,24 @@ public Analyzer<List<Barcode>> createAnalyzer() {
         return new BarcodeScanningAnalyzer(Barcode.FORMAT_ALL_FORMATS);
     }
 
+    /**
+     * 布局ID；通过覆写此方法可以自定义布局
+     *
+     * @return 布局ID
+     */
+    @Override
+    public int getLayoutId() {
+        return R.layout.ml_barcode_camera_scan;
+    }
+
+    /**
+     * {@link #viewfinderView} 的 ID
+     *
+     * @return 默认返回{@code R.id.viewfinderView}, 如果不需要扫码框可以返回{@link View#NO_ID}
+     */
+
+    public int getViewfinderViewId() {
+        return R.id.viewfinderView;
+    }
+
 }
diff --git a/...rcode-scanning/src/main/java/com/king/mlkit/vision/barcode/BarcodeCameraScanFragment.java b/...rcode-scanning/src/main/java/com/king/mlkit/vision/barcode/BarcodeCameraScanFragment.java
@@ -15,10 +15,13 @@
  */
 package com.king.mlkit.vision.barcode;
 
+import android.view.View;
+
 import com.google.mlkit.vision.barcode.common.Barcode;
 import com.king.camera.scan.BaseCameraScanFragment;
 import com.king.camera.scan.analyze.Analyzer;
 import com.king.mlkit.vision.barcode.analyze.BarcodeScanningAnalyzer;
+import com.king.view.viewfinderview.ViewfinderView;
 
 import java.util.List;
 
@@ -32,6 +35,18 @@
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
  */
 public abstract class BarcodeCameraScanFragment extends BaseCameraScanFragment<List<Barcode>> {
+
+    protected ViewfinderView viewfinderView;
+
+    @Override
+    public void initUI() {
+        int viewfinderViewId = getViewfinderViewId();
+        if (viewfinderViewId != View.NO_ID && viewfinderViewId != 0) {
+            viewfinderView = getRootView().findViewById(viewfinderViewId);
+        }
+        super.initUI();
+    }
+
     /**
      * 创建分析器，默认分析所有条码格式
      *
@@ -43,4 +58,24 @@ public Analyzer<List<Barcode>> createAnalyzer() {
         return new BarcodeScanningAnalyzer(Barcode.FORMAT_ALL_FORMATS);
     }
 
+    /**
+     * 布局ID；通过覆写此方法可以自定义布局
+     *
+     * @return 布局ID
+     */
+    @Override
+    public int getLayoutId() {
+        return R.layout.ml_barcode_camera_scan;
+    }
+
+    /**
+     * {@link #viewfinderView} 的 ID
+     *
+     * @return 默认返回{@code R.id.viewfinderView}, 如果不需要扫码框可以返回{@link View#NO_ID}
+     */
+
+    public int getViewfinderViewId() {
+        return R.id.viewfinderView;
+    }
+
 }