优化部分细节,为迁移至AndroidX做准备

This commit is contained in:
jenly1314
2019-06-27 11:19:09 +08:00
parent d3db43b461
commit 809930183a
9 changed files with 21 additions and 8 deletions

Binary file not shown.

2
.idea/encodings.xml generated
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="Encoding"> <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8" addBOMForNewFiles="with NO BOM">
<file url="PROJECT" charset="UTF-8" /> <file url="PROJECT" charset="UTF-8" />
</component> </component>
</project> </project>

2
.idea/misc.xml generated
View File

@@ -35,7 +35,7 @@
</value> </value>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

View File

@@ -45,17 +45,17 @@ ZXingLite for Android 是ZXing的精简版基于ZXing库优化扫码和生成
<dependency> <dependency>
<groupId>com.king.zxing</groupId> <groupId>com.king.zxing</groupId>
<artifactId>zxing-lite</artifactId> <artifactId>zxing-lite</artifactId>
<version>1.1.1</version> <version>1.1.2</version>
<type>pom</type> <type>pom</type>
</dependency> </dependency>
``` ```
### Gradle: ### Gradle:
```gradle ```gradle
implementation 'com.king.zxing:zxing-lite:1.1.1' implementation 'com.king.zxing:zxing-lite:1.1.2'
``` ```
### Lvy: ### Lvy:
```lvy ```lvy
<dependency org='com.king.zxing' name='zxing-lite' rev='1.1.1'> <dependency org='com.king.zxing' name='zxing-lite' rev='1.1.2'>
<artifact name='$AID' ext='pom'></artifact> <artifact name='$AID' ext='pom'></artifact>
</dependency> </dependency>
``` ```
@@ -128,6 +128,9 @@ api 'com.google.zxing:core:3.3.3'
## 版本记录 ## 版本记录
#### v1.1.22019-6-27
* 优化部分细节为迁移至AndroidX做准备
#### v1.1.12019-5-20 #### v1.1.12019-5-20
* 支持扫二维码过小时,自动缩放 * 支持扫二维码过小时,自动缩放
* 支持垂直条形码识别增强条形码识别默认不支持需CaptureHelper.supportVerticalCode(true)开启) * 支持垂直条形码识别增强条形码识别默认不支持需CaptureHelper.supportVerticalCode(true)开启)

View File

@@ -21,6 +21,11 @@ android {
lintOptions { lintOptions {
abortOnError false abortOnError false
} }
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
} }
dependencies { dependencies {

Binary file not shown.

View File

@@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"1.1.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] [{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":11,"versionName":"1.1.2","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

View File

@@ -24,6 +24,11 @@ android {
abortOnError false abortOnError false
warning 'InvalidPackage' warning 'InvalidPackage'
} }
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
} }
//task javadoc(type: Javadoc) { //task javadoc(type: Javadoc) {

View File

@@ -1,7 +1,7 @@
//App //App
def app_version = [:] def app_version = [:]
app_version.versionCode = 10 app_version.versionCode = 11
app_version.versionName = "1.1.1" app_version.versionName = "1.1.2"
ext.app_version = app_version ext.app_version = app_version
//build version //build version