v1.0.2

Author: jenly1314

README.md

@@ -111,31 +111,31 @@ allprojects {
 ```gradle
 
 //Camera核心 (*必须项)
-implementation 'com.github.jenly1314.MLKit:mlkit-camera-core:1.0.1'
+implementation 'com.github.jenly1314.MLKit:mlkit-camera-core:1.0.2'
 
 //条码识别 (可选项)
-implementation 'com.github.jenly1314.MLKit:mlkit-barcode-scanning:1.0.1'
+implementation 'com.github.jenly1314.MLKit:mlkit-barcode-scanning:1.0.2'
 
 //人脸检测 (可选项)
-implementation 'com.github.jenly1314.MLKit:mlkit-face-detection:1.0.1'
+implementation 'com.github.jenly1314.MLKit:mlkit-face-detection:1.0.2'
 
 //图像标记 (可选项)
-implementation 'com.github.jenly1314.MLKit:mlkit-image-labeling:1.0.1'
+implementation 'com.github.jenly1314.MLKit:mlkit-image-labeling:1.0.2'
 
 //对象检测 (可选项)
-implementation 'com.github.jenly1314.MLKit:mlkit-object-detection:1.0.1'
+implementation 'com.github.jenly1314.MLKit:mlkit-object-detection:1.0.2'
 
 //Pose检测 (可选项)
-implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection:1.0.1'
+implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection:1.0.2'
 
 //Pose检测精确版 (可选项)
-implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection-accurate:1.0.1'
+implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection-accurate:1.0.2'
 
 //自拍分割 (可选项)
-implementation 'com.github.jenly1314.MLKit:mlkit-segmentation-selfie:1.0.1'
+implementation 'com.github.jenly1314.MLKit:mlkit-segmentation-selfie:1.0.2'
 
 //文字识别 (可选项)
-implementation 'com.github.jenly1314.MLKit:mlkit-text-recognition:1.0.1'
+implementation 'com.github.jenly1314.MLKit:mlkit-text-recognition:1.0.2'
 
 ```
 
@@ -246,6 +246,10 @@ compileOptions {
 
 ## 版本记录
 
+#### v1.0.2：2021-8-4
+* 更新CameraX至v1.0.1
+* 优化CameraConfig的一些默认配置
+
 #### v1.0.1：2021-7-2
 * 更新MLKit相关依赖库版本
 * 优化细节

app/build.gradle

@@ -49,7 +49,6 @@ dependencies {
     implementation deps.kotlin
     implementation deps.corektx
 
-    implementation deps.base_util
     implementation deps.app_dialog
 
     implementation project(':mlkit-camera-core')

app/release/app-release.apk

@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 2,
-      "versionName": "1.0.1",
+      "versionCode": 3,
+      "versionName": "1.0.2",
       "outputFile": "app-release.apk"
     }
   ]

app/release/output-metadata.json

@@ -17,18 +17,15 @@ package com.king.mlkit.vision.app
 
 import android.Manifest
 import android.content.Intent
-import android.graphics.BitmapFactory
 import android.os.Bundle
 import android.provider.MediaStore
 import android.view.View
 import android.widget.ImageView
+import android.widget.Toast
 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
-import com.king.base.util.ToastUtils
-import com.king.base.util.UriUtils
 import com.king.mlkit.vision.app.`object`.MultipleObjectDetectionActivity
 import com.king.mlkit.vision.app.`object`.ObjectDetectionActivity
 import com.king.mlkit.vision.app.barcode.BarcodeScanningActivity
@@ -84,7 +81,6 @@ class MainActivity : AppCompatActivity() {
         data?.let {
             try{
                 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()){
@@ -107,18 +103,18 @@ class MainActivity : AppCompatActivity() {
                             AppDialog.INSTANCE.showDialog(config)
                         }else{
                             LogUtils.d("result is null")
-                            ToastUtils.showToast(getContext(),"result is null")
+                            Toast.makeText(getContext(),"result is null", Toast.LENGTH_SHORT).show()
                         }
                     }
                     override fun onFailure() {
                         LogUtils.d("onFailure")
-                        ToastUtils.showToast(getContext(),"onFailure")
+                        Toast.makeText(getContext(),"onFailure", Toast.LENGTH_SHORT).show()
                     }
                 //如果指定具体的识别条码类型，速度会更快
                 },if(isQRCode) Barcode.FORMAT_QR_CODE else Barcode.FORMAT_ALL_FORMATS)
             }catch (e: Exception){
                 e.printStackTrace()
-                ToastUtils.showToast(getContext(),e.message)
+                Toast.makeText(getContext(),e.message, Toast.LENGTH_SHORT).show()
             }
 
         }

app/src/main/java/com/king/mlkit/vision/app/MainActivity.kt

@@ -23,6 +23,7 @@ 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.config.ResolutionCameraConfig
 import java.lang.StringBuilder
 
 /**
@@ -34,6 +35,7 @@ class BarcodeScanningActivity : BarcodeCameraScanActivity() {
         super.initCameraScan()
         cameraScan.setPlayBeep(true)
             .setVibrate(true)
+            .setCameraConfig(ResolutionCameraConfig(this))//设置CameraConfig
     }
 
     override fun onScanResultCallback(result: AnalyzeResult<MutableList<Barcode>>) {

app/src/main/java/com/king/mlkit/vision/app/barcode/BarcodeScanningActivity.kt

@@ -8,7 +8,7 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:$versions.gralde"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
-        classpath "com.github.panpf.bintray-publish:bintray-publish:$versions.bintrayPublish"
+//        classpath "com.github.panpf.bintray-publish:bintray-publish:$versions.bintrayPublish"
         classpath "com.vanniktech:gradle-maven-publish-plugin:$versions.mavenPublish"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

build.gradle

@@ -21,8 +21,8 @@ android.enableJetifier = true
 kotlin.code.style      = official
 
 
-VERSION_NAME=1.0.1
-VERSION_CODE=2
+VERSION_NAME=1.0.2
+VERSION_CODE=3
 GROUP=com.github.jenly1314.MLKit
 
 POM_DESCRIPTION=MLKit for Android
@@ -38,4 +38,4 @@ POM_DEVELOPER_ID=jenly
 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=false
+RELEASE_SIGNING_ENABLED=false

gradle.properties

@@ -41,7 +41,6 @@
 
 import com.google.common.util.concurrent.ListenableFuture;
 import com.king.mlkit.vision.camera.analyze.Analyzer;
-import com.king.mlkit.vision.camera.config.AspectRatioCameraConfig;
 import com.king.mlkit.vision.camera.config.CameraConfig;
 import com.king.mlkit.vision.camera.manager.AmbientLightManager;
 import com.king.mlkit.vision.camera.manager.BeepManager;
@@ -227,7 +226,7 @@ private void startFocusAndMetering(float x, float y){
 
     private void initConfig(){
         if(mCameraConfig == null){
-            mCameraConfig = new AspectRatioCameraConfig(mContext);
+            mCameraConfig = new CameraConfig();
         }
     }
 

mlkit-camera-core/src/main/java/com/king/mlkit/vision/camera/BaseCameraScan.java

@@ -27,7 +27,7 @@
 import androidx.camera.core.Preview;
 
 /**
- * 相机配置：根据纵横比配置相机，理论适配所有Android设备
+ * 相机配置：根据纵横比配置相机，使输出分析的图像尽可能的接近屏幕比例
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
  */
 public final class AspectRatioCameraConfig extends CameraConfig {
@@ -57,7 +57,6 @@ private int aspectRatio(float width, float height){
     @NonNull
     @Override
     public Preview options(@NonNull Preview.Builder builder) {
-        builder.setTargetAspectRatio(mAspectRatio);
         return super.options(builder);
     }