Skip to content

Commit

Permalink
发布v2.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jenly1314 committed Jan 15, 2025
1 parent e3515bb commit b396df7
Show file tree
Hide file tree
Showing 10 changed files with 51 additions and 66 deletions.
9 changes: 5 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
root = true

[*]
end_of_line=lf
charset=utf-8
indent_style = space
indent_size = 4
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
indent_size=4
insert_final_newline=true
trim_trailing_whitespace=true

[*.{kt, kts}]
ij_kotlin_imports_layout = *
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## 版本日志

#### v2.3.0:2025-1-15
* 更新CameraScan至v1.3.0
* 更新MLKit相关依赖库版本

#### v2.2.1:2024-8-8
* 优化细节

Expand Down
59 changes: 18 additions & 41 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,36 +105,36 @@ Camera:为各个子库提供相机预览分析的核心库
```gradle
//公共库 (*必须)
implementation 'com.github.jenly1314.MLKit:mlkit-common:2.2.1'
implementation 'com.github.jenly1314.MLKit:mlkit-common:2.3.0'
//--------------------------
//条码识别 (可选)
implementation 'com.github.jenly1314.MLKit:mlkit-barcode-scanning:2.2.1'
implementation 'com.github.jenly1314.MLKit:mlkit-barcode-scanning:2.3.0'
//人脸检测 (可选)
implementation 'com.github.jenly1314.MLKit:mlkit-face-detection:2.2.1'
implementation 'com.github.jenly1314.MLKit:mlkit-face-detection:2.3.0'
//人脸网格检测 (可选)
implementation 'com.github.jenly1314.MLKit:mlkit-face-mesh-detection:2.2.1'
implementation 'com.github.jenly1314.MLKit:mlkit-face-mesh-detection:2.3.0'
//图像标签 (可选)
implementation 'com.github.jenly1314.MLKit:mlkit-image-labeling:2.2.1'
implementation 'com.github.jenly1314.MLKit:mlkit-image-labeling:2.3.0'
//对象检测 (可选)
implementation 'com.github.jenly1314.MLKit:mlkit-object-detection:2.2.1'
implementation 'com.github.jenly1314.MLKit:mlkit-object-detection:2.3.0'
//姿势检测 (可选)
implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection:2.2.1'
implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection:2.3.0'
//姿势检测精确版 (可选)
implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection-accurate:2.2.1'
implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection-accurate:2.3.0'
//自拍分割 (可选)
implementation 'com.github.jenly1314.MLKit:mlkit-segmentation-selfie:2.2.1'
implementation 'com.github.jenly1314.MLKit:mlkit-segmentation-selfie:2.3.0'
//文字识别 (可选)
implementation 'com.github.jenly1314.MLKit:mlkit-text-recognition:2.2.1'
implementation 'com.github.jenly1314.MLKit:mlkit-text-recognition:2.3.0'
```
Expand Down Expand Up @@ -322,43 +322,20 @@ compileOptions {

## 相关推荐

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

<!-- end -->

## 版本日志

#### v2.2.1:2024-8-8
* 优化细节

#### v2.2.0:2024-7-11
* 更新CameraScan至v1.2.0
* 更新ViewfinderView至v1.2.0
* 更新MLKit相关依赖库版本

#### v2.1.0:2023-12-31
* 更新CameraScan至v1.1.0
* 更新compileSdkVersion至34
* 更新Gradle至v8.0

#### v2.0.1:2023-9-13
* 更新CameraScan至v1.0.1
* 更新ViewfinderView至v1.1.0

#### v2.0.0:2023-8-13
* 移除相机核心库(mlkit-camera-core),改为依赖[CameraScan](https://github.com/jenly1314/CameraScan)
* 移除mlkit-barcode-scanning中的 **ViewfinderView** ,改为依赖[ViewfinderView](https://github.com/jenly1314/ViewfinderView)
* 优化扫描分析过程的性能体验
* 更新MLKit相关依赖库版本

#### v1.4.0:2023-4-15
* 优化CameraScan的缺省配置(CameraConfig相关配置)
* 优化ViewfinderView自定义属性(新增laserDrawableRatio)
#### v2.3.0:2025-1-15
* 更新CameraScan至v1.3.0
* 更新MLKit相关依赖库版本
* 更新CameraX至v1.2.2

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

Expand Down
1 change: 0 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ dependencies {
implementation deps.corektx

implementation deps.app_dialog
implementation deps.logx

implementation project(':mlkit-common')
implementation project(':mlkit-barcode-scanning')
Expand Down
Binary file modified app/release/app-release.apk
Binary file not shown.
4 changes: 2 additions & 2 deletions app/release/output-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 13,
"versionName": "2.2.1",
"versionCode": 14,
"versionName": "2.3.0",
"outputFile": "app-release.apk"
}
],
Expand Down
8 changes: 6 additions & 2 deletions app/src/main/java/com/king/mlkit/vision/app/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import android.view.View
import android.widget.ImageView
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.core.app.ActivityOptionsCompat
import com.google.mlkit.vision.barcode.common.Barcode
import com.king.app.dialog.AppDialog
import com.king.app.dialog.AppDialogConfig
Expand Down Expand Up @@ -137,7 +138,10 @@ class MainActivity : AppCompatActivity() {
}

private fun startActivity(cls: Class<*>) {
startActivity(Intent(this, cls))
val optionsCompat = ActivityOptionsCompat.makeCustomAnimation(
this, android.R.anim.fade_in, android.R.anim.fade_out
)
startActivity(Intent(this, cls), optionsCompat.toBundle())
}

private fun pickPhotoClicked(isQRCode: Boolean) {
Expand Down Expand Up @@ -184,4 +188,4 @@ class MainActivity : AppCompatActivity() {
const val REQUEST_CODE_SCAN_CODE = 2
}

}
}
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false

VERSION_NAME=2.2.1
VERSION_CODE=13
VERSION_NAME=2.3.0
VERSION_CODE=14
GROUP=com.github.jenly1314.MLKit

POM_DESCRIPTION=MLKit for Android
Expand Down
1 change: 1 addition & 0 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ theme:
- content.code.copy

extra:
generator: false
social:
- icon: material/home-circle
link: https://jenly1314.github.io/
Expand Down
27 changes: 13 additions & 14 deletions versions.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//App
def app_version = [:]
app_version.versionCode = 13
app_version.versionName = "2.2.1"
app_version.versionCode = 14
app_version.versionName = "2.3.0"
ext.app_version = app_version

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

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

deps.camera_scan = "com.github.jenly1314:camera-scan:1.2.0"
deps.camera_scan = "com.github.jenly1314:camera-scan:1.3.0"
deps.viewfinderview = "com.github.jenly1314:viewfinderview:1.2.0"

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

ext.deps = deps

0 comments on commit b396df7

Please sign in to comment.