Skip to content

Commit b396df7

Browse files
committed
发布v2.3.0
1 parent e3515bb commit b396df7

File tree

10 files changed

+51
-66
lines changed

10 files changed

+51
-66
lines changed

.editorconfig

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
root = true
22

33
[*]
4+
end_of_line=lf
5+
charset=utf-8
46
indent_style = space
5-
indent_size = 4
6-
charset = utf-8
7-
trim_trailing_whitespace = true
8-
insert_final_newline = true
7+
indent_size=4
8+
insert_final_newline=true
9+
trim_trailing_whitespace=true
910

1011
[*.{kt, kts}]
1112
ij_kotlin_imports_layout = *

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
## 版本日志
22

3+
#### v2.3.0:2025-1-15
4+
* 更新CameraScan至v1.3.0
5+
* 更新MLKit相关依赖库版本
6+
37
#### v2.2.1:2024-8-8
48
* 优化细节
59

README.md

Lines changed: 18 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -105,36 +105,36 @@ Camera:为各个子库提供相机预览分析的核心库
105105
```gradle
106106
107107
//公共库 (*必须)
108-
implementation 'com.github.jenly1314.MLKit:mlkit-common:2.2.1'
108+
implementation 'com.github.jenly1314.MLKit:mlkit-common:2.3.0'
109109
110110
//--------------------------
111111
112112
//条码识别 (可选)
113-
implementation 'com.github.jenly1314.MLKit:mlkit-barcode-scanning:2.2.1'
113+
implementation 'com.github.jenly1314.MLKit:mlkit-barcode-scanning:2.3.0'
114114
115115
//人脸检测 (可选)
116-
implementation 'com.github.jenly1314.MLKit:mlkit-face-detection:2.2.1'
116+
implementation 'com.github.jenly1314.MLKit:mlkit-face-detection:2.3.0'
117117
118118
//人脸网格检测 (可选)
119-
implementation 'com.github.jenly1314.MLKit:mlkit-face-mesh-detection:2.2.1'
119+
implementation 'com.github.jenly1314.MLKit:mlkit-face-mesh-detection:2.3.0'
120120
121121
//图像标签 (可选)
122-
implementation 'com.github.jenly1314.MLKit:mlkit-image-labeling:2.2.1'
122+
implementation 'com.github.jenly1314.MLKit:mlkit-image-labeling:2.3.0'
123123
124124
//对象检测 (可选)
125-
implementation 'com.github.jenly1314.MLKit:mlkit-object-detection:2.2.1'
125+
implementation 'com.github.jenly1314.MLKit:mlkit-object-detection:2.3.0'
126126
127127
//姿势检测 (可选)
128-
implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection:2.2.1'
128+
implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection:2.3.0'
129129
130130
//姿势检测精确版 (可选)
131-
implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection-accurate:2.2.1'
131+
implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection-accurate:2.3.0'
132132
133133
//自拍分割 (可选)
134-
implementation 'com.github.jenly1314.MLKit:mlkit-segmentation-selfie:2.2.1'
134+
implementation 'com.github.jenly1314.MLKit:mlkit-segmentation-selfie:2.3.0'
135135
136136
//文字识别 (可选)
137-
implementation 'com.github.jenly1314.MLKit:mlkit-text-recognition:2.2.1'
137+
implementation 'com.github.jenly1314.MLKit:mlkit-text-recognition:2.3.0'
138138
139139
```
140140
@@ -322,43 +322,20 @@ compileOptions {
322322

323323
## 相关推荐
324324

325-
#### [ZXingLite](https://github.com/jenly1314/ZXingLite) 基于zxing实现的扫码库,优化扫码和生成二维码/条形码功能。
326-
#### [WeChatQRCode](https://github.com/jenly1314/WeChatQRCode) 基于OpenCV开源的微信二维码引擎移植的扫码识别库。
327-
#### [CameraScan](https://github.com/jenly1314/CameraScan) 一个简化扫描识别流程的通用基础库。
328-
#### [ViewfinderView](https://github.com/jenly1314/ViewfinderView) ViewfinderView一个取景视图:主要用于渲染扫描相关的动画效果。
325+
- [ZXingLite](https://github.com/jenly1314/ZXingLite) 基于zxing实现的扫码库,优化扫码和生成二维码/条形码功能。
326+
- [WeChatQRCode](https://github.com/jenly1314/WeChatQRCode) 基于OpenCV开源的微信二维码引擎移植的扫码识别库。
327+
- [CameraScan](https://github.com/jenly1314/CameraScan) 一个简化扫描识别流程的通用基础库。
328+
- [ViewfinderView](https://github.com/jenly1314/ViewfinderView) ViewfinderView一个取景视图:主要用于渲染扫描相关的动画效果。
329+
- [LibYuv](https://github.com/jenly1314/libyuv) 基于Google的libyuv编译封装的YUV转换工具库,主要用途是在各种YUV与RGB之间进行相互转换、裁减、旋转、缩放、镜像等。
330+
- [LogX](https://github.com/jenly1314/LogX) 一个小而美的日志记录框架;好用不解释。
329331

330332
<!-- end -->
331333

332334
## 版本日志
333335

334-
#### v2.2.1:2024-8-8
335-
* 优化细节
336-
337-
#### v2.2.0:2024-7-11
338-
* 更新CameraScan至v1.2.0
339-
* 更新ViewfinderView至v1.2.0
340-
* 更新MLKit相关依赖库版本
341-
342-
#### v2.1.0:2023-12-31
343-
* 更新CameraScan至v1.1.0
344-
* 更新compileSdkVersion至34
345-
* 更新Gradle至v8.0
346-
347-
#### v2.0.1:2023-9-13
348-
* 更新CameraScan至v1.0.1
349-
* 更新ViewfinderView至v1.1.0
350-
351-
#### v2.0.0:2023-8-13
352-
* 移除相机核心库(mlkit-camera-core),改为依赖[CameraScan](https://github.com/jenly1314/CameraScan)
353-
* 移除mlkit-barcode-scanning中的 **ViewfinderView** ,改为依赖[ViewfinderView](https://github.com/jenly1314/ViewfinderView)
354-
* 优化扫描分析过程的性能体验
355-
* 更新MLKit相关依赖库版本
356-
357-
#### v1.4.0:2023-4-15
358-
* 优化CameraScan的缺省配置(CameraConfig相关配置)
359-
* 优化ViewfinderView自定义属性(新增laserDrawableRatio)
336+
#### v2.3.0:2025-1-15
337+
* 更新CameraScan至v1.3.0
360338
* 更新MLKit相关依赖库版本
361-
* 更新CameraX至v1.2.2
362339

363340
#### [查看更多版本日志](CHANGELOG.md)
364341

app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ dependencies {
5252
implementation deps.corektx
5353

5454
implementation deps.app_dialog
55-
implementation deps.logx
5655

5756
implementation project(':mlkit-common')
5857
implementation project(':mlkit-barcode-scanning')

app/release/app-release.apk

1.54 MB
Binary file not shown.

app/release/output-metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"type": "SINGLE",
1212
"filters": [],
1313
"attributes": [],
14-
"versionCode": 13,
15-
"versionName": "2.2.1",
14+
"versionCode": 14,
15+
"versionName": "2.3.0",
1616
"outputFile": "app-release.apk"
1717
}
1818
],

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import android.view.View
2424
import android.widget.ImageView
2525
import android.widget.Toast
2626
import androidx.appcompat.app.AppCompatActivity
27+
import androidx.core.app.ActivityOptionsCompat
2728
import com.google.mlkit.vision.barcode.common.Barcode
2829
import com.king.app.dialog.AppDialog
2930
import com.king.app.dialog.AppDialogConfig
@@ -137,7 +138,10 @@ class MainActivity : AppCompatActivity() {
137138
}
138139

139140
private fun startActivity(cls: Class<*>) {
140-
startActivity(Intent(this, cls))
141+
val optionsCompat = ActivityOptionsCompat.makeCustomAnimation(
142+
this, android.R.anim.fade_in, android.R.anim.fade_out
143+
)
144+
startActivity(Intent(this, cls), optionsCompat.toBundle())
141145
}
142146

143147
private fun pickPhotoClicked(isQRCode: Boolean) {
@@ -184,4 +188,4 @@ class MainActivity : AppCompatActivity() {
184188
const val REQUEST_CODE_SCAN_CODE = 2
185189
}
186190

187-
}
191+
}

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ android.defaults.buildfeatures.buildconfig=true
2424
android.nonTransitiveRClass=false
2525
android.nonFinalResIds=false
2626

27-
VERSION_NAME=2.2.1
28-
VERSION_CODE=13
27+
VERSION_NAME=2.3.0
28+
VERSION_CODE=14
2929
GROUP=com.github.jenly1314.MLKit
3030

3131
POM_DESCRIPTION=MLKit for Android

mkdocs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ theme:
4343
- content.code.copy
4444

4545
extra:
46+
generator: false
4647
social:
4748
- icon: material/home-circle
4849
link: https://jenly1314.github.io/

versions.gradle

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//App
22
def app_version = [:]
3-
app_version.versionCode = 13
4-
app_version.versionName = "2.2.1"
3+
app_version.versionCode = 14
4+
app_version.versionName = "2.3.0"
55
ext.app_version = app_version
66

77
//build version
@@ -54,21 +54,20 @@ deps.corektx = "androidx.core:core-ktx:$versions.coreKtx"
5454

5555
deps.google_mlkit_vision_common = "com.google.mlkit:vision-common:17.3.0"
5656
deps.google_mlkit_vision_interfaces = "com.google.mlkit:vision-interfaces:16.3.0"
57-
deps.google_mlkit_barcode_scanning = "com.google.mlkit:barcode-scanning:17.2.0"
58-
deps.google_mlkit_face_detection = "com.google.mlkit:face-detection:16.1.6"
59-
deps.google_mlkit_face_mesh_detection = "com.google.mlkit:face-mesh-detection:16.0.0-beta2"
60-
deps.google_mlkit_image_labeling = "com.google.mlkit:image-labeling:17.0.8"
61-
deps.google_mlkit_object_detection = "com.google.mlkit:object-detection:17.0.1"
62-
deps.google_mlkit_pose_detection = "com.google.mlkit:pose-detection:18.0.0-beta4"
63-
deps.google_mlkit_pose_detection_accurate = "com.google.mlkit:pose-detection-accurate:18.0.0-beta4"
64-
deps.google_mlkit_segmentation_selfie = "com.google.mlkit:segmentation-selfie:16.0.0-beta5"
65-
deps.google_mlkit_text_recognition = "com.google.mlkit:text-recognition:16.0.0"
66-
deps.google_mlkit_text_recognition_chinese = "com.google.mlkit:text-recognition-chinese:16.0.0"
57+
deps.google_mlkit_barcode_scanning = "com.google.mlkit:barcode-scanning:17.3.0"
58+
deps.google_mlkit_face_detection = "com.google.mlkit:face-detection:16.1.7"
59+
deps.google_mlkit_face_mesh_detection = "com.google.mlkit:face-mesh-detection:16.0.0-beta3"
60+
deps.google_mlkit_image_labeling = "com.google.mlkit:image-labeling:17.0.9"
61+
deps.google_mlkit_object_detection = "com.google.mlkit:object-detection:17.0.2"
62+
deps.google_mlkit_pose_detection = "com.google.mlkit:pose-detection:18.0.0-beta5"
63+
deps.google_mlkit_pose_detection_accurate = "com.google.mlkit:pose-detection-accurate:18.0.0-beta5"
64+
deps.google_mlkit_segmentation_selfie = "com.google.mlkit:segmentation-selfie:16.0.0-beta6"
65+
deps.google_mlkit_text_recognition = "com.google.mlkit:text-recognition:16.0.1"
66+
deps.google_mlkit_text_recognition_chinese = "com.google.mlkit:text-recognition-chinese:16.0.1"
6767

68-
deps.camera_scan = "com.github.jenly1314:camera-scan:1.2.0"
68+
deps.camera_scan = "com.github.jenly1314:camera-scan:1.3.0"
6969
deps.viewfinderview = "com.github.jenly1314:viewfinderview:1.2.0"
7070

7171
deps.app_dialog = "com.github.jenly1314.AppUpdater:app-dialog:1.2.0"
72-
deps.logx = "com.github.jenly1314:logx:1.0.1"
7372

7473
ext.deps = deps

0 commit comments

Comments
 (0)