发布v2.0.0

jenly1314 · Aug 13, 2023 · 62c2f49 · 62c2f49
1 parent 7157f25
commit 62c2f49
Show file tree

Hide file tree

Showing 96 changed files with 289 additions and 4,678 deletions.
diff --git a/README.md b/README.md
diff --git a/app/build.gradle b/app/build.gradle
@@ -54,7 +54,6 @@ dependencies {
 
     implementation deps.app_dialog
 
-    implementation project(':mlkit-camera-core')
     implementation project(':mlkit-common')
     implementation project(':mlkit-barcode-scanning')
     implementation project(':mlkit-face-detection')

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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+
     <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
@@ -33,7 +37,7 @@
             android:theme="@style/CameraScanTheme"/>
 
         <activity android:name=".barcode.QRCodeScanningActivity"
-
+            android:screenOrientation="portrait"
             android:exported="false"
             android:theme="@style/CameraScanTheme"/>
 

diff --git a/app/src/main/java/com/king/mlkit/vision/app/Function.kt b/app/src/main/java/com/king/mlkit/vision/app/Function.kt
@@ -19,7 +19,7 @@ import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
-import com.king.mlkit.vision.camera.util.LogUtils
+import com.king.camera.scan.util.LogUtils
 
 /**
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>

diff --git a/app/src/main/java/com/king/mlkit/vision/app/MainActivity.kt b/app/src/main/java/com/king/mlkit/vision/app/MainActivity.kt
@@ -27,6 +27,10 @@ import androidx.appcompat.app.AppCompatActivity
 import com.google.mlkit.vision.barcode.common.Barcode
 import com.king.app.dialog.AppDialog
 import com.king.app.dialog.AppDialogConfig
+import com.king.camera.scan.CameraScan
+import com.king.camera.scan.analyze.Analyzer
+import com.king.camera.scan.util.LogUtils
+import com.king.camera.scan.util.PermissionUtils
 import com.king.mlkit.vision.app.barcode.BarcodeScanningActivity
 import com.king.mlkit.vision.app.barcode.MultipleQRCodeScanningActivity
 import com.king.mlkit.vision.app.barcode.QRCodeScanningActivity
@@ -41,10 +45,7 @@ import com.king.mlkit.vision.app.pose.PoseDetectionActivity
 import com.king.mlkit.vision.app.segmentation.SelfieSegmentationActivity
 import com.king.mlkit.vision.app.text.TextRecognitionActivity
 import com.king.mlkit.vision.barcode.BarcodeDecoder
-import com.king.mlkit.vision.camera.CameraScan
-import com.king.mlkit.vision.camera.analyze.Analyzer.OnAnalyzeListener
-import com.king.mlkit.vision.camera.util.LogUtils
-import com.king.mlkit.vision.camera.util.PermissionUtils
+
 
 /**
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
@@ -101,7 +102,7 @@ class MainActivity : AppCompatActivity() {
         data?.let {
             try {
                 val srcBitmap = MediaStore.Images.Media.getBitmap(contentResolver, it)
-                BarcodeDecoder.process(srcBitmap, object : OnAnalyzeListener<List<Barcode>?> {
+                BarcodeDecoder.process(srcBitmap, object : Analyzer.OnAnalyzeListener<List<Barcode>?> {
                     override fun onSuccess(result: List<Barcode>) {
                         if (result.isNotEmpty()) {
                             val buffer = StringBuilder()

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
@@ -19,12 +19,11 @@ import android.widget.ImageView
 import com.google.mlkit.vision.barcode.common.Barcode
 import com.king.app.dialog.AppDialog
 import com.king.app.dialog.AppDialogConfig
+import com.king.camera.scan.AnalyzeResult
+import com.king.camera.scan.CameraScan
 import com.king.mlkit.vision.app.R
 import com.king.mlkit.vision.app.drawRect
 import com.king.mlkit.vision.barcode.BarcodeCameraScanActivity
-import com.king.mlkit.vision.camera.AnalyzeResult
-import com.king.mlkit.vision.camera.CameraScan
-import com.king.mlkit.vision.camera.config.ResolutionCameraConfig
 
 /**
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
@@ -35,14 +34,13 @@ class BarcodeScanningActivity : BarcodeCameraScanActivity() {
         super.initCameraScan(cameraScan)
         cameraScan.setPlayBeep(true)
             .setVibrate(true)
-//            .setCameraConfig(ResolutionCameraConfig(this))// 设置CameraConfig
     }
 
     override fun onScanResultCallback(result: AnalyzeResult<MutableList<Barcode>>) {
 
         cameraScan.setAnalyzeImage(false)
         val buffer = StringBuilder()
-        val bitmap = result.bitmap.drawRect { canvas, paint ->
+        val bitmap = result.bitmap?.drawRect { canvas, paint ->
             for ((index, data) in result.result.withIndex()) {
                 buffer.append("[$index] ").append(data.displayValue).append("\n")
                 data.boundingBox?.let { box ->

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
@@ -19,11 +19,11 @@ import android.widget.ImageView
 import com.google.mlkit.vision.barcode.common.Barcode
 import com.king.app.dialog.AppDialog
 import com.king.app.dialog.AppDialogConfig
+import com.king.camera.scan.AnalyzeResult
+import com.king.camera.scan.CameraScan
 import com.king.mlkit.vision.app.R
 import com.king.mlkit.vision.app.drawRect
 import com.king.mlkit.vision.barcode.QRCodeCameraScanActivity
-import com.king.mlkit.vision.camera.AnalyzeResult
-import com.king.mlkit.vision.camera.CameraScan
 
 /**
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
@@ -34,7 +34,6 @@ class MultipleQRCodeScanningActivity : QRCodeCameraScanActivity() {
         super.initCameraScan(cameraScan)
         cameraScan.setPlayBeep(true)
             .setVibrate(true)
-//            .setCameraConfig(ResolutionCameraConfig(this))
     }
 
     override fun getLayoutId(): Int {
@@ -46,7 +45,7 @@ class MultipleQRCodeScanningActivity : QRCodeCameraScanActivity() {
         cameraScan.setAnalyzeImage(false)
 
         val buffer = StringBuilder()
-        val bitmap = result.bitmap.drawRect { canvas, paint ->
+        val bitmap = result.bitmap?.drawRect { canvas, paint ->
             for ((index, data) in result.result.withIndex()) {
                 buffer.append("[$index] ").append(data.displayValue).append("\n")
                 data.boundingBox?.let { box ->

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
@@ -19,11 +19,11 @@ import android.content.Intent
 import android.graphics.Point
 import android.widget.ImageView
 import com.google.mlkit.vision.barcode.common.Barcode
+import com.king.camera.scan.AnalyzeResult
+import com.king.camera.scan.CameraScan
+import com.king.camera.scan.util.PointUtils
 import com.king.mlkit.vision.app.R
 import com.king.mlkit.vision.barcode.QRCodeCameraScanActivity
-import com.king.mlkit.vision.camera.AnalyzeResult
-import com.king.mlkit.vision.camera.CameraScan
-import com.king.mlkit.vision.camera.util.PointUtils
 
 /**
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
@@ -67,20 +67,26 @@ 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
+        }
         for (barcode in results) {
             barcode.boundingBox?.let { box ->
                 //将实际的结果中心点坐标转换成界面预览的坐标
                 val point = PointUtils.transform(
                     box.centerX(),
                     box.centerY(),
-                    result.bitmap.width,
-                    result.bitmap.height,
+                    width,
+                    height,
                     viewfinderView.width,
                     viewfinderView.height
                 )
                 points.add(point)
             }
-
         }
         //设置Item点击监听
         viewfinderView.setOnItemClickListener {

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
@@ -19,9 +19,9 @@ import android.widget.ImageView
 import com.google.mlkit.vision.face.Face
 import com.king.app.dialog.AppDialog
 import com.king.app.dialog.AppDialogConfig
+import com.king.camera.scan.AnalyzeResult
 import com.king.mlkit.vision.app.R
 import com.king.mlkit.vision.app.drawRect
-import com.king.mlkit.vision.camera.AnalyzeResult
 import com.king.mlkit.vision.face.FaceCameraScanActivity
 
 /**
@@ -31,7 +31,7 @@ open class FaceDetectionActivity : FaceCameraScanActivity() {
 
     override fun onScanResultCallback(result: AnalyzeResult<MutableList<Face>>) {
         cameraScan.setAnalyzeImage(false)
-        val bitmap = result.bitmap.drawRect { canvas, paint ->
+        val bitmap = result.bitmap?.drawRect { canvas, paint ->
             for (data in result.result) {
                 canvas.drawRect(data.boundingBox, paint)
                 for (contour in data.allContours) {

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
@@ -19,9 +19,9 @@ import android.widget.ImageView
 import com.google.mlkit.vision.facemesh.FaceMesh
 import com.king.app.dialog.AppDialog
 import com.king.app.dialog.AppDialogConfig
+import com.king.camera.scan.AnalyzeResult
 import com.king.mlkit.vision.app.R
 import com.king.mlkit.vision.app.drawRect
-import com.king.mlkit.vision.camera.AnalyzeResult
 import com.king.mlkit.vision.facemesh.FaceMeshCameraScanActivity
 
 /**
@@ -31,7 +31,7 @@ open class FaceMeshDetectionActivity : FaceMeshCameraScanActivity() {
 
     override fun onScanResultCallback(result: AnalyzeResult<MutableList<FaceMesh>>) {
         cameraScan.setAnalyzeImage(false)
-        val bitmap = result.bitmap.drawRect { canvas, paint ->
+        val bitmap = result.bitmap?.drawRect { canvas, paint ->
             for (data in result.result) {
                 canvas.drawRect(data.boundingBox, paint)
 

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
@@ -2,7 +2,7 @@ package com.king.mlkit.vision.app.face
 
 import com.google.mlkit.vision.face.Face
 import com.google.mlkit.vision.face.FaceDetectorOptions
-import com.king.mlkit.vision.camera.analyze.Analyzer
+import com.king.camera.scan.analyze.Analyzer
 import com.king.mlkit.vision.face.analyze.FaceDetectionAnalyzer
 
 /**

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
@@ -18,7 +18,7 @@ package com.king.mlkit.vision.app.image
 import com.google.mlkit.vision.label.ImageLabel
 import com.king.app.dialog.AppDialog
 import com.king.app.dialog.AppDialogConfig
-import com.king.mlkit.vision.camera.AnalyzeResult
+import com.king.camera.scan.AnalyzeResult
 import com.king.mlkit.vision.image.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
@@ -2,7 +2,7 @@ package com.king.mlkit.vision.app.`object`
 
 import com.google.mlkit.vision.objects.DetectedObject
 import com.google.mlkit.vision.objects.defaults.ObjectDetectorOptions
-import com.king.mlkit.vision.camera.analyze.Analyzer
+import com.king.camera.scan.analyze.Analyzer
 import com.king.mlkit.vision.`object`.analyze.ObjectDetectionAnalyzer
 
 /**

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
@@ -19,9 +19,9 @@ import android.widget.ImageView
 import com.google.mlkit.vision.objects.DetectedObject
 import com.king.app.dialog.AppDialog
 import com.king.app.dialog.AppDialogConfig
+import com.king.camera.scan.AnalyzeResult
 import com.king.mlkit.vision.app.R
 import com.king.mlkit.vision.app.drawRect
-import com.king.mlkit.vision.camera.AnalyzeResult
 import com.king.mlkit.vision.`object`.ObjectCameraScanActivity
 
 /**
@@ -30,7 +30,7 @@ import com.king.mlkit.vision.`object`.ObjectCameraScanActivity
 open class ObjectDetectionActivity : ObjectCameraScanActivity() {
     override fun onScanResultCallback(result: AnalyzeResult<MutableList<DetectedObject>>) {
         cameraScan.setAnalyzeImage(false)
-        val bitmap = result.bitmap.drawRect { canvas, paint ->
+        val bitmap = result.bitmap?.drawRect { canvas, paint ->
             for (data in result.result) {
                 canvas.drawRect(data.boundingBox, paint)
             }

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
@@ -4,9 +4,9 @@ import android.widget.ImageView
 import com.google.mlkit.vision.pose.Pose
 import com.king.app.dialog.AppDialog
 import com.king.app.dialog.AppDialogConfig
+import com.king.camera.scan.AnalyzeResult
 import com.king.mlkit.vision.app.R
 import com.king.mlkit.vision.app.drawRect
-import com.king.mlkit.vision.camera.AnalyzeResult
 import com.king.mlkit.vision.pose.accurate.AccuratePoseCameraScanActivity
 
 /**
@@ -20,7 +20,7 @@ class AccuratePoseDetectionActivity : AccuratePoseCameraScanActivity() {
             return
         }
         cameraScan.setAnalyzeImage(false)
-        val bitmap = result.bitmap.drawRect { canvas, paint ->
+        val bitmap = result.bitmap?.drawRect { canvas, paint ->
             for (data in result.result.allPoseLandmarks) {
                 canvas.drawCircle(data.position.x, data.position.y, 6f, paint)
             }

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
@@ -4,9 +4,9 @@ import android.widget.ImageView
 import com.google.mlkit.vision.pose.Pose
 import com.king.app.dialog.AppDialog
 import com.king.app.dialog.AppDialogConfig
+import com.king.camera.scan.AnalyzeResult
 import com.king.mlkit.vision.app.R
 import com.king.mlkit.vision.app.drawRect
-import com.king.mlkit.vision.camera.AnalyzeResult
 import com.king.mlkit.vision.pose.PoseCameraScanActivity
 
 /**
@@ -20,7 +20,7 @@ class PoseDetectionActivity : PoseCameraScanActivity() {
             return
         }
         cameraScan.setAnalyzeImage(false)
-        val bitmap = result.bitmap.drawRect { canvas, paint ->
+        val bitmap = result.bitmap?.drawRect { canvas, paint ->
             for (data in result.result.allPoseLandmarks) {
                 canvas.drawCircle(data.position.x, data.position.y, 6f, paint)
             }

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
@@ -6,8 +6,8 @@ import androidx.annotation.ColorInt
 import com.google.mlkit.vision.segmentation.SegmentationMask
 import com.king.app.dialog.AppDialog
 import com.king.app.dialog.AppDialogConfig
+import com.king.camera.scan.AnalyzeResult
 import com.king.mlkit.vision.app.R
-import com.king.mlkit.vision.camera.AnalyzeResult
 import com.king.mlkit.vision.segmentation.SegmentationCameraScanActivity
 
 /**
@@ -31,41 +31,41 @@ class SelfieSegmentationActivity : SegmentationCameraScanActivity() {
         AppDialog.INSTANCE.showDialog(config, false)
     }
 
-    private fun processBitmap(result: AnalyzeResult<SegmentationMask>): Bitmap {
-        val bitmap = result.bitmap
-        val mask = result.result
-        val maskWidth = mask.width
-        val maskHeight = mask.height
+    private fun processBitmap(result: AnalyzeResult<SegmentationMask>): Bitmap? {
+        return result.bitmap?.let { bitmap ->
+            val mask = result.result
+            val maskWidth = mask.width
+            val maskHeight = mask.height
 
-        val isRawSizeMaskEnabled = maskWidth != bitmap.width || maskHeight != bitmap.height
-        val scaleX = bitmap.width * 1f / maskWidth
-        val scaleY = bitmap.height * 1f / maskHeight
+            val isRawSizeMaskEnabled = maskWidth != bitmap.width || maskHeight != bitmap.height
+            val scaleX = bitmap.width * 1f / maskWidth
+            val scaleY = bitmap.height * 1f / maskHeight
 
 
-        val resultBitmap = Bitmap.createBitmap(bitmap.width, bitmap.height, Bitmap.Config.ARGB_8888)
-        val maskBitmap = Bitmap.createBitmap(
-            maskColorsFromByteBuffer(mask), maskWidth, maskHeight, Bitmap.Config.ARGB_8888
-        )
+            val resultBitmap = Bitmap.createBitmap(bitmap.width, bitmap.height, Bitmap.Config.ARGB_8888)
+            val maskBitmap = Bitmap.createBitmap(
+                maskColorsFromByteBuffer(mask), maskWidth, maskHeight, Bitmap.Config.ARGB_8888
+            )
 
-        val canvas = Canvas(resultBitmap)
-        val paint = Paint()
-        //绘制原始图片
-        canvas.drawBitmap(bitmap, 0f, 0f, null)
-        paint.strokeWidth = 6f
-        paint.style = Paint.Style.STROKE
-        paint.color = Color.RED
-        val matrix = Matrix()
-        if (isRawSizeMaskEnabled) {
-            matrix.preScale(scaleX, scaleY)
-        }
-        //绘制蒙版图层
-        canvas.drawBitmap(maskBitmap, matrix, null)
-        bitmap.recycle()
-
-        canvas.save()
-        canvas.restore()
+            val canvas = Canvas(resultBitmap)
+            val paint = Paint()
+            //绘制原始图片
+            canvas.drawBitmap(bitmap, 0f, 0f, null)
+            paint.strokeWidth = 6f
+            paint.style = Paint.Style.STROKE
+            paint.color = Color.RED
+            val matrix = Matrix()
+            if (isRawSizeMaskEnabled) {
+                matrix.preScale(scaleX, scaleY)
+            }
+            //绘制蒙版图层
+            canvas.drawBitmap(maskBitmap, matrix, null)
+            bitmap.recycle()
 
-        return resultBitmap
+            canvas.save()
+            canvas.restore()
+            resultBitmap
+        }
     }
 
     @ColorInt