diff --git a/.gitignore b/.gitignore index fd28340..fc78b26 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ /.idea/libraries /.idea/modules.xml /.idea/workspace.xml -.idea +**/.idea/ .DS_Store /build /captures diff --git a/scanCode/build.gradle b/scanCode/build.gradle index 7f2c401..12e040d 100644 --- a/scanCode/build.gradle +++ b/scanCode/build.gradle @@ -1,37 +1,3 @@ -//plugins { -// id 'com.android.library' -//} -// -//android { -// compileSdkVersion 33 -// -// defaultConfig { -// minSdkVersion 19 -// -// testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" -// consumerProguardFiles "consumer-rules.pro" -// } -// -// buildTypes { -// release { -// minifyEnabled false -// proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' -// } -// } -// compileOptions { -// sourceCompatibility JavaVersion.VERSION_1_8 -// targetCompatibility JavaVersion.VERSION_1_8 -// } -//} -// -//dependencies { -// -// implementation 'androidx.appcompat:appcompat:1.6.1' -// implementation 'com.google.android.material:material:1.8.0' -// testImplementation 'junit:junit:4.13.2' -// androidTestImplementation 'androidx.test.ext:junit:1.1.5' -// androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' -//} apply plugin: 'com.android.library' android { @@ -72,8 +38,14 @@ dependencies { 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' + //Camera核心 (*必须) + implementation 'com.github.jenly1314.MLKit:mlkit-camera-core:1.4.0' + //公共库 (可选) (1.3.0新增:当使用到MLKit下面的子库时,需依赖公共库) + implementation 'com.github.jenly1314.MLKit:mlkit-common:1.4.0' + //条码识别 (可选) + implementation 'com.github.jenly1314.MLKit:mlkit-barcode-scanning:1.4.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" diff --git a/scanCode/src/main/java/cn/bnyer/scancode/MainScanActivity.java b/scanCode/src/main/java/cn/bnyer/scancode/MainScanActivity.java new file mode 100644 index 0000000..6ba1ed3 --- /dev/null +++ b/scanCode/src/main/java/cn/bnyer/scancode/MainScanActivity.java @@ -0,0 +1,45 @@ +package cn.bnyer.scancode; + +import android.util.Log; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.google.mlkit.vision.barcode.common.Barcode; +import com.king.mlkit.vision.barcode.BarcodeCameraScanActivity; +import com.king.mlkit.vision.camera.AnalyzeResult; +import com.king.mlkit.vision.camera.CameraScan; +import com.king.mlkit.vision.camera.analyze.Analyzer; + +import java.util.List; + +public class MainScanActivity extends BarcodeCameraScanActivity { + + @Override + public void initCameraScan(@NonNull CameraScan cameraScan) { + super.initCameraScan(cameraScan); + cameraScan.setPlayBeep(true).setVibrate(true); + } + + @Nullable + @Override + public Analyzer> createAnalyzer() { + Log.i("======", "开始分析数据结果:"); + return null; + } + + @Override + public void onScanResultCallback(@NonNull AnalyzeResult result) { + Log.i("======", "开始解析扫码结果:" + result); + Analyzer> analyzer = this.createAnalyzer(); + Log.i("======", "获取到的分析结果:" + analyzer); + } + + @Override + public void onScanResultFailure() { + Log.i("======", "扫码失败了:"); + super.onScanResultFailure(); + } + + +} diff --git a/scanCode/src/main/java/cn/bnyer/scancode/scanCode.java b/scanCode/src/main/java/cn/bnyer/scancode/scanCode.java index 929f613..104ff9d 100644 --- a/scanCode/src/main/java/cn/bnyer/scancode/scanCode.java +++ b/scanCode/src/main/java/cn/bnyer/scancode/scanCode.java @@ -4,12 +4,15 @@ import android.content.Intent; import com.google.mlkit.vision.barcode.BarcodeScannerOptions; import com.google.mlkit.vision.barcode.common.Barcode; +import com.king.mlkit.vision.camera.analyze.Analyzer; import com.xiaoguang.widget.mlkitscanner.ScanManager; import com.xiaoguang.widget.mlkitscanner.callback.act.ScanCallback; import org.json.JSONException; import org.json.JSONObject; +import java.util.List; + import io.dcloud.feature.uniapp.annotation.UniJSMethod; import io.dcloud.feature.uniapp.bridge.UniJSCallback; import io.dcloud.feature.uniapp.common.UniModule; @@ -28,21 +31,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) { +// @UniJSMethod(uiThread = false) +// public void startScan(){ +// MainScanActivity activity = new MainScanActivity(); +// activity.initCameraScan(); +// } // -// } -// }); - - - } +// @UniJSMethod(uiThread = false) +// public void createAnalyzer(){ +// MainScanActivity activity = new MainScanActivity(); +// +// } +// +// @UniJSMethod(uiThread = false) +// public void getScanResult(){ +// MainScanActivity activity = new MainScanActivity(); +// Analyzer> analyzer = activity.createAnalyzer(); +// activity.onScanResultCallback(analyzer); +// } }