Skip to content

Commit 0279619

Browse files
jenly1314jenly1314
committed
更新CameraX至v1.2.2
1 parent 4bf19da commit 0279619

File tree

50 files changed

+501
-353
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+501
-353
lines changed

‎README.md‎

Lines changed: 56 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -94,43 +94,44 @@ Camera：为各个子库提供相机预览分析的核心库
9494
9595
## ViewfinderView相关字段说明
9696

97-
| 属性 | 属性类型 | 默认值 | 属性说明 |
98-
| :------| :------ | :------ | :------ |
99-
| maskColor | color |<font color=#000000>#60000000</font>| 扫描区外遮罩的颜色 |
100-
| frameColor | color |<font color=#1FB3E2>#7F1FB3E2</font>| 扫描区边框的颜色 |
101-
| cornerColor | color |<font color=#1FB3E2>#FF1FB3E2</font>| 扫描区边角的颜色 |
102-
| laserColor | color |<font color=#1FB3E2>#FF1FB3E2</font>| 扫描区激光线的颜色 |
103-
| labelText | string | | 扫描提示文本信息 |
104-
| labelTextColor | color |<font color=#C0C0C0>#FFC0C0C0</font>| 提示文本字体颜色 |
105-
| labelTextSize | dimension |14sp| 提示文本字体大小 |
106-
| labelTextPadding | dimension |24dp| 提示文本距离扫描区的间距 |
107-
| labelTextWidth | dimension | | 提示文本的宽度，默认为View的宽度 |
108-
| labelTextLocation | enum |bottom| 提示文本显示位置 |
109-
| frameWidth | dimension | | 扫码框宽度 |
110-
| frameHeight | dimension | | 扫码框高度 |
111-
| laserStyle | enum | line | 扫描激光的样式 |
112-
| gridColumn | integer | 20 | 网格扫描激光列数 |
113-
| gridHeight | integer | 40dp | 网格扫描激光高度，为0dp时，表示动态铺满 |
114-
| cornerRectWidth | dimension | 4dp | 扫描区边角的宽 |
115-
| cornerRectHeight | dimension | 16dp | 扫描区边角的高 |
97+
| 属性 | 属性类型 | 默认值 | 属性说明 |
98+
|:------------------------| :------ | :------ | :------ |
99+
| maskColor | color |<font color=#000000>#60000000</font>| 扫描区外遮罩的颜色 |
100+
| frameColor | color |<font color=#1FB3E2>#7F1FB3E2</font>| 扫描区边框的颜色 |
101+
| cornerColor | color |<font color=#1FB3E2>#FF1FB3E2</font>| 扫描区边角的颜色 |
102+
| laserColor | color |<font color=#1FB3E2>#FF1FB3E2</font>| 扫描区激光线的颜色 |
103+
| labelText | string | | 扫描提示文本信息 |
104+
| labelTextColor | color |<font color=#C0C0C0>#FFC0C0C0</font>| 提示文本字体颜色 |
105+
| labelTextSize | dimension |14sp| 提示文本字体大小 |
106+
| labelTextPadding | dimension |24dp| 提示文本距离扫描区的间距 |
107+
| labelTextWidth | dimension | | 提示文本的宽度，默认为View的宽度 |
108+
| labelTextLocation | enum |bottom| 提示文本显示位置 |
109+
| frameWidth | dimension | | 扫码框宽度 |
110+
| frameHeight | dimension | | 扫码框高度 |
111+
| laserStyle | enum | line | 扫描激光的样式 |
112+
| gridColumn | integer | 20 | 网格扫描激光列数 |
113+
| gridHeight | integer | 40dp | 网格扫描激光高度，为0dp时，表示动态铺满 |
114+
| cornerRectWidth | dimension | 4dp | 扫描区边角的宽 |
115+
| cornerRectHeight | dimension | 16dp | 扫描区边角的高 |
116116
| scannerLineMoveDistance | dimension | 2dp | 扫描线每次移动距离 |
117-
| scannerLineHeight | dimension | 5dp | 扫描线高度 |
118-
| frameLineWidth | dimension | 1dp | 边框线宽度 |
119-
| scannerAnimationDelay | integer | 20 | 扫描动画延迟间隔时间，单位：毫秒 |
120-
| frameRatio | float | 0.625f | 扫码框与屏幕占比 |
121-
| framePaddingLeft | dimension | 0 | 扫码框左边的内间距 |
122-
| framePaddingTop | dimension | 0 | 扫码框上边的内间距 |
123-
| framePaddingRight | dimension | 0 | 扫码框右边的内间距 |
124-
| framePaddingBottom | dimension | 0 | 扫码框下边的内间距 |
125-
| frameGravity | enum | center | 扫码框对齐方式 |
126-
| pointColor | color | <font color=#1FB3E2>#FF1FB3E2</font> | 结果点的颜色 |
127-
| pointStrokeColor | color | <font color=#FFFFFF>#FFFFFFFF</font> | 结果点描边的颜色 |
128-
| pointRadius | dimension | 15dp | 结果点的半径 |
129-
| pointStrokeRatio | float | 1.2 | 结果点描边半径与结果点半径的比例 |
130-
| pointDrawable | reference | | 结果点自定义图片 |
131-
| showPointAnim | boolean | true | 是否显示结果点的动画 |
132-
| laserDrawable | reference | | 扫描激光自定义图片 |
133-
| viewfinderStyle | enum | classic | 取景框样式；支持：classic：经典样式（带扫码框那种）、popular：流行样式（不带扫码框） |
117+
| scannerLineHeight | dimension | 5dp | 扫描线高度 |
118+
| frameLineWidth | dimension | 1dp | 边框线宽度 |
119+
| scannerAnimationDelay | integer | 20 | 扫描动画延迟间隔时间，单位：毫秒 |
120+
| frameRatio | float | 0.625f | 扫码框与屏幕占比 |
121+
| framePaddingLeft | dimension | 0 | 扫码框左边的内间距 |
122+
| framePaddingTop | dimension | 0 | 扫码框上边的内间距 |
123+
| framePaddingRight | dimension | 0 | 扫码框右边的内间距 |
124+
| framePaddingBottom | dimension | 0 | 扫码框下边的内间距 |
125+
| frameGravity | enum | center | 扫码框对齐方式 |
126+
| pointColor | color | <font color=#1FB3E2>#FF1FB3E2</font> | 结果点的颜色 |
127+
| pointStrokeColor | color | <font color=#FFFFFF>#FFFFFFFF</font> | 结果点描边的颜色 |
128+
| pointRadius | dimension | 15dp | 结果点的半径 |
129+
| pointStrokeRatio | float | 1.2 | 结果点描边半径与结果点半径的比例 |
130+
| pointDrawable | reference | | 结果点自定义图片 |
131+
| showPointAnim | boolean | true | 是否显示结果点的动画 |
132+
| laserDrawable | reference | | 扫描激光自定义图片 |
133+
| laserDrawableRatio | float | 0.625f | 激光扫描图片与屏幕占比 |
134+
| viewfinderStyle | enum | classic | 取景框样式；支持：classic：经典样式（带扫码框那种）、popular：流行样式（不带扫码框） |
134135

