更新MLKit相关依赖库版本

jenly1314 · jenly1314 · commit 1acac6bab921 · 2021-07-02T11:42:28.000+08:00
diff --git a/README.md b/README.md
@@ -241,6 +241,10 @@ compileOptions {
 
 ## 版本记录
 
+#### v1.0.1：2021-7-2
+* 更新MLKit相关依赖库版本
+* 优化细节
+
 #### v1.0.0：2021-4-7
 * MLKit初始版本
 
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
@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 1,
-      "versionName": "1.0.0",
+      "versionCode": 2,
+      "versionName": "1.0.1",
       "outputFile": "app-release.apk"
     }
   ]
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
@@ -23,6 +23,7 @@ import android.provider.MediaStore
 import android.view.View
 import android.widget.ImageView
 import androidx.appcompat.app.AppCompatActivity
+import com.google.android.gms.tasks.Task
 import com.google.mlkit.vision.barcode.Barcode
 import com.king.app.dialog.AppDialog
 import com.king.app.dialog.AppDialogConfig
@@ -48,6 +49,8 @@ import java.lang.StringBuilder
 
 class MainActivity : AppCompatActivity() {
 
+    var isQRCode = false
+
     companion object{
 
         const val REQUEST_CODE_PHOTO = 1
@@ -80,7 +83,8 @@ class MainActivity : AppCompatActivity() {
     private fun processPhoto(data: Intent?){
         data?.let {
             try{
-                val src = BitmapFactory.decodeFile(UriUtils.getPath(getContext(),data.data))
+                val src = MediaStore.Images.Media.getBitmap(contentResolver,it.data)
+//                val src = BitmapFactory.decodeFile(UriUtils.getPath(getContext(),data.data))
                 BarcodeDecoder.process(src, object : OnAnalyzeListener<List<Barcode>?> {
                     override fun onSuccess(result: List<Barcode>) {
                         if(result?.isNotEmpty()){
@@ -110,9 +114,11 @@ class MainActivity : AppCompatActivity() {
                         LogUtils.d("onFailure")
                         ToastUtils.showToast(getContext(),"onFailure")
                     }
-                })
+                //如果指定具体的识别条码类型，速度会更快
+                },if(isQRCode) Barcode.FORMAT_QR_CODE else Barcode.FORMAT_ALL_FORMATS)
             }catch (e: Exception){
-
+                e.printStackTrace()
+                ToastUtils.showToast(getContext(),e.message)
             }
 
         }
@@ -122,7 +128,8 @@ class MainActivity : AppCompatActivity() {
         startActivity(Intent(this, cls))
     }
 
-    private fun pickPhotoClicked(){
+    private fun pickPhotoClicked(isQRCode: Boolean){
+        this.isQRCode = isQRCode
         if(PermissionUtils.checkPermission(getContext(),Manifest.permission.READ_EXTERNAL_STORAGE)){
             startPickPhoto()
         }else{
@@ -142,16 +149,17 @@ class MainActivity : AppCompatActivity() {
         when (v.id){
             R.id.btn0 -> startActivity(QRCodeScanningActivity::class.java)
             R.id.btn1 -> startActivity(BarcodeScanningActivity::class.java)
-            R.id.btn2 -> pickPhotoClicked()
-            R.id.btn3 -> startActivity(FaceDetectionActivity::class.java)
-            R.id.btn4 -> startActivity(MultipleFaceDetectionActivity::class.java)
-            R.id.btn5 -> startActivity(ImageLabelingActivity::class.java)
-            R.id.btn6 -> startActivity(ObjectDetectionActivity::class.java)
-            R.id.btn7 -> startActivity(MultipleObjectDetectionActivity::class.java)
-            R.id.btn8 -> startActivity(PoseDetectionActivity::class.java)
-            R.id.btn9 -> startActivity(AccuratePoseDetectionActivity::class.java)
-            R.id.btn10 -> startActivity(SelfieSegmentationActivity::class.java)
-            R.id.btn11 -> startActivity(TextRecognitionActivity::class.java)
+            R.id.btn2 -> pickPhotoClicked(true)
+            R.id.btn3 -> pickPhotoClicked(false)
+            R.id.btn4 -> startActivity(FaceDetectionActivity::class.java)
+            R.id.btn5 -> startActivity(MultipleFaceDetectionActivity::class.java)
+            R.id.btn6 -> startActivity(ImageLabelingActivity::class.java)
+            R.id.btn7 -> startActivity(ObjectDetectionActivity::class.java)
+            R.id.btn8 -> startActivity(MultipleObjectDetectionActivity::class.java)
+            R.id.btn9 -> startActivity(PoseDetectionActivity::class.java)
+            R.id.btn10 -> startActivity(AccuratePoseDetectionActivity::class.java)
+            R.id.btn11 -> startActivity(SelfieSegmentationActivity::class.java)
+            R.id.btn12 -> startActivity(TextRecognitionActivity::class.java)
         }
     }
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -29,7 +29,6 @@
             android:layout_marginBottom="4dp"
             android:text="Barcode scanning"
             style="@style/OnClick"/>
-
         <Button
             android:id="@+id/btn2"
             android:layout_width="match_parent"
@@ -38,7 +37,7 @@
             android:layout_marginRight="20dp"
             android:layout_marginTop="4dp"
             android:layout_marginBottom="4dp"
-            android:text="Barcode recognition from image"
+            android:text="QRCode recognition from image"
             style="@style/OnClick"/>
         <Button
             android:id="@+id/btn3"
@@ -48,11 +47,21 @@
             android:layout_marginRight="20dp"
             android:layout_marginTop="4dp"
             android:layout_marginBottom="4dp"
+            android:text="Barcode recognition from image"
+            style="@style/OnClick"/>
+        <Button
+            android:id="@+id/btn4"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="4dp"
             android:text="High-accuracy landmark detection"
             style="@style/OnClick"/>
 
         <Button
-            android:id="@+id/btn4"
+            android:id="@+id/btn5"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="20dp"
@@ -62,7 +71,7 @@
             android:text="Multiple face detection"
             style="@style/OnClick"/>
         <Button
-            android:id="@+id/btn5"
+            android:id="@+id/btn6"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="20dp"
@@ -73,7 +82,7 @@
             style="@style/OnClick"/>
 
         <Button
-            android:id="@+id/btn6"
+            android:id="@+id/btn7"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="20dp"
@@ -84,7 +93,7 @@
             style="@style/OnClick"/>
 
         <Button
-            android:id="@+id/btn7"
+            android:id="@+id/btn8"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="20dp"
@@ -95,7 +104,7 @@
             style="@style/OnClick"/>
 
         <Button
-            android:id="@+id/btn8"
+            android:id="@+id/btn9"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="20dp"
@@ -106,7 +115,7 @@
             style="@style/OnClick"/>
 
         <Button
-            android:id="@+id/btn9"
+            android:id="@+id/btn10"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="20dp"
@@ -117,7 +126,7 @@
             style="@style/OnClick"/>
 
         <Button
-            android:id="@+id/btn10"
+            android:id="@+id/btn11"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="20dp"
@@ -128,7 +137,7 @@
             style="@style/OnClick"/>
 
         <Button
-            android:id="@+id/btn11"
+            android:id="@+id/btn12"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="20dp"
diff --git a/gradle.properties b/gradle.properties
@@ -21,8 +21,8 @@ android.enableJetifier = true
 kotlin.code.style      = official
 
 
-VERSION_NAME=1.0.0
-VERSION_CODE=1
+VERSION_NAME=1.0.1
+VERSION_CODE=2
 GROUP=com.github.jenly1314.MLKit
 
 POM_DESCRIPTION=MLKit for Android
@@ -39,5 +39,3 @@ POM_DEVELOPER_NAME=Jenly Yu
 RELEASE_REPOSITORY_URL=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
 SNAPSHOT_REPOSITORY_URL=https://s01.oss.sonatype.org/content/repositories/snapshots/
 RELEASE_SIGNING_ENABLED=true
-
-
diff --git a/mlkit-barcode-scanning/src/main/java/com/king/mlkit/vision/barcode/BarcodeDecoder.java b/mlkit-barcode-scanning/src/main/java/com/king/mlkit/vision/barcode/BarcodeDecoder.java
@@ -56,8 +56,13 @@ public static InputImage fromBitmap(Bitmap bitmap,int rotation){
         return InputImage.fromBitmap(bitmap,rotation);
     }
 
-    public static Task<List<Barcode>> process(Bitmap bitmap, Analyzer.OnAnalyzeListener<List<Barcode>> listener){
-        return BarcodeScanning.getClient().process(fromBitmap(bitmap)).addOnSuccessListener(result -> {
+
+    public static Task<List<Barcode>> process(Bitmap bitmap,Analyzer.OnAnalyzeListener<List<Barcode>> listener){
+        return process(bitmap,listener, Barcode.FORMAT_ALL_FORMATS);
+    }
+
+    public static Task<List<Barcode>> process(Bitmap bitmap, Analyzer.OnAnalyzeListener<List<Barcode>> listener, @Barcode.BarcodeFormat int format,@Barcode.BarcodeFormat int... formats){
+        return BarcodeScanning.getClient(new BarcodeScannerOptions.Builder().setBarcodeFormats(format,formats).build()).process(fromBitmap(bitmap)).addOnSuccessListener(result -> {
             if(listener != null){
                 if(result == null || result.isEmpty()){
                     listener.onFailure();
@@ -74,7 +79,11 @@ public static Task<List<Barcode>> process(Bitmap bitmap, Analyzer.OnAnalyzeListe
     }
 
     public static Task<List<Barcode>> process(Bitmap bitmap, @NonNull Executor executor,Analyzer.OnAnalyzeListener<List<Barcode>> listener){
-        return BarcodeScanning.getClient().process(fromBitmap(bitmap)).addOnSuccessListener(executor,result -> {
+        return process(bitmap,executor,listener, Barcode.FORMAT_ALL_FORMATS);
+    }
+
+    public static Task<List<Barcode>> process(Bitmap bitmap, @NonNull Executor executor,Analyzer.OnAnalyzeListener<List<Barcode>> listener, @Barcode.BarcodeFormat int format,@Barcode.BarcodeFormat int... formats){
+        return BarcodeScanning.getClient(new BarcodeScannerOptions.Builder().setBarcodeFormats(format,formats).build()).process(fromBitmap(bitmap)).addOnSuccessListener(executor,result -> {
             if(listener != null){
                 if(result == null || result.isEmpty()){
                     listener.onFailure();
@@ -83,7 +92,7 @@ public static Task<List<Barcode>> process(Bitmap bitmap, @NonNull Executor execu
                 }
             }
 
-        }).addOnFailureListener(e -> {
+        }).addOnFailureListener(executor, e -> {
             if(listener != null){
                 listener.onFailure();
             }
@@ -102,9 +111,13 @@ public static Task<List<Barcode>> process(Bitmap bitmap, @Barcode.BarcodeFormat
         return BarcodeScanning.getClient(new BarcodeScannerOptions.Builder().setBarcodeFormats(format,formats).build()).process(fromBitmap(bitmap));
     }
 
-
     public static Task<List<Barcode>> process(InputImage inputImage,Analyzer.OnAnalyzeListener<List<Barcode>> listener){
-        return BarcodeScanning.getClient().process(inputImage).addOnSuccessListener(result -> {
+        return process(inputImage,listener, Barcode.FORMAT_ALL_FORMATS);
+    }
+
+
+    public static Task<List<Barcode>> process(InputImage inputImage,Analyzer.OnAnalyzeListener<List<Barcode>> listener, @Barcode.BarcodeFormat int format,@Barcode.BarcodeFormat int... formats){
+        return BarcodeScanning.getClient(new BarcodeScannerOptions.Builder().setBarcodeFormats(format,formats).build()).process(inputImage).addOnSuccessListener(result -> {
             if(listener != null){
                 if(result == null || result.isEmpty()){
                     listener.onFailure();
@@ -121,7 +134,11 @@ public static Task<List<Barcode>> process(InputImage inputImage,Analyzer.OnAnaly
     }
 
     public static Task<List<Barcode>> process(InputImage inputImage, @NonNull Executor executor,Analyzer.OnAnalyzeListener<List<Barcode>> listener){
-        return BarcodeScanning.getClient().process(inputImage).addOnSuccessListener(executor,result -> {
+        return process(inputImage,executor,listener, Barcode.FORMAT_ALL_FORMATS);
+    }
+
+    public static Task<List<Barcode>> process(InputImage inputImage, @NonNull Executor executor,Analyzer.OnAnalyzeListener<List<Barcode>> listener, @Barcode.BarcodeFormat int format,@Barcode.BarcodeFormat int... formats){
+        return BarcodeScanning.getClient(new BarcodeScannerOptions.Builder().setBarcodeFormats(format,formats).build()).process(inputImage).addOnSuccessListener(executor,result -> {
             if(listener != null){
                 if(result == null ){
                     listener.onFailure();
@@ -130,7 +147,7 @@ public static Task<List<Barcode>> process(InputImage inputImage, @NonNull Execut
                 }
             }
 
-        }).addOnFailureListener(e -> {
+        }).addOnFailureListener(executor, e -> {
             if(listener != null){
                 listener.onFailure();
             }
diff --git a/versions.gradle b/versions.gradle
@@ -1,7 +1,7 @@
 //App
 def app_version = [:]
-app_version.versionCode = 1
-app_version.versionName = "1.0.0"
+app_version.versionCode = 2
+app_version.versionName = "1.0.1"
 ext.app_version = app_version
 
 //build version
@@ -34,7 +34,7 @@ versions.gralde = "4.1.3"
 versions.kotlin = "1.4.30"
 versions.coreKtx = "1.3.2"
 
-versions.camerax = "1.0.0-rc03"
+versions.camerax = "1.0.0"
 
 versions.easypermissions = "3.0.0"
 
@@ -64,18 +64,16 @@ deps.corektx = "androidx.core:core-ktx:$versions.coreKtx"
 deps.camera_core = "androidx.camera:camera-core:$versions.camerax"
 deps.camera_camera2 = "androidx.camera:camera-camera2:$versions.camerax"
 deps.camera_lifecycle = "androidx.camera:camera-lifecycle:$versions.camerax"
-deps.camera_view = "androidx.camera:camera-view:1.0.0-alpha20"
-
-
-deps.google_mlkit_barcode_scanning = "com.google.mlkit:barcode-scanning:16.1.1"
-deps.google_mlkit_face_detection = "com.google.mlkit:face-detection:16.0.6"
-deps.google_mlkit_image_labeling = "com.google.mlkit:image-labeling:17.0.3"
-deps.google_mlkit_object_detection = "com.google.mlkit:object-detection:16.2.3"
-deps.google_mlkit_pose_detection = "com.google.mlkit:pose-detection:17.0.1-beta3"
-deps.google_mlkit_pose_detection_accurate = "com.google.mlkit:pose-detection-accurate:17.0.1-beta3"
-deps.google_mlkit_segmentation_selfie = "com.google.mlkit:segmentation-selfie:16.0.0-beta1"
-deps.google_gms_text_recognition = "com.google.android.gms:play-services-mlkit-text-recognition:16.1.3"
-
+deps.camera_view = "androidx.camera:camera-view:1.0.0-alpha25"
+
+deps.google_mlkit_barcode_scanning = "com.google.mlkit:barcode-scanning:16.2.0"
+deps.google_mlkit_face_detection = "com.google.mlkit:face-detection:16.1.2"
+deps.google_mlkit_image_labeling = "com.google.mlkit:image-labeling:17.0.5"
+deps.google_mlkit_object_detection = "com.google.mlkit:object-detection:16.2.6"
+deps.google_mlkit_pose_detection = "com.google.mlkit:pose-detection:17.0.1-beta4"
+deps.google_mlkit_pose_detection_accurate = "com.google.mlkit:pose-detection-accurate:17.0.1-beta4"
+deps.google_mlkit_segmentation_selfie = "com.google.mlkit:segmentation-selfie:16.0.0-beta2"
+deps.google_gms_text_recognition = "com.google.android.gms:play-services-mlkit-text-recognition:16.3.0"
 
 deps.base_util = "com.king.base:util:3.2.1-androidx"
 deps.app_dialog = "com.king.app:app-dialog:1.0.10-androidx"

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@`
`10`	`10`	`{`
`11`	`11`	`"type": "SINGLE",`
`12`	`12`	`"filters": [],`
`13`		`- "versionCode": 1,`
`14`		`- "versionName": "1.0.0",`
	`13`	`+ "versionCode": 2,`
	`14`	`+ "versionName": "1.0.1",`
`15`	`15`	`"outputFile": "app-release.apk"`
`16`	`16`	`}`
`17`	`17`	`]`