更新OpenCV至v4.6.0

README.md

@@ -82,24 +82,55 @@ allprojects {
 
 ```gradle
 // OpenCV基础库（*必须）
-implementation 'com.github.jenly1314.WeChatQRCode:opencv:1.1.1'
-implementation 'com.github.jenly1314.WeChatQRCode:opencv-armv7a:1.1.1'
+implementation 'com.github.jenly1314.WeChatQRCode:opencv:1.2.0'
+implementation 'com.github.jenly1314.WeChatQRCode:opencv-armv7a:1.2.0'
+
+// 微信二维码识别功能（可选）
+implementation 'com.github.jenly1314.WeChatQRCode:wechat-qrcode:1.2.0'
+
+// 微信二维码扫码功能（可选）
+implementation 'com.github.jenly1314.WeChatQRCode:wechat-qrcode-scanning:1.2.0'
+//MLKit的Camera核心库：如果您使用了wechat-qrcode-scanning，则必须依赖mlkit-camera-core库
+implementation 'com.github.jenly1314.MLKit:mlkit-camera-core:1.0.3'
+
+```
+
+3. ABI过滤：在Module的 **build.gradle** 里面的 android{} 中设置支持的 SO 库架构（可选，支持多个平台的 so， 支持的平台越多，APK体积越大）
+
+```gradle
+    defaultConfig {
+    
+        //...
+        
+        ndk {
+            //设置支持的 SO 库架构（开发者可以根据需要，选择一个或多个平台的 so）
+            abiFilters 'armeabi-v7a' // , 'arm64-v8a', 'x86', 'x86_64'
+        }
+    }
+```
+
+ABI过滤：根据需要选择支持的 SO 库架构
+```gradle
+// OpenCV基础库（*必须）
+implementation 'com.github.jenly1314.WeChatQRCode:opencv:1.2.0'
+implementation 'com.github.jenly1314.WeChatQRCode:opencv-armv7a:1.2.0'
 
 // OpenCV的其他ABI（可选），根据你的需求选择想要的so支持
-implementation 'com.github.jenly1314.WeChatQRCode:opencv-armv64:1.1.1'
-implementation 'com.github.jenly1314.WeChatQRCode:opencv-x86:1.1.1'
-implementation 'com.github.jenly1314.WeChatQRCode:opencv-x86_64:1.1.1'
+implementation 'com.github.jenly1314.WeChatQRCode:opencv-armv64:1.2.0'
+implementation 'com.github.jenly1314.WeChatQRCode:opencv-x86:1.2.0'
+implementation 'com.github.jenly1314.WeChatQRCode:opencv-x86_64:1.2.0'
 
 // 微信二维码识别功能（可选）
-implementation 'com.github.jenly1314.WeChatQRCode:wechat-qrcode:1.1.1'
+implementation 'com.github.jenly1314.WeChatQRCode:wechat-qrcode:1.2.0'
 
 // 微信二维码扫码功能（可选）
-implementation 'com.github.jenly1314.WeChatQRCode:wechat-qrcode-scanning:1.1.1'
+implementation 'com.github.jenly1314.WeChatQRCode:wechat-qrcode-scanning:1.2.0'
 //MLKit的Camera核心库：如果您使用了wechat-qrcode-scanning，则必须依赖mlkit-camera-core库
 implementation 'com.github.jenly1314.MLKit:mlkit-camera-core:1.0.3'
 
 ```
 
+
 ## 示例
 
 初始化 **OpenCV** 和 **WeChatQRCodeDetector** （建议在 **MainActivity** 的 **onCreate** 方法中初始化）
@@ -248,6 +279,9 @@ class WeChatQRCodeActivity : WeChatCameraScanActivity() {
 
 ## 版本记录
 
+#### v1.2.0：2022-8-4
+* 更新OpenCV至v4.6.0
+
 #### v1.1.1：2021-11-2
 * 优化细节
 * 更新mlkit-camera-core至v1.0.3

app/build.gradle

@@ -13,9 +13,10 @@ android {
         versionName app_version.versionName
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
         ndk {
-            // 设置支持的 SO 库构架
-            abiFilters 'armeabi-v7a'
+            //设置支持的 SO 库架构（开发者可以根据需要，选择一个或多个平台的so）
+            abiFilters 'armeabi-v7a' // , 'arm64-v8a', 'x86', 'x86_64'
         }
     }
 
@@ -41,6 +42,7 @@ android {
 
 dependencies {
 
+    implementation fileTree(dir: 'libs', include: ['*.aar','*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$versions.kotlin"
     implementation "androidx.appcompat:appcompat:$versions.appcompat"
     implementation "com.google.android.material:material:$versions.material"
@@ -58,7 +60,6 @@ dependencies {
     implementation "com.github.jenly1314.AppUpdater:app-dialog:$versions.appDialog"
 
 
-
     implementation project(path: ':opencv')
     implementation project(path: ':opencv-armv7a')
 //    implementation project(path: ':opencv-armv64')

app/release/output-metadata.json

@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 4,
-      "versionName": "1.1.1",
+      "versionCode": 5,
+      "versionName": "1.2.0",
       "outputFile": "app-release.apk"
     }
   ]

build.gradle

@@ -10,6 +10,7 @@ buildscript {
         classpath "com.android.tools.build:gradle:$versions.gradle"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
         classpath "com.vanniktech:gradle-maven-publish-plugin:$versions.mavenPublish"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$versions.dokka"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -41,9 +42,9 @@ allprojects {
         failOnError false
     }
 
-//    plugins.withId("com.vanniktech.maven.publish") {
-//        mavenPublish {
-//            sonatypeHost = "S01"
-//        }
-//    }
+    plugins.withId("com.vanniktech.maven.publish") {
+        mavenPublish {
+            sonatypeHost = "S01"
+        }
+    }
 }

gradle.properties

@@ -18,23 +18,30 @@ android.useAndroidX = true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style   = official
 
-VERSION_NAME=1.1.1
-VERSION_CODE=4
+VERSION_NAME=1.2.0
+VERSION_CODE=5
 GROUP=com.github.jenly1314.WeChatQRCode
 
 POM_DESCRIPTION=Wechat QRCode
 POM_URL=https://github.com/jenly1314/WeChatQRCode
+
 POM_SCM_URL=https://github.com/jenly1314/WeChatQRCode
 POM_SCM_CONNECTION=scm:[email protected]:jenly1314/WeChatQRCode.git
 POM_SCM_DEV_CONNECTION=scm:[email protected]:jenly1314/WeChatQRCode.git
+
 #POM_LICENCE_NAME=The MIT License
 #POM_LICENCE_URL=https://opensource.org/licenses/mit-license.php
 POM_LICENCE_NAME=The Apache Software License, Version 2.0
 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
+POM_LICENSE_DIST=repo
+
 POM_DEVELOPER_ID=jenly
 POM_DEVELOPER_NAME=Jenly Yu
-#POM_DEVELOPER_URL=https://github.com/jenly1314/
+POM_DEVELOPER_URL=https://github.com/jenly1314/
+
 RELEASE_REPOSITORY_URL=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
 SNAPSHOT_REPOSITORY_URL=https://s01.oss.sonatype.org/content/repositories/snapshots/
+
 RELEASE_SIGNING_ENABLED=false
 
+