Skip to content

Commit 37c1c72

Browse files
committed
1.1.0
1 parent 6381af6 commit 37c1c72

File tree

9 files changed

+25
-30
lines changed

9 files changed

+25
-30
lines changed

README.md

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
### [opencv](opencv)
3333

34-
OpenCV:编译好的OpenCV(armeabi-v7a/libopencv_java4.so | 11.3MB)
34+
OpenCV:编译好的OpenCV
3535

3636
### [wechat-qrcode](wechat-qrcode)
3737

@@ -63,15 +63,21 @@ allprojects {
6363

6464
```gradle
6565
// OpenCV基础库(*必须)
66-
implementation 'com.github.jenly1314.WeChatQRCode:opencv:1.0.0'
66+
implementation 'com.github.jenly1314.WeChatQRCode:opencv:1.1.0'
67+
implementation 'com.github.jenly1314.WeChatQRCode:opencv-armv7a:1.1.0'
68+
69+
// OpenCV的其他ABI(可选),根据你的需求选择想要的so支持
70+
implementation 'com.github.jenly1314.WeChatQRCode:opencv-armv64:1.1.0'
71+
implementation 'com.github.jenly1314.WeChatQRCode:opencv-x86:1.1.0'
72+
implementation 'com.github.jenly1314.WeChatQRCode:opencv-x86_64:1.1.0'
6773
6874
// 微信二维码识别功能(可选)
69-
implementation 'com.github.jenly1314.WeChatQRCode:wechat-qrcode:1.0.0'
75+
implementation 'com.github.jenly1314.WeChatQRCode:wechat-qrcode:1.1.0'
7076
7177
// 微信二维码扫码功能(可选)
72-
implementation 'com.github.jenly1314.WeChatQRCode:wechat-qrcode-scanning:1.0.0'
73-
//MLKit的Camera核心库(可选),如果您使用了wechat-qrcode-scanning,则必须依赖mlkit-camera-core库
74-
implementation 'com.github.jenly1314.MLKit:mlkit-camera-core:1.0.1'
78+
implementation 'com.github.jenly1314.WeChatQRCode:wechat-qrcode-scanning:1.1.0'
79+
//MLKit的Camera核心库如果您使用了wechat-qrcode-scanning,则必须依赖mlkit-camera-core库
80+
implementation 'com.github.jenly1314.MLKit:mlkit-camera-core:1.0.2'
7581
7682
```
7783

@@ -127,6 +133,8 @@ class WeChatQRCodeActivity : WeChatCameraScanActivity() {
127133
128134
> PreviewView 用来预览,布局内至少要保证有PreviewView,如果是继承BaseCameraScanActivity或BaseCameraScanFragment,控件id可覆写getPreviewViewId方法自定义
129135
136+
> 关于扫码框动画,你可以直接拷贝[MLKit](https://github.com/jenly1314/MLKit)中的[ViewfinderView](https://github.com/jenly1314/MLKit/blob/master/mlkit-barcode-scanning/src/main/java/com/king/mlkit/vision/barcode/ViewfinderView.java)来使用,也可以自定义实现。
137+
130138
```Xml
131139
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
132140
android:layout_width="match_parent"
@@ -138,6 +146,7 @@ class WeChatQRCodeActivity : WeChatCameraScanActivity() {
138146
<!-- 只需保证有布局内有PreviewView即可,然后自己可根据需要添加的控件 -->
139147
</FrameLayout>
140148
```
149+
141150
更多使用详情,请查看[app](app)中的源码使用示例或直接查看 [API帮助文档](https://jitpack.io/com/github/jenly1314/WeChatQRCode/latest/javadoc/)
142151

143152
### 相关推荐
@@ -148,6 +157,10 @@ class WeChatQRCodeActivity : WeChatCameraScanActivity() {
148157

149158
## 版本记录
150159

160+
#### v1.1.0:2021-8-6
161+
* 编译多种ABI支持
162+
* 更新mlkit-camera-core至v1.0.2
163+
151164
#### v1.0.0:2021-7-24
152165
* WeChatQRCode初始版本
153166

app/release/output-metadata.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ android.useAndroidX = true
1818
# Kotlin code style for this project: "official" or "obsolete":
1919
kotlin.code.style = official
2020

21-
VERSION_NAME=1.0.0
22-
VERSION_CODE=1
21+
VERSION_NAME=1.1.0
22+
VERSION_CODE=3
2323
GROUP=com.github.jenly1314.WeChatQRCode
2424

2525
POM_DESCRIPTION=Wechat QRCode
Binary file not shown.
Binary file not shown.
Binary file not shown.

versions.gradle

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

77
//build version
@@ -30,6 +30,6 @@ versions.espressoCore = "3.3.0"
3030

3131
versions.kotlinxCoroutines = "1.4.3"
3232
versions.lifecycleKtx="2.3.1"
33-
versions.mlkit="1.0.1"
33+
versions.mlkit="1.0.2"
3434

3535
ext.versions = versions

wechat-qrcode/src/main/java/com/king/wechat/qrcode/WeChatQRCodeDetector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private static void initWeChatQRCode(Context context){
6767
Log.d(TAG,"file:" + saveFile.getAbsolutePath());
6868
}
6969
}
70-
Log.d(TAG,"Internal WeChatQRCode");
70+
Log.d(TAG,"Initial WeChatQRCode");
7171
sWeChatQRCode = new WeChatQRCode(
7272
detect.getAbsolutePath(),
7373
detectModel.getAbsolutePath(),

0 commit comments

Comments
 (0)