Skip to content

Commit bf5f0b5

Browse files
jenly1314jenly1314
committed
更新MLKit相关依赖库版本
1 parent 336a59b commit bf5f0b5

File tree

36 files changed

+168
-102
lines changed

36 files changed

+168
-102
lines changed

‎.github/workflows/gradle.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212

1313
steps:
1414
- uses: actions/checkout@v2
15-
- name: Set up JDK 1.8
15+
- name: Set up JDK 11
1616
uses: actions/setup-java@v1
1717
with:
18-
java-version: 1.8
18+
java-version: 11
1919
- name: Build with Gradle
2020
run: ./gradlew build

‎README.md‎

Lines changed: 43 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ML Kit是一个能够将谷歌专业的机器学习知识带到应用中的极
1616

1717
## GIF 展示
1818

19-
因为功能太多，暂时没有录制GIF
19+
因为功能太多，所以暂未录制GIF
2020

2121
> 你可以直接下载 [演示App](https://raw.githubusercontent.com/jenly1314/MLKit/master/app/release/app-release.apk) 体验效果
2222
@@ -138,6 +138,40 @@ allprojects {
138138
2. 在Module的 **build.gradle** 里面添加引入依赖项
139139
```gradle
140140
141+
//Camera核心 (*必须)
142+
implementation 'com.github.jenly1314.MLKit:mlkit-camera-core:1.1.0'
143+
144+
//条码识别 (可选)
145+
implementation 'com.github.jenly1314.MLKit:mlkit-barcode-scanning:1.1.0'
146+
147+
//人脸检测 (可选)
148+
implementation 'com.github.jenly1314.MLKit:mlkit-face-detection:1.1.0'
149+
150+
//图像标记 (可选)
151+
implementation 'com.github.jenly1314.MLKit:mlkit-image-labeling:1.1.0'
152+
153+
//对象检测 (可选)
154+
implementation 'com.github.jenly1314.MLKit:mlkit-object-detection:1.1.0'
155+
156+
//Pose检测 (可选)
157+
implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection:1.1.0'
158+
159+
//Pose检测精确版 (可选)
160+
implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection-accurate:1.1.0'
161+
162+
//自拍分割 (可选)
163+
implementation 'com.github.jenly1314.MLKit:mlkit-segmentation-selfie:1.1.0'
164+
165+
//文字识别 (可选)
166+
implementation 'com.github.jenly1314.MLKit:mlkit-text-recognition:1.1.0'
167+
168+
```
169+
170+
> 使用 **v1.1.x** 以上版本需要 **targetSdkVersion >= 31**，
171+
> 如果 **targetSdkVersion < 31** 请使用 **v1.0.x** 版本
172+
173+
```gradle
174+
141175
//Camera核心 (*必须)
142176
implementation 'com.github.jenly1314.MLKit:mlkit-camera-core:1.0.3'
143177
@@ -294,9 +328,9 @@ Pose检测精确版实现示例：通过间接继承 **AccuratePoseCameraScanAct
294328
[TextRecognitionActivity](app/src/main/java/com/king/mlkit/vision/app/text/TextRecognitionActivity.kt)
295329

296330

297-
### 模型配置
331+
### 模型配置（可选）
298332

299-
关于自动下载模型，可选项但推荐：在AndroidManifest中申明配置
333+
关于自动下载模型（如果选择使用 Google Play Services 中的模型）则可以通过在AndroidManifest中申明配置
300334
```xml
301335
<meta-data
302336
android:name="com.google.firebase.ml.vision.DEPENDENCIES"
@@ -338,6 +372,12 @@ compileOptions {
338372

339373
## 版本记录
340374

375+
#### v1.1.0：2022-6-1
376+
* 更新MLKit相关依赖库版本
377+
* 更新CameraX至v1.1.0-rc01
378+
* 更新targetSdkVersion至31
379+
* 更新Gradle至v7.2
380+
341381
#### v1.0.3：2021-10-18
342382
* 更新CameraX至v1.0.2
343383
* ViewfinderView新增支持显示结果点相关

‎app/release/app-release.apk‎

1.2 MB
Binary file not shown.

‎app/release/output-metadata.json‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
{
2-
"version": 2,
2+
"version": 3,
33
"artifactType": {
44
"type": "APK",
55
"kind": "Directory"
66
},
77
"applicationId": "com.king.mlkit.vision.app",
8-
"variantName": "processReleaseResources",
8+
"variantName": "release",
99
"elements": [
1010
{
1111
"type": "SINGLE",
1212
"filters": [],
13-
"versionCode": 4,
14-
"versionName": "1.0.3",
13+
"attributes": [],
14+
"versionCode": 5,
15+
"versionName": "1.1.0",
1516
"outputFile": "app-release.apk"
1617
}
17-
]
18+
],
19+
"elementType": "File"
1820
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
android:supportsRtl="true"
2020
android:theme="@style/Theme.MLKit">
2121
<activity android:name=".MainActivity"
22-
android:screenOrientation="portrait">
22+
android:screenOrientation="portrait"
23+
android:exported="true">
2324
<intent-filter>
2425
<action android:name="android.intent.action.MAIN" />
2526

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import android.view.View
2323
import android.widget.ImageView
2424
import android.widget.Toast
2525
import androidx.appcompat.app.AppCompatActivity
26-
import com.google.mlkit.vision.barcode.Barcode
26+
import com.google.mlkit.vision.barcode.common.Barcode
2727
import com.king.app.dialog.AppDialog
2828
import com.king.app.dialog.AppDialogConfig
2929
import com.king.mlkit.vision.app.`object`.MultipleObjectDetectionActivity
@@ -98,14 +98,17 @@ class MainActivity : AppCompatActivity() {
9898
val bitmap = src.drawRect { canvas, paint ->
9999
for ((index,data) in result.withIndex()) {
100100
buffer.append("[$index] ").append(data.displayValue).append("\n")
101-
canvas.drawRect(data.boundingBox,paint)
101+
data.boundingBox?.let{ box ->
102+
canvas.drawRect(box, paint)
103+
}
104+
102105
}
103106
}
104107

105108
val config = AppDialogConfig(getContext(),R.layout.barcode_result_dialog)
106109
config.setContent(buffer)
107110
.setHideCancel(true)
108-
.setOnClickOk {
111+
.setOnClickConfirm {
109112
AppDialog.INSTANCE.dismissDialog()
110113
}
111114
val imageView = config.getView<ImageView>(R.id.ivDialogContent)

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@
1515
*/
1616
package com.king.mlkit.vision.app.barcode
1717

18-
import android.annotation.SuppressLint
1918
import android.widget.ImageView
20-
import androidx.camera.core.CameraX
21-
import com.google.mlkit.vision.barcode.Barcode
19+
import com.google.mlkit.vision.barcode.common.Barcode
2220
import com.king.app.dialog.AppDialog
2321
import com.king.app.dialog.AppDialogConfig
2422
import com.king.mlkit.vision.app.R
@@ -47,12 +45,14 @@ class BarcodeScanningActivity : BarcodeCameraScanActivity() {
4745
val bitmap = result.bitmap.drawRect {canvas,paint ->
4846
for ((index,data) in result.result.withIndex()) {
4947
buffer.append("[$index] ").append(data.displayValue).append("\n")
50-
canvas.drawRect(data.boundingBox,paint)
48+
data.boundingBox?.let { box ->
49+
canvas.drawRect(box, paint)
50+
}
5151
}
5252
}
5353

5454
val config = AppDialogConfig(this, R.layout.barcode_result_dialog)
55-
config.setContent(buffer).setOnClickOk {
55+
config.setContent(buffer).setOnClickConfirm {
5656
AppDialog.INSTANCE.dismissDialog()
5757
cameraScan.setAnalyzeImage(true)
5858
}.setOnClickCancel {

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package com.king.mlkit.vision.app.barcode
1717

1818
import android.widget.ImageView
19-
import com.google.mlkit.vision.barcode.Barcode
19+
import com.google.mlkit.vision.barcode.common.Barcode
2020
import com.king.app.dialog.AppDialog
2121
import com.king.app.dialog.AppDialogConfig
2222
import com.king.mlkit.vision.app.R
@@ -49,12 +49,14 @@ class MultipleQRCodeScanningActivity : QRCodeCameraScanActivity() {
4949
val bitmap = result.bitmap.drawRect {canvas,paint ->
5050
for ((index,data) in result.result.withIndex()) {
5151
buffer.append("[$index] ").append(data.displayValue).append("\n")
52-
canvas.drawRect(data.boundingBox,paint)
52+
data.boundingBox?.let { box ->
53+
canvas.drawRect(box, paint)
54+
}
5355
}
5456
}
5557

5658
val config = AppDialogConfig(this, R.layout.barcode_result_dialog)
57-
config.setContent(buffer).setOnClickOk {
59+
config.setContent(buffer).setOnClickConfirm {
5860
AppDialog.INSTANCE.dismissDialog()
5961
cameraScan.setAnalyzeImage(true)
6062
}.setOnClickCancel {

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package com.king.mlkit.vision.app.barcode
1818
import android.content.Intent
1919
import android.graphics.Point
2020
import android.widget.ImageView
21-
import com.google.mlkit.vision.barcode.Barcode
21+
import com.google.mlkit.vision.barcode.common.Barcode
2222
import com.king.mlkit.vision.app.R
2323
import com.king.mlkit.vision.barcode.QRCodeCameraScanActivity
2424
import com.king.mlkit.vision.barcode.utils.PointUtils
@@ -68,11 +68,13 @@ class QRCodeScanningActivity : QRCodeCameraScanActivity() {
6868
//取预览当前帧图片并显示，为结果点提供参照
6969
ivResult.setImageBitmap(previewView.bitmap)
7070
val points = ArrayList<Point>()
71-
for ((index,data) in results.withIndex()) {
72-
val rect = results[index].boundingBox
73-
//将实际的结果中心点坐标转换成界面预览的坐标
74-
val point = PointUtils.transform(rect.centerX(), rect.centerY(), result.bitmap.width, result.bitmap.height, viewfinderView.width, viewfinderView.height)
75-
points.add(point)
71+
for (barcode in results) {
72+
barcode.boundingBox?.let { box ->
73+
//将实际的结果中心点坐标转换成界面预览的坐标
74+
val point = PointUtils.transform(box.centerX(), box.centerY(), result.bitmap.width, result.bitmap.height, viewfinderView.width, viewfinderView.height)
75+
points.add(point)
76+
}
77+
7678
}
7779
//设置Item点击监听
7880
viewfinderView.setOnItemClickListener {

‎app/src/main/java/com/king/mlkit/vision/app/face/FaceDetectionActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ open class FaceDetectionActivity : FaceCameraScanActivity() {
4747
}
4848

4949
val config = AppDialogConfig(this, R.layout.result_dialog)
50-
config.setOnClickOk {
50+
config.setOnClickConfirm {
5151
AppDialog.INSTANCE.dismissDialog()
5252
cameraScan.setAnalyzeImage(true)
5353
}.setOnClickCancel {

0 commit comments

Comments
 (0)