135136
## 引入
136137

@@ -152,39 +153,39 @@ allprojects {
152153
```gradle
153154
154155
//Camera核心 (*必须)
155-
implementation 'com.github.jenly1314.MLKit:mlkit-camera-core:1.3.0'
156+
implementation 'com.github.jenly1314.MLKit:mlkit-camera-core:1.4.0'
156157
157158
//--------------------------
158159
159160
//公共库 (可选) （1.3.0新增：当使用到MLKit下面的子库时，需依赖公共库）
160-
implementation 'com.github.jenly1314.MLKit:mlkit-common:1.3.0'
161+
implementation 'com.github.jenly1314.MLKit:mlkit-common:1.4.0'
161162
162163
//条码识别 (可选)
163-
implementation 'com.github.jenly1314.MLKit:mlkit-barcode-scanning:1.3.0'
164+
implementation 'com.github.jenly1314.MLKit:mlkit-barcode-scanning:1.4.0'
164165
165166
//人脸检测 (可选)
166-
implementation 'com.github.jenly1314.MLKit:mlkit-face-detection:1.3.0'
167+
implementation 'com.github.jenly1314.MLKit:mlkit-face-detection:1.4.0'
167168
168169
//人脸网格检测 (可选)
169-
implementation 'com.github.jenly1314.MLKit:mlkit-face-mesh-detection:1.3.0'
170+
implementation 'com.github.jenly1314.MLKit:mlkit-face-mesh-detection:1.4.0'
170171
171172
//图像标签 (可选)
172-
implementation 'com.github.jenly1314.MLKit:mlkit-image-labeling:1.3.0'
173+
implementation 'com.github.jenly1314.MLKit:mlkit-image-labeling:1.4.0'
173174
174175
//对象检测 (可选)
175-
implementation 'com.github.jenly1314.MLKit:mlkit-object-detection:1.3.0'
176+
implementation 'com.github.jenly1314.MLKit:mlkit-object-detection:1.4.0'
176177
177178
//姿势检测 (可选)
178-
implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection:1.3.0'
179+
implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection:1.4.0'
179180
180181
//姿势检测精确版 (可选)
181-
implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection-accurate:1.3.0'
182+
implementation 'com.github.jenly1314.MLKit:mlkit-pose-detection-accurate:1.4.0'
182183
183184
//自拍分割 (可选)
184-
implementation 'com.github.jenly1314.MLKit:mlkit-segmentation-selfie:1.3.0'
185+
implementation 'com.github.jenly1314.MLKit:mlkit-segmentation-selfie:1.4.0'
185186
186187
//文字识别 (可选)
187-
implementation 'com.github.jenly1314.MLKit:mlkit-text-recognition:1.3.0'
188+
implementation 'com.github.jenly1314.MLKit:mlkit-text-recognition:1.4.0'
188189
189190
```
190191

@@ -205,7 +206,7 @@ implementation 'com.github.jenly1314.MLKit:mlkit-text-recognition:1.3.0'
205206
> 1、通过继承 **BaseCameraScanActivity** 或者 **BaseCameraScanFragment** 或其子类，可快速实现扫描识别。
206207
> （适用于大多场景，自定义布局时需覆写 **getLayoutId** 方法）
207208
208-
> 2、在你项目的Activity或者Fragment中实例化一个 **BaseCameraScan**。（适用于想在扫码界面写交互逻辑，又因为项目
209+
> 2、在你项目的Activity或者Fragment中实例化一个 **BaseCameraScan**。（适用于想在扫描界面写交互逻辑，又因为项目
209210
> 架构或其它原因，无法直接或间接继承 **BaseCameraScanActivity** 或 **BaseCameraScanFragment** 时使用）
210211
211212
> 3、继承 **CameraScan** 自己实现一个，可参照默认实现类 **BaseCameraScan**，其他步骤同方式2。（高级用法，谨慎使用）
@@ -263,7 +264,7 @@ implementation 'com.github.jenly1314.MLKit:mlkit-text-recognition:1.3.0'
263264
// 获取CameraScan，根据需要修改相关配置
264265
getCameraScan().setPlayBeep(true)//设置是否播放音效，默认为false
265266
.setVibrate(true)//设置是否震动，默认为false
266-
.setCameraConfig(new CameraConfig())//设置相机配置信息，CameraConfig可覆写options方法自定义配置
267+
.setCameraConfig(new ResolutionCameraConfig(this))//设置相机配置信息，CameraConfig可覆写options方法自定义配置
267268
.setNeedTouchZoom(true)//支持多指触摸捏合缩放，默认为true
268269
.setDarkLightLux(45f)//设置光线足够暗的阈值（单位：lux），需要通过{@link #bindFlashlightView(View)}绑定手电筒才有效
269270
.setBrightLightLux(100f)//设置光线足够明亮的阈值（单位：lux），需要通过{@link #bindFlashlightView(View)}绑定手电筒才有效
@@ -468,6 +469,12 @@ compileOptions {
468469

469470
## 版本记录
470471

472+
#### v1.4.0：2023-4-15
473+
* 优化CameraScan的缺省配置（CameraConfig相关配置）
474+
* 优化ViewfinderView自定义属性（新增laserDrawableRatio）
475+
* 更新MLKit相关依赖库版本
476+
* 更新CameraX至v1.2.2
477+
471478
#### v1.3.0：2023-2-23
472479
* 新增公共库（mlkit-common）
473480
* 优化注释

‎app/build.gradle‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44
}
55

66
android {
7+
namespace 'com.king.mlkit.vision.app'
78
compileSdk build_versions.compileSdk
89

910
defaultConfig {
@@ -27,25 +28,22 @@ android {
2728
}
2829
}
2930

30-
3131
compileOptions {
3232
sourceCompatibility JavaVersion.VERSION_11
3333
targetCompatibility JavaVersion.VERSION_11
3434
}
3535

3636
kotlinOptions {
37-
jvmTarget = '1.8'
37+
jvmTarget = JavaVersion.VERSION_11.toString()
3838
}
3939
lint {
4040
abortOnError false
4141
}
42-
namespace 'com.king.mlkit.vision.app'
4342
}
4443

4544
dependencies {
46-
implementation fileTree(include: ['*.jar'], dir: 'libs')
4745
testImplementation deps.test.junit
48-
androidTestImplementation deps.test.runner
46+
androidTestImplementation deps.test.android_ext_junit
4947
androidTestImplementation deps.test.espresso
5048

5149
implementation deps.androidx.material

‎app/release/app-release.apk‎

-1.03 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": 7,
15-
"versionName": "1.3.0",
14+
"versionCode": 8,
15+
"versionName": "1.4.0",
1616
"outputFile": "app-release.apk"
1717
}
1818
],

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
android:theme="@style/CameraScanTheme"/>
3434

3535
<activity android:name=".barcode.QRCodeScanningActivity"
36-
android:screenOrientation="portrait"
36+
3737
android:exported="false"
3838
android:theme="@style/CameraScanTheme"/>
3939

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ class MainActivity : AppCompatActivity() {
9494
Toast.makeText(this, text, Toast.LENGTH_SHORT).show()
9595
}
9696

97+
/**
98+
* 处理图片 - 从图片中获取条码结果
99+
*/
97100
private fun processPhoto(data: Uri?) {
98101
data?.let {
99102
try {

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,19 @@ import com.king.mlkit.vision.app.R
2323
import com.king.mlkit.vision.app.drawRect
2424
import com.king.mlkit.vision.barcode.BarcodeCameraScanActivity
2525
import com.king.mlkit.vision.camera.AnalyzeResult
26+
import com.king.mlkit.vision.camera.CameraScan
2627
import com.king.mlkit.vision.camera.config.ResolutionCameraConfig
2728

2829
/**
2930
* @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
3031
*/
3132
class BarcodeScanningActivity : BarcodeCameraScanActivity() {
3233

33-
override fun initCameraScan() {
34-
super.initCameraScan()
34+
override fun initCameraScan(cameraScan: CameraScan<MutableList<Barcode>>) {
35+
super.initCameraScan(cameraScan)
3536
cameraScan.setPlayBeep(true)
3637
.setVibrate(true)
37-
.setCameraConfig(ResolutionCameraConfig(this))//设置CameraConfig
38+
// .setCameraConfig(ResolutionCameraConfig(this))// 设置CameraConfig
3839
}
3940

4041
override fun onScanResultCallback(result: AnalyzeResult<MutableList<Barcode>>) {

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,18 @@ import com.king.mlkit.vision.app.R
2323
import com.king.mlkit.vision.app.drawRect
2424
import com.king.mlkit.vision.barcode.QRCodeCameraScanActivity
2525
import com.king.mlkit.vision.camera.AnalyzeResult
26-
import com.king.mlkit.vision.camera.config.AspectRatioCameraConfig
27-
import com.king.mlkit.vision.camera.config.ResolutionCameraConfig
26+
import com.king.mlkit.vision.camera.CameraScan
2827

2928
/**
3029
* @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
3130
*/
3231
class MultipleQRCodeScanningActivity : QRCodeCameraScanActivity() {
3332

34-
override fun initCameraScan() {
35-
super.initCameraScan()
33+
override fun initCameraScan(cameraScan: CameraScan<MutableList<Barcode>>) {
34+
super.initCameraScan(cameraScan)
3635
cameraScan.setPlayBeep(true)
3736
.setVibrate(true)
38-
// .setCameraConfig(AspectRatioCameraConfig(this))
39-
.setCameraConfig(ResolutionCameraConfig(this, ResolutionCameraConfig.IMAGE_QUALITY_720P))
37+
// .setCameraConfig(ResolutionCameraConfig(this))
4038
}
4139

4240
override fun getLayoutId(): Int {

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import com.king.mlkit.vision.app.R
2323
import com.king.mlkit.vision.barcode.QRCodeCameraScanActivity
2424
import com.king.mlkit.vision.camera.AnalyzeResult
2525
import com.king.mlkit.vision.camera.CameraScan
26-
import com.king.mlkit.vision.camera.config.AspectRatioCameraConfig
2726
import com.king.mlkit.vision.camera.util.PointUtils
2827

2928
/**
@@ -39,8 +38,8 @@ class QRCodeScanningActivity : QRCodeCameraScanActivity() {
3938
ivResult = findViewById(R.id.ivResult)
4039
}
4140

42-
override fun initCameraScan() {
43-
super.initCameraScan()
41+
override fun initCameraScan(cameraScan: CameraScan<MutableList<Barcode>>) {
42+
super.initCameraScan(cameraScan)
4443
cameraScan.setPlayBeep(true)
4544
.setVibrate(true)
4645
.bindFlashlightView(ivFlashlight)

‎app/src/main/res/drawable-xhdpi/ic_laser_line.png‎

3.47 KB
Loading

0 commit comments

Comments
 (0)