diff --git a/.gitignore b/.gitignore index fd45b12..fd28340 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ /.idea/libraries /.idea/modules.xml /.idea/workspace.xml +.idea .DS_Store /build /captures diff --git a/app/build.gradle b/app/build.gradle index 1223f51..5f2fa3e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -81,4 +81,7 @@ dependencies { implementation project(':uniplugin_module') implementation project(':uniplugin_richalert') implementation project(':scanCode') + + + } diff --git a/app/libs/mlkit-scanner-release.aar b/app/libs/mlkit-scanner-release.aar new file mode 100644 index 0000000..31f597d Binary files /dev/null and b/app/libs/mlkit-scanner-release.aar differ diff --git a/scanCode/build.gradle b/scanCode/build.gradle index 710bd56..7f2c401 100644 --- a/scanCode/build.gradle +++ b/scanCode/build.gradle @@ -64,13 +64,20 @@ repositories { dependencies { compileOnly fileTree(dir: 'libs', include: ['*.jar']) - compileOnly fileTree(dir: '../app/libs', include: ['uniapp-v8-release.aar']) + compileOnly fileTree(dir: '../app/libs', include: ['uniapp-v8-release.aar','mlkit-scanner-release.aar']) compileOnly 'androidx.recyclerview:recyclerview:1.0.0' compileOnly 'androidx.legacy:legacy-support-v4:1.0.0' compileOnly 'androidx.appcompat:appcompat:1.0.0' implementation 'com.alibaba:fastjson:1.2.83' implementation 'com.facebook.fresco:fresco:1.13.0' + //添加扫码识别库 + implementation 'com.github.ITxiaoguang:MLKitScanner:1.0.0' + implementation 'com.google.mlkit:barcode-scanning:17.0.2' +// implementation "androidx.camera:camera-core:1.0.2" +// implementation "androidx.camera:camera-camera2:1.0.2" +// implementation "androidx.camera:camera-lifecycle:1.0.2" +// implementation "androidx.camera:camera-view:1.0.0-alpha25" /*implementation 'com.android.support:appcompat-v7:28.0.0' testImplementation 'junit:junit:4.12' diff --git a/scanCode/src/main/java/cn/bnyer/scancode/scanCode.java b/scanCode/src/main/java/cn/bnyer/scancode/scanCode.java index 75ebfa6..929f613 100644 --- a/scanCode/src/main/java/cn/bnyer/scancode/scanCode.java +++ b/scanCode/src/main/java/cn/bnyer/scancode/scanCode.java @@ -1,5 +1,12 @@ package cn.bnyer.scancode; +import android.content.Intent; + +import com.google.mlkit.vision.barcode.BarcodeScannerOptions; +import com.google.mlkit.vision.barcode.common.Barcode; +import com.xiaoguang.widget.mlkitscanner.ScanManager; +import com.xiaoguang.widget.mlkitscanner.callback.act.ScanCallback; + import org.json.JSONException; import org.json.JSONObject; @@ -9,7 +16,7 @@ import io.dcloud.feature.uniapp.common.UniModule; public class scanCode extends UniModule { - @UniJSMethod + @UniJSMethod(uiThread = false) public void add(JSONObject json, UniJSCallback callback) throws JSONException { final int a = json.getInt("a"); final int b = json.getInt("b"); @@ -20,4 +27,22 @@ public class scanCode extends UniModule { } }); } + + @UniJSMethod(uiThread = false) + public void scanCode(){ + BarcodeScannerOptions options = new BarcodeScannerOptions.Builder() + .setBarcodeFormats( + Barcode.FORMAT_QR_CODE, + Barcode.FORMAT_AZTEC) + .build(); +// ScanManager manager = new ScanManager(); +// manager.startScan(this, new ScanCallback() { +// @Override +// public void onActivityResult(int i, Intent intent) { +// +// } +// }); + + + } }