Skip to content

Commit 2359695

Browse files
jenly1314jenly1314
committed
更新CameraX至v1.2.2
1 parent 863f1ab commit 2359695

33 files changed

+734
-319
lines changed

‎README.md

+45-38
Original file line numberDiff line numberDiff line change
@@ -25,43 +25,44 @@ ZXingLite for Android 是ZXing的精简极速版，基于ZXing库优化扫码和
2525

2626
## ViewfinderView属性说明
2727

28-
| 属性 | 属性类型 | 默认值 | 属性说明 |
29-
| :------|:----------| :------ | :------ |
30-
| maskColor | color |<font color=#000000>#60000000</font>| 扫描区外遮罩的颜色 |
31-
| frameColor | color |<font color=#1FB3E2>#7F1FB3E2</font>| 扫描区边框的颜色 |
32-
| cornerColor | color |<font color=#1FB3E2>#FF1FB3E2</font>| 扫描区边角的颜色 |
33-
| laserColor | color |<font color=#1FB3E2>#FF1FB3E2</font>| 扫描区激光线的颜色 |
34-
| labelText | string | | 扫描提示文本信息 |
35-
| labelTextColor | color |<font color=#C0C0C0>#FFC0C0C0</font>| 提示文本字体颜色 |
36-
| labelTextSize | dimension |14sp| 提示文本字体大小 |
37-
| labelTextPadding | dimension |24dp| 提示文本距离扫描区的间距 |
38-
| labelTextWidth | dimension | | 提示文本的宽度，默认为View的宽度 |
39-
| labelTextLocation | enum |bottom| 提示文本显示位置 |
40-
| frameWidth | dimension | | 扫码框宽度 |
41-
| frameHeight | dimension | | 扫码框高度 |
42-
| laserStyle | enum | line | 扫描激光的样式 |
43-
| gridColumn | integer | 20 | 网格扫描激光列数 |
44-
| gridHeight | integer | 40dp | 网格扫描激光高度，为0dp时，表示动态铺满 |
45-
| cornerRectWidth | dimension | 4dp | 扫描区边角的宽 |
46-
| cornerRectHeight | dimension | 16dp | 扫描区边角的高 |
28+
| 属性 | 属性类型 | 默认值 | 属性说明 |
29+
|:------------------------|:----------| :------ | :------ |
30+
| maskColor | color |<font color=#000000>#60000000</font>| 扫描区外遮罩的颜色 |
31+
| frameColor | color |<font color=#1FB3E2>#7F1FB3E2</font>| 扫描区边框的颜色 |
32+
| cornerColor | color |<font color=#1FB3E2>#FF1FB3E2</font>| 扫描区边角的颜色 |
33+
| laserColor | color |<font color=#1FB3E2>#FF1FB3E2</font>| 扫描区激光线的颜色 |
34+
| labelText | string | | 扫描提示文本信息 |
35+
| labelTextColor | color |<font color=#C0C0C0>#FFC0C0C0</font>| 提示文本字体颜色 |
36+
| labelTextSize | dimension |14sp| 提示文本字体大小 |
37+
| labelTextPadding | dimension |24dp| 提示文本距离扫描区的间距 |
38+
| labelTextWidth | dimension | | 提示文本的宽度，默认为View的宽度 |
39+
| labelTextLocation | enum |bottom| 提示文本显示位置 |
40+
| frameWidth | dimension | | 扫码框宽度 |
41+
| frameHeight | dimension | | 扫码框高度 |
42+
| laserStyle | enum | line | 扫描激光的样式 |
43+
| gridColumn | integer | 20 | 网格扫描激光列数 |
44+
| gridHeight | integer | 40dp | 网格扫描激光高度，为0dp时，表示动态铺满 |
45+
| cornerRectWidth | dimension | 4dp | 扫描区边角的宽 |
46+
| cornerRectHeight | dimension | 16dp | 扫描区边角的高 |
4747
| scannerLineMoveDistance | dimension | 2dp | 扫描线每次移动距离 |
48-
| scannerLineHeight | dimension | 5dp | 扫描线高度 |
49-
| frameLineWidth | dimension | 1dp | 边框线宽度 |
50-
| scannerAnimationDelay | integer | 20 | 扫描动画延迟间隔时间，单位：毫秒 |
51-
| frameRatio | float | 0.625f | 扫码框与屏幕占比 |
52-
| framePaddingLeft | dimension | 0 | 扫码框左边的内间距 |
53-
| framePaddingTop | dimension | 0 | 扫码框上边的内间距 |
54-
| framePaddingRight | dimension | 0 | 扫码框右边的内间距 |
55-
| framePaddingBottom | dimension | 0 | 扫码框下边的内间距 |
56-
| frameGravity | enum | center | 扫码框对齐方式 |
57-
| pointColor | color | <font color=#1FB3E2>#FF1FB3E2</font> | 结果点的颜色 |
58-
| pointStrokeColor | color | <font color=#FFFFFF>#FFFFFFFF</font> | 结果点描边的颜色 |
59-
| pointRadius | dimension | 15dp | 结果点的半径 |
60-
| pointStrokeRatio | float | 1.2 | 结果点描边半径与结果点半径的比例 |
61-
| pointDrawable | reference | | 结果点自定义图片 |
62-
| showPointAnim | boolean | true | 是否显示结果点的动画 |
63-
| laserDrawable | reference | | 扫描激光自定义图片 |
64-
| viewfinderStyle | enum | classic | 取景框样式；支持：classic：经典样式（带扫码框那种）、popular：流行样式（不带扫码框） |
48+
| scannerLineHeight | dimension | 5dp | 扫描线高度 |
49+
| frameLineWidth | dimension | 1dp | 边框线宽度 |
50+
| scannerAnimationDelay | integer | 20 | 扫描动画延迟间隔时间，单位：毫秒 |
51+
| frameRatio | float | 0.625f | 扫码框与屏幕占比 |
52+
| framePaddingLeft | dimension | 0 | 扫码框左边的内间距 |
53+
| framePaddingTop | dimension | 0 | 扫码框上边的内间距 |
54+
| framePaddingRight | dimension | 0 | 扫码框右边的内间距 |
55+
| framePaddingBottom | dimension | 0 | 扫码框下边的内间距 |
56+
| frameGravity | enum | center | 扫码框对齐方式 |
57+
| pointColor | color | <font color=#1FB3E2>#FF1FB3E2</font> | 结果点的颜色 |
58+
| pointStrokeColor | color | <font color=#FFFFFF>#FFFFFFFF</font> | 结果点描边的颜色 |
59+
| pointRadius | dimension | 15dp | 结果点的半径 |
60+
| pointStrokeRatio | float | 1.2 | 结果点描边半径与结果点半径的比例 |
61+
| pointDrawable | reference | | 结果点自定义图片 |
62+
| showPointAnim | boolean | true | 是否显示结果点的动画 |
63+
| laserDrawable | reference | | 扫描激光自定义图片 |
64+
| laserDrawableRatio | float | 0.625f | 激光扫描图片与屏幕占比 |
65+
| viewfinderStyle | enum | classic | 取景框样式；支持：classic：经典样式（带扫码框那种）、popular：流行样式（不带扫码框） |
6566

6667

6768
## 引入
@@ -83,7 +84,7 @@ allprojects {
8384

8485
```gradle
8586
// AndroidX 版本
86-
implementation 'com.github.jenly1314:zxing-lite:2.3.1'
87+
implementation 'com.github.jenly1314:zxing-lite:2.4.0'
8788
8889
```
8990

@@ -175,7 +176,7 @@ implementation 'com.king.zxing:zxing-lite:1.1.9'
175176
// 获取CameraScan，扫码相关的配置设置。CameraScan里面包含部分支持链式调用的方法，即调用返回是CameraScan本身的一些配置建议在startCamera之前调用。
176177
getCameraScan().setPlayBeep(true)//设置是否播放音效，默认为false
177178
.setVibrate(true)//设置是否震动，默认为false
178-
.setCameraConfig(new CameraConfig())//设置相机配置信息，CameraConfig可覆写options方法自定义配置
179+
.setCameraConfig(new ResolutionCameraConfig(this))//设置相机配置信息，CameraConfig可覆写options方法自定义配置
179180
.setNeedAutoZoom(false)//二维码太小时可自动缩放，默认为false
180181
.setNeedTouchZoom(true)//支持多指触摸捏合缩放，默认为true
181182
.setDarkLightLux(45f)//设置光线足够暗的阈值（单位：lux），需要通过{@link #bindFlashlightView(View)}绑定手电筒才有效
@@ -404,6 +405,12 @@ dependencies {
404405

405406
## 版本记录
406407

408+
#### v2.4.0：2023-4-15
409+
* 优化CameraScan的缺省配置（CameraConfig相关配置）
410+
* 优化ViewfinderView自定义属性（新增laserDrawableRatio）
411+
* 优化ImageAnalyzer中YUV数据的处理
412+
* 更新CameraX至v1.2.2
413+
407414
#### v2.3.1：2023-3-4
408415
* 更新CameraX至v1.2.1
409416
* 更新Gradle至v7.5

‎app/build.gradle

+12-14
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
1-
apply plugin: 'com.android.application'
2-
//apply plugin: 'kotlin-android'
3-
//apply plugin: 'kotlin-android-extensions'
1+
plugins {
2+
id 'com.android.application'
3+
id 'org.jetbrains.kotlin.android'
4+
}
45

56
android {
6-
compileSdkVersion build_versions.compileSdk
7-
buildToolsVersion build_versions.buildTools
7+
namespace 'com.king.zxing.app'
8+
compileSdk build_versions.compileSdk
9+
810
defaultConfig {
911
applicationId "com.king.zxing.app"
10-
minSdkVersion build_versions.minSdk
11-
targetSdkVersion build_versions.targetSdk
12+
minSdk build_versions.minSdk
13+
targetSdk build_versions.targetSdk
1214
versionCode app_version.versionCode
1315
versionName app_version.versionName
16+
1417
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1518
}
19+
1620
buildTypes {
1721
release {
1822
minifyEnabled false
@@ -24,22 +28,16 @@ android {
2428
abortOnError false
2529
}
2630

27-
2831
compileOptions {
2932
coreLibraryDesugaringEnabled true
3033
sourceCompatibility JavaVersion.VERSION_11
3134
targetCompatibility JavaVersion.VERSION_11
3235
}
33-
34-
// kotlinOptions {
35-
// jvmTarget = '1.8'
36-
// }
3736
}
3837

3938
dependencies {
40-
implementation fileTree(include: ['*.jar'], dir: 'libs')
4139
testImplementation deps.test.junit
42-
androidTestImplementation deps.test.runner
40+
androidTestImplementation deps.test.android_ext_junit
4341
androidTestImplementation deps.test.espresso
4442

4543
implementation deps.androidx.design

‎app/release/app-release.apk

105 KB
Binary file not shown.

‎app/release/output-metadata.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"type": "SINGLE",
1212
"filters": [],
1313
"attributes": [],
14-
"versionCode": 36,
15-
"versionName": "2.3.1",
14+
"versionCode": 37,
15+
"versionName": "2.4.0",
1616
"outputFile": "app-release.apk"
1717
}
1818
],

‎app/src/main/java/com/king/zxing/app/CustomCaptureActivity.java

+4-6
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void initCameraScan() {
7777
getCameraScan().setPlayBeep(true)//设置是否播放音效，默认为false
7878
.setVibrate(true)//设置是否震动，默认为false
7979
// .setCameraConfig(new CameraConfig())//设置相机配置信息，CameraConfig可覆写options方法自定义配置
80-
.setCameraConfig(new ResolutionCameraConfig(this))//设置CameraConfig，可以根据自己的需求去自定义配置
80+
// .setCameraConfig(new ResolutionCameraConfig(this))//设置CameraConfig，可以根据自己的需求去自定义配置
8181
.setNeedAutoZoom(false)//二维码太小时可自动缩放，默认为false
8282
.setNeedTouchZoom(true)//支持多指触摸捏合缩放，默认为true
8383
.setDarkLightLux(45f)//设置光线足够暗的阈值（单位：lux），需要通过{@link #bindFlashlightView(View)}绑定手电筒才有效
@@ -117,12 +117,10 @@ public boolean onScanResultCallback(Result result) {
117117
}
118118

119119
private void showToast(String text){
120-
if(toast == null){
121-
toast = Toast.makeText(this,text,Toast.LENGTH_SHORT);
122-
}else{
123-
toast.setText(text);
124-
toast.setDuration(Toast.LENGTH_SHORT);
120+
if(toast != null){
121+
toast.cancel();
125122
}
123+
toast = Toast.makeText(this,text,Toast.LENGTH_SHORT);
126124
toast.show();
127125
}
128126

‎app/src/main/java/com/king/zxing/app/MainActivity.java

+8-6
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232

3333

3434
import java.util.List;
35+
import java.util.concurrent.ExecutorService;
36+
import java.util.concurrent.Executors;
3537

3638
import androidx.appcompat.app.AppCompatActivity;
3739
import androidx.core.app.ActivityCompat;
@@ -72,6 +74,8 @@ public class MainActivity extends AppCompatActivity implements EasyPermissions.P
7274

7375
private Toast toast;
7476

77+
private ExecutorService executor = Executors.newSingleThreadExecutor();
78+
7579
@Override
7680
protected void onCreate(Bundle savedInstanceState) {
7781
super.onCreate(savedInstanceState);
@@ -97,12 +101,10 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
97101
}
98102

99103
private void showToast(String text){
100-
if(toast == null){
101-
toast = Toast.makeText(this,text,Toast.LENGTH_SHORT);
102-
}else{
103-
toast.setDuration(Toast.LENGTH_SHORT);
104-
toast.setText(text);
104+
if(toast != null){
105+
toast.cancel();
105106
}
107+
toast = Toast.makeText(this,text,Toast.LENGTH_SHORT);
106108
toast.show();
107109
}
108110

@@ -165,7 +167,7 @@ private void checkCameraPermissions(){
165167
}
166168

167169
private void asyncThread(Runnable runnable){
168-
new Thread(runnable).start();
170+
executor.execute(runnable);
169171
}
170172

171173
/**

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

3.47 KB
Loading

‎app/src/main/res/layout/custom_activity.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
android:id="@+id/viewfinderView"
1414
android:layout_width="match_parent"
1515
android:layout_height="match_parent"
16-
app:viewfinderStyle="popular"/>
16+
app:viewfinderStyle="popular"
17+
app:laserStyle="image"
18+
app:laserDrawableRatio="0.8"
19+
app:laserDrawable="@drawable/ic_laser_line"/>
1720
<ImageView
1821
android:id="@+id/ivFlash"
1922
android:layout_width="wrap_content"

‎build.gradle

+7-50
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,10 @@
1-
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2-
31
buildscript {
4-
52
apply from: 'versions.gradle'
6-
7-
repositories {
8-
google()
9-
mavenCentral()
10-
}
11-
12-
13-
dependencies {
14-
classpath "com.android.tools.build:gradle:$versions.gralde"
15-
// classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
16-
// classpath "com.novoda:bintray-release:$versions.bintray_release"
17-
classpath "com.vanniktech:gradle-maven-publish-plugin:$versions.mavenPublish"
18-
// NOTE: Do not place your application dependencies here; they belong
19-
// in the individual module build.gradle files
20-
}
21-
}
22-
23-
allprojects {
24-
repositories {
25-
google()
26-
mavenCentral()
27-
}
28-
}
29-
30-
allprojects {
31-
plugins.withId("com.vanniktech.maven.publish") {
32-
mavenPublish {
33-
sonatypeHost = "S01"
34-
}
35-
}
36-
}
37-
38-
task clean(type: Delete) {
39-
delete rootProject.buildDir
40-
}
41-
42-
allprojects {
43-
tasks.withType(Javadoc) {
44-
options{
45-
encoding "UTF-8"
46-
charSet 'UTF-8'
47-
links "http://docs.oracle.com/javase/8/docs/api"
48-
}
49-
50-
options.addStringOption('Xdoclint:none', '-quiet')
51-
failOnError false
52-
}
3+
}// Top-level build file where you can add configuration options common to all sub-projects/modules.
4+
plugins {
5+
id 'com.android.application' version '7.4.2' apply false
6+
id 'com.android.library' version '7.4.2' apply false
7+
id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
8+
// id 'org.jetbrains.dokka' version '1.7.0' apply false
9+
id 'com.vanniktech.maven.publish' version '0.22.0' apply false
5310
}

‎change_log.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
## 版本记录
22

3+
#### v2.4.0：2023-4-15
4+
* 优化CameraScan的缺省配置（CameraConfig相关配置）
5+
* 优化ViewfinderView自定义属性（新增laserDrawableRatio）
6+
* 优化ImageAnalyzer中YUV数据的处理
7+
* 更新CameraX至v1.2.2
8+
39
#### v2.3.1：2023-3-4
410
* 更新CameraX至v1.2.1
511
* 更新Gradle至v7.5

‎gradle.properties

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ org.gradle.jvmargs = -Xmx1536m
1414
android.useAndroidX=true
1515
android.enableJetifier=true
1616

17-
VERSION_NAME=2.3.1
18-
VERSION_CODE=36
17+
VERSION_NAME=2.4.0
18+
VERSION_CODE=37
1919
GROUP=com.github.jenly1314
2020

2121
POM_DESCRIPTION=ZXingLite for Android
@@ -35,6 +35,8 @@ POM_DEVELOPER_ID=jenly
3535
POM_DEVELOPER_NAME=Jenly Yu
3636
POM_DEVELOPER_URL=https://github.com/jenly1314/
3737

38+
SONATYPE_HOST=S01
39+
3840
RELEASE_REPOSITORY_URL=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
3941
SNAPSHOT_REPOSITORY_URL=https://s01.oss.sonatype.org/content/repositories/snapshots/
4042

‎settings.gradle

+18-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,18 @@
1-
include ':app', ':zxing-lite'
1+
pluginManagement {
2+
repositories {
3+
gradlePluginPortal()
4+
google()
5+
mavenCentral()
6+
}
7+
}
8+
dependencyResolutionManagement {
9+
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
10+
repositories {
11+
google()
12+
mavenCentral()
13+
}
14+
}
15+
16+
rootProject.name = "ZXingLite"
17+
include ':app'
18+
include ':zxing-lite'

0 commit comments

Comments
 (0)