优化注释

Author: jenly1314

README.md

@@ -4,14 +4,15 @@ plugins {
 }
 
 android {
-    compileSdkVersion build_versions.compileSdk
-    buildToolsVersion build_versions.buildTools
+    compileSdk build_versions.compileSdk
+
     defaultConfig {
         applicationId "com.king.mlkit.vision.app"
-        minSdkVersion build_versions.minSdk
-        targetSdkVersion build_versions.targetSdk
+        minSdk build_versions.minSdk
+        targetSdk build_versions.targetSdk
         versionCode app_version.versionCode
         versionName app_version.versionName
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         ndk {
@@ -26,9 +27,6 @@ android {
         }
     }
 
-    lintOptions {
-        abortOnError false
-    }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -38,6 +36,10 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    lint {
+        abortOnError false
+    }
+    namespace 'com.king.mlkit.vision.app'
 }
 
 dependencies {
@@ -46,16 +48,16 @@ dependencies {
     androidTestImplementation deps.test.runner
     androidTestImplementation deps.test.espresso
 
-    implementation deps.androidx.design
+    implementation deps.androidx.material
     implementation deps.androidx.appcompat
     implementation deps.androidx.constraintlayout
 
-    implementation deps.kotlin
     implementation deps.corektx
 
     implementation deps.app_dialog
 
     implementation project(':mlkit-camera-core')
+    implementation project(':mlkit-common')
     implementation project(':mlkit-barcode-scanning')
     implementation project(':mlkit-face-detection')
     implementation project(':mlkit-face-mesh-detection')

app/build.gradle

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 6,
-      "versionName": "1.2.0",
+      "versionCode": 7,
+      "versionName": "1.3.0",
       "outputFile": "app-release.apk"
     }
   ],

app/release/app-release.apk

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.king.mlkit.vision.app">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -97,9 +96,10 @@
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version"/>
 
-<!--        <meta-data-->
-<!--            android:name="com.google.firebase.ml.vision.DEPENDENCIES"-->
-<!--            android:value="barcode,face,ocr,ica" />-->
+        <meta-data
+            android:name="com.google.firebase.ml.vision.DEPENDENCIES"
+            android:value="barcode,face,ocr,ica" />
+
     </application>
 
 </manifest>

app/release/output-metadata.json

@@ -17,6 +17,7 @@ package com.king.mlkit.vision.app
 
 import android.Manifest
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.provider.MediaStore
 import android.view.View
@@ -26,15 +27,15 @@ 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.mlkit.vision.app.`object`.MultipleObjectDetectionActivity
-import com.king.mlkit.vision.app.`object`.ObjectDetectionActivity
 import com.king.mlkit.vision.app.barcode.BarcodeScanningActivity
 import com.king.mlkit.vision.app.barcode.MultipleQRCodeScanningActivity
 import com.king.mlkit.vision.app.barcode.QRCodeScanningActivity
 import com.king.mlkit.vision.app.face.FaceDetectionActivity
 import com.king.mlkit.vision.app.face.FaceMeshDetectionActivity
 import com.king.mlkit.vision.app.face.MultipleFaceDetectionActivity
 import com.king.mlkit.vision.app.image.ImageLabelingActivity
+import com.king.mlkit.vision.app.`object`.MultipleObjectDetectionActivity
+import com.king.mlkit.vision.app.`object`.ObjectDetectionActivity
 import com.king.mlkit.vision.app.pose.AccuratePoseDetectionActivity
 import com.king.mlkit.vision.app.pose.PoseDetectionActivity
 import com.king.mlkit.vision.app.segmentation.SelfieSegmentationActivity
@@ -44,20 +45,13 @@ 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
-import java.lang.StringBuilder
-
 
+/**
+ * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
+ */
 class MainActivity : AppCompatActivity() {
 
-    var isQRCode = false
-
-    companion object{
-
-        const val REQUEST_CODE_PHOTO = 1
-        const val REQUEST_CODE_REQUEST_EXTERNAL_STORAGE = 2
-
-        const val REQUEST_CODE_SCAN_CODE = 3
-    }
+    var isQrCode = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -66,69 +60,86 @@ class MainActivity : AppCompatActivity() {
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
-        if(resultCode == RESULT_OK){
-            when(requestCode){
-                REQUEST_CODE_PHOTO -> processPhoto(data)
+        if (resultCode == RESULT_OK) {
+            when (requestCode) {
+                REQUEST_CODE_PHOTO -> processPhoto(data?.data)
                 REQUEST_CODE_SCAN_CODE -> processScanResult(data)
             }
         }
     }
 
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<out String>,
+        grantResults: IntArray
+    ) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        if(requestCode == REQUEST_CODE_REQUEST_EXTERNAL_STORAGE && PermissionUtils.requestPermissionsResult(Manifest.permission.READ_EXTERNAL_STORAGE,permissions,grantResults)){
+        if (requestCode == REQUEST_CODE_REQUEST_EXTERNAL_STORAGE && PermissionUtils.requestPermissionsResult(
+                Manifest.permission.READ_EXTERNAL_STORAGE,
+                permissions,
+                grantResults
+            )
+        ) {
             startPickPhoto()
         }
     }
 
     fun getContext() = this
 
-    private fun processScanResult(data: Intent?){
+    /**
+     * 扫描结果
+     */
+    private fun processScanResult(data: Intent?) {
         val text = CameraScan.parseScanResult(data)
-        Toast.makeText(this,text,Toast.LENGTH_SHORT).show()
+        Toast.makeText(this, text, Toast.LENGTH_SHORT).show()
     }
 
-    private fun processPhoto(data: Intent?){
+    private fun processPhoto(data: Uri?) {
         data?.let {
-            try{
-                val src = MediaStore.Images.Media.getBitmap(contentResolver,it.data)
-                BarcodeDecoder.process(src, object : OnAnalyzeListener<List<Barcode>?> {
+            try {
+                val srcBitmap = MediaStore.Images.Media.getBitmap(contentResolver, it)
+                BarcodeDecoder.process(srcBitmap, object : OnAnalyzeListener<List<Barcode>?> {
                     override fun onSuccess(result: List<Barcode>) {
-                        if(result.isNotEmpty()){
+                        if (result.isNotEmpty()) {
                             val buffer = StringBuilder()
-                            val bitmap = src.drawRect { canvas, paint ->
+                            // 识别成功，在图片上框出结果
+                            val bitmap = srcBitmap.drawRect { canvas, paint ->
                                 for ((index, barcode) in result.withIndex()) {
-                                    buffer.append("[$index] ").append(barcode.displayValue).append("\n")
-                                    barcode.boundingBox?.let{ box ->
+                                    buffer.append("[$index] ").append(barcode.displayValue)
+                                        .append("\n")
+                                    barcode.boundingBox?.let { box ->
                                         canvas.drawRect(box, paint)
                                     }
-
                                 }
                             }
 
-                            val config = AppDialogConfig(getContext(),R.layout.barcode_result_dialog)
+                            val config =
+                                AppDialogConfig(getContext(), R.layout.barcode_result_dialog)
                             config.setContent(buffer)
-                                    .setHideCancel(true)
-                                    .setOnClickConfirm {
-                                AppDialog.INSTANCE.dismissDialog()
-                            }
+                                .setHideCancel(true)
+                                .setOnClickConfirm {
+                                    AppDialog.INSTANCE.dismissDialog()
+                                }
                             val imageView = config.getView<ImageView>(R.id.ivDialogContent)
                             imageView.setImageBitmap(bitmap)
                             AppDialog.INSTANCE.showDialog(config)
-                        }else{
+                        } else {
                             LogUtils.d("result is null")
-                            Toast.makeText(getContext(),"result is null", Toast.LENGTH_SHORT).show()
+                            Toast.makeText(getContext(), "result is null", Toast.LENGTH_SHORT)
+                                .show()
                         }
                     }
-                    override fun onFailure() {
+
+                    override fun onFailure(e: Exception?) {
                         LogUtils.d("onFailure")
-                        Toast.makeText(getContext(),"onFailure", Toast.LENGTH_SHORT).show()
+                        Toast.makeText(getContext(), "onFailure", Toast.LENGTH_SHORT).show()
                     }
-                //如果指定具体的识别条码类型，速度会更快
-                },if(isQRCode) Barcode.FORMAT_QR_CODE else Barcode.FORMAT_ALL_FORMATS)
-            }catch (e: Exception){
+
+                    // 如果指定具体的识别条码类型，速度会更快
+                }, if (isQrCode) Barcode.FORMAT_QR_CODE else Barcode.FORMAT_ALL_FORMATS)
+            } catch (e: Exception) {
                 e.printStackTrace()
-                Toast.makeText(getContext(),e.message, Toast.LENGTH_SHORT).show()
+                Toast.makeText(getContext(), e.message, Toast.LENGTH_SHORT).show()
             }
 
         }
@@ -138,26 +149,38 @@ class MainActivity : AppCompatActivity() {
         startActivity(Intent(this, cls))
     }
 
-    private fun pickPhotoClicked(isQRCode: Boolean){
-        this.isQRCode = isQRCode
-        if(PermissionUtils.checkPermission(getContext(),Manifest.permission.READ_EXTERNAL_STORAGE)){
+    private fun pickPhotoClicked(isQRCode: Boolean) {
+        this.isQrCode = isQRCode
+        if (PermissionUtils.checkPermission(
+                getContext(),
+                Manifest.permission.READ_EXTERNAL_STORAGE
+            )
+        ) {
             startPickPhoto()
-        }else{
-            PermissionUtils.requestPermission(this,Manifest.permission.READ_EXTERNAL_STORAGE,REQUEST_CODE_REQUEST_EXTERNAL_STORAGE)
+        } else {
+            PermissionUtils.requestPermission(
+                this,
+                Manifest.permission.READ_EXTERNAL_STORAGE,
+                REQUEST_CODE_REQUEST_EXTERNAL_STORAGE
+            )
         }
     }
 
-    private fun startPickPhoto(){
-        val pickIntent = Intent(Intent.ACTION_PICK,
-                MediaStore.Images.Media.EXTERNAL_CONTENT_URI)
+    /**
+     * 选择照片 - 条形码/二维码 图片识别
+     */
+    private fun startPickPhoto() {
+        val pickIntent = Intent(
+            Intent.ACTION_PICK,
+            MediaStore.Images.Media.EXTERNAL_CONTENT_URI
+        )
         pickIntent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, "image/*")
         startActivityForResult(pickIntent, REQUEST_CODE_PHOTO)
     }
 
-
-    fun onClick(v: View){
-        when (v.id){
-            R.id.btnQRCodeScanning -> startActivityForResult(Intent(this,QRCodeScanningActivity::class.java),REQUEST_CODE_SCAN_CODE)
+    fun onClick(v: View) {
+        when (v.id) {
+            R.id.btnQRCodeScanning -> startActivityForResult(Intent(this, QRCodeScanningActivity::class.java), REQUEST_CODE_SCAN_CODE)
             R.id.btnMultipleQRCodeScanning -> startActivity(MultipleQRCodeScanningActivity::class.java)
             R.id.btnBarcodeScanning -> startActivity(BarcodeScanningActivity::class.java)
             R.id.btnQRCodeRecognitionFromImage -> pickPhotoClicked(true)
@@ -175,5 +198,11 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    companion object {
+
+        const val REQUEST_CODE_PHOTO = 1
+        const val REQUEST_CODE_REQUEST_EXTERNAL_STORAGE = 2
+        const val REQUEST_CODE_SCAN_CODE = 3
+    }
 
 }

app/src/main/AndroidManifest.xml

@@ -24,7 +24,6 @@ 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.config.ResolutionCameraConfig
-import java.lang.StringBuilder
 
 /**
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
@@ -42,8 +41,8 @@ class BarcodeScanningActivity : BarcodeCameraScanActivity() {
 
         cameraScan.setAnalyzeImage(false)
         val buffer = StringBuilder()
-        val bitmap = result.bitmap.drawRect {canvas,paint ->
-            for ((index,data) in result.result.withIndex()) {
+        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 ->
                     canvas.drawRect(box, paint)
@@ -53,15 +52,15 @@ class BarcodeScanningActivity : BarcodeCameraScanActivity() {
 
         val config = AppDialogConfig(this, R.layout.barcode_result_dialog)
         config.setContent(buffer).setOnClickConfirm {
-                AppDialog.INSTANCE.dismissDialog()
-                cameraScan.setAnalyzeImage(true)
-            }.setOnClickCancel {
-                AppDialog.INSTANCE.dismissDialog()
-                finish()
-            }
+            AppDialog.INSTANCE.dismissDialog()
+            cameraScan.setAnalyzeImage(true)
+        }.setOnClickCancel {
+            AppDialog.INSTANCE.dismissDialog()
+            finish()
+        }
         val imageView = config.getView<ImageView>(R.id.ivDialogContent)
         imageView.setImageBitmap(bitmap)
-        AppDialog.INSTANCE.showDialog(config,false)
+        AppDialog.INSTANCE.showDialog(config, false)
     }