diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e9db04bba406e7d6a6d2b55bbd744a00013fd9c..7b8381af1a48fb2d43a0d665b30cc13950e31fdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,4 +23,8 @@ ## 3.0.1 * 增加部分新的机型广播。 ## 3.0.2 -* 修复android13以上机型广播注册报错问题 \ No newline at end of file +* 修复android13以上机型广播注册报错问题 +## 3.0.3 +* 增加部分新的机型广播。 +## 3.0.4 +* 调整版本 \ No newline at end of file diff --git a/README.md b/README.md index c49dbca914ca184b05619a8281d6cb03b1a4bdef..6045239acf9213b0b03ba28483180c14fc952b49 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -flutter_plugin_pda_scanner +flutter_plugin_pda_scanner -

flutter_plugin_pda_scanner v3.0.2

+

flutter_plugin_pda_scanner v3.0.4

一款基于Flutter开发的支持多种PDA扫码的插件

- + @@ -29,7 +29,7 @@ ### 🔹使用方法： 1. **安装**：通过`pubspec.yaml`添加依赖。 -2. **导入**：在Flutter项目中导入`pda_scanner`包。 +2. **导入**：在Flutter项目中导入`flutter_plugin_pda_scanner`包。 3. **初始化**：在`main`函数中初始化插件，并使用`await`等待完成。 4. **监听事件**：通过`on`方法设置事件监听，使用tag作为标识。 5. **取消监听**：使用`off`方法取消特定tag的监听或`offAll`取消所有监听。 @@ -46,9 +46,9 @@ 同时支持根据广播行为手动注册广播监听PDA扫码 ``` -**_可先 [下载](https://gitee.com/zengxingshun/flutter_plugin_pda_scanner/releases/download/V3.0.2/pda_scanner-V3.0.2.apk) 示例 app 进行测试，如需要集成 native 方式扫码的 PDA，请加我微信反馈，欢迎 fork 及 pr 。_** +**_可先 [下载](https://gitee.com/zengxingshun/flutter_plugin_pda_scanner/releases/download/V3.0.4/pda_scanner-V3.0.4.apk) 示例 app 进行测试，如需要集成 native 方式扫码的 PDA，请加我微信反馈，欢迎 fork 及 pr 。_** -| | | | +| | | | |:--------------------------------------------------:|:--------------------------------------------------------:|:-----------------------------------------------------------:| ➡ **如果是集成蓝牙扫码枪/USB扫码枪，请移步至另一个优秀开源库：[liyufengrex/flutter_scan_gun: flutter：usb 即插款扫码枪通用方案。](https://github.com/liyufengrex/flutter_scan_gun)** @@ -61,15 +61,13 @@ ```yaml dependencies: - pda_scanner: - git: - url: https://gitee.com/zengxingshun/flutter_plugin_pda_scanner.git + flutter_plugin_pda_scanner: ^3.0.4 ``` ## 2. 导入 ```dart -import 'package:pda_scanner/pda_utils.dart'; +import 'package:flutter_plugin_pda_scanner/pda_utils.dart'; ``` ## 3. 初始化 @@ -135,7 +133,7 @@ PdaUtils.off("tag"); ```dart import 'package:flutter/material.dart'; -import 'package:pda_scanner/pda_utils.dart'; +import 'package:flutter_plugin_pda_scanner/pda_utils.dart'; void main() async { // 初始化PDA扫码 加上await关键字等待初始化完成 @@ -221,7 +219,7 @@ class _MyHomePageState extends State { # 三、额外说明【斑马ZEBRA】 ⚡ -**_ZEBRA（斑马）的PDA发生闪退或其他情况则需要做以下额外配置，您需要在您Flutter项目的安卓目录下的 +**_ZEBRA（斑马）的 PDA 发生闪退或其他情况则需要做以下额外配置，您需要在您Flutter项目的安卓目录下的 AndroidManifest.xml 中加入以下内容_** ### 1、在 `manifest` 节点下加入 @@ -284,4 +282,4 @@ FAILURE: Build failed with an exception. 如图： - + diff --git a/android/settings.gradle b/android/settings.gradle index a29543ce09766bc83e3917f9ff73adedf503efdf..1dc64577c9fba2f03a240475df715bf3c620f47f 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1 +1 @@ -rootProject.name = 'pda_scanner' \ No newline at end of file +rootProject.name = 'flutter_plugin_pda_scanner' \ No newline at end of file diff --git a/android/src/main/kotlin/io/github/jerometseng/pdascanner/core/ActionContainer.kt b/android/src/main/kotlin/io/github/jerometseng/pdascanner/core/ActionContainer.kt index 1687f1a70d02298b53758fe0aac426194dc9f311..f3ca08b62ea1f2715e618f490a6b2cfc7dff21fa 100644 --- a/android/src/main/kotlin/io/github/jerometseng/pdascanner/core/ActionContainer.kt +++ b/android/src/main/kotlin/io/github/jerometseng/pdascanner/core/ActionContainer.kt @@ -18,8 +18,16 @@ class ActionContainer { "com.scanner.broadcast" to listOf(BroadcastTag("data")), // 海康广播 "com.service.scanner.data" to listOf(BroadcastTag("ScanCode")), - "android.intent.action.SCANNER_SERVICE" to listOf(BroadcastTag("data")), - "android.intent.ACTION_SCAN_OUTPUT" to listOf(BroadcastTag("data")), + "android.intent.action.SCANNER_SERVICE" to listOf( + BroadcastTag("barcode"), + BroadcastTag("barcode_string"), + BroadcastTag("data") + ), + "android.intent.ACTION_SCAN_OUTPUT" to listOf( + BroadcastTag("barcode"), + BroadcastTag("barcode_string"), + BroadcastTag("data") + ), // 远望谷广播 "com.rfid.SCAN" to listOf( BroadcastTag( diff --git a/android/src/main/kotlin/io/github/jerometseng/pdascanner/pda_type/CodeEmitterManager.kt b/android/src/main/kotlin/io/github/jerometseng/pdascanner/pda_type/CodeEmitterManager.kt index 8ff2cb92ec41583d3a79e31131fb489d7c18f0d7..513d10bc0a8076d15673b82c653d99ef3865984e 100644 --- a/android/src/main/kotlin/io/github/jerometseng/pdascanner/pda_type/CodeEmitterManager.kt +++ b/android/src/main/kotlin/io/github/jerometseng/pdascanner/pda_type/CodeEmitterManager.kt @@ -21,7 +21,7 @@ abstract class CodeEmitterManager(private val methodChannel: MethodChannel) { companion object { // 与 flutter 通信的管道 - const val CODE_EMITTER_CHANNEL = "io.github.jerometseng/pda_scanner" + const val CODE_EMITTER_CHANNEL = "io.github.jerometseng/flutter_plugin_pda_scanner" // 与 flutter 通信的方法 发送接收到的条码数据 const val CODE_EMITTER_METHOD = "sendBarcodeToFlutter" diff --git a/example/lib/main.dart b/example/lib/main.dart index 69e8d0348d3a5dc38d8afc3f104e42b59ffd2f01..01a239c338df17ea701b486b117c146ac262045f 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:pda_scanner/pda_utils.dart'; +import 'package:flutter_plugin_pda_scanner/pda_utils.dart'; import 'package:pda_scanner_example/pages/device_info_page.dart'; import 'package:pda_scanner_example/pages/home_page.dart'; diff --git a/example/lib/pages/home_page.dart b/example/lib/pages/home_page.dart index a89eea6da28d11460b494a6b6a31faf0fba9593a..7353bce033d93f87b75f91d379f2491a1c40e53d 100644 --- a/example/lib/pages/home_page.dart +++ b/example/lib/pages/home_page.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:get_storage/get_storage.dart'; import 'package:getwidget/getwidget.dart'; -import 'package:pda_scanner/pda_utils.dart'; +import 'package:flutter_plugin_pda_scanner/pda_utils.dart'; import 'package:pda_scanner_example/pages/device_info_page.dart'; class HomePage extends StatelessWidget { diff --git a/example/pubspec.lock b/example/pubspec.lock index 8f7af7c894ab36fcf60c0d4c8c1703723931eb40..b0485fd6700cf85c834123527815a571832fe233 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -133,10 +133,10 @@ packages: dependency: transitive description: name: collection - sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.19.0" + version: "1.18.0" crypto: dependency: transitive description: @@ -243,6 +243,13 @@ packages: url: "https://pub.dev" source: hosted version: "2.4.3" + flutter_plugin_pda_scanner: + dependency: "direct main" + description: + path: ".." + relative: true + source: path + version: "3.0.4" flutter_test: dependency: "direct dev" description: flutter @@ -339,18 +346,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.7" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "3.0.8" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: @@ -471,13 +478,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.0" - pda_scanner: - dependency: "direct main" - description: - path: ".." - relative: true - source: path - version: "3.0.0" petitparser: dependency: transitive description: @@ -530,7 +530,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.0" + version: "0.0.99" source_span: dependency: transitive description: @@ -591,10 +591,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.11.1" stream_channel: dependency: transitive description: @@ -607,10 +607,10 @@ packages: dependency: transitive description: name: string_scanner - sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.2.0" sync_http: dependency: transitive description: @@ -639,10 +639,10 @@ packages: dependency: transitive description: name: test_api - sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.7.3" + version: "0.7.2" typed_data: dependency: transitive description: @@ -679,10 +679,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "14.3.0" + version: "14.2.5" web: dependency: transitive description: @@ -695,10 +695,10 @@ packages: dependency: transitive description: name: webdriver - sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8" + sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e" url: "https://pub.dev" source: hosted - version: "3.0.4" + version: "3.0.3" win32: dependency: transitive description: diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 3f08019dba18c4ff1f54ca7ed1ddc05a4961662f..628ae2a89fb92fc6967e54c477df1495bf159d02 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -4,7 +4,7 @@ description: "Demonstrates how to use the pda_scanner plugin." # pub.dev using `flutter pub publish`. This is preferred for private packages. publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 3.0.2 +version: 3.0.4 environment: sdk: '>=3.2.3 <4.0.0' @@ -34,7 +34,7 @@ dependencies: flutter: sdk: flutter - pda_scanner: + flutter_plugin_pda_scanner: path: ../ cupertino_icons: ^1.0.2 diff --git a/lib/pda_utils.dart b/lib/pda_utils.dart index 991dce6210f84a7b304d874116e2039ecba5d4e9..e3dbcfb833f79f132f18e0234103d1136d6858c5 100644 --- a/lib/pda_utils.dart +++ b/lib/pda_utils.dart @@ -13,7 +13,7 @@ typedef Callback = void Function(String barcode); abstract class PdaUtils { // 方法通道 static const _methodChannel = - MethodChannel("io.github.jerometseng/pda_scanner"); + MethodChannel("io.github.jerometseng/flutter_plugin_pda_scanner"); // 扫码成功音频资源 static final AudioPlayer _scanSuccessAudioPlayer = AudioPlayer(); @@ -125,7 +125,7 @@ abstract class PdaUtils { static void _checkIsInit() { if (!_initFlag) { throw Exception([ - '请在合适的时机使用\nPdaUtils.init()\t或\nPdaUtils.initByCustom(action,label)\n方法初始化 pda_scanner 插件！' + '请在合适的时机使用\nPdaUtils.init()\t或\nPdaUtils.initByCustom(action,label)\n方法初始化 flutter_plugin_pda_scanner 插件！' ]); } } @@ -134,13 +134,13 @@ abstract class PdaUtils { static void _loadScanAudioPlayer() async { // 设置成功音频资源 var scanSuccessAudioResource = await rootBundle - .load('packages/pda_scanner/assets/audio/scan_success.wav'); + .load('packages/flutter_plugin_pda_scanner/assets/audio/scan_success.wav'); _scanSuccessAudioPlayer.setReleaseMode(ReleaseMode.stop); _scanSuccessAudioPlayer .setSource(BytesSource(scanSuccessAudioResource.buffer.asUint8List())); // 设置失败音频资源 var scanFailureAudioResource = await rootBundle - .load('packages/pda_scanner/assets/audio/scan_failure.wav'); + .load('packages/flutter_plugin_pda_scanner/assets/audio/scan_failure.wav'); _scanFailureAudioPlayer.setReleaseMode(ReleaseMode.stop); _scanFailureAudioPlayer .setSource(BytesSource(scanFailureAudioResource.buffer.asUint8List())); diff --git a/pubspec.yaml b/pubspec.yaml index 3a131f637a3ce7082bf0fa6aae31c555daccad4f..23ac820b01ccea8a9e31739e9d7a168d14a0d323 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,8 @@ -name: pda_scanner +name: flutter_plugin_pda_scanner description: "一个能支持多种PDA扫码的Flutter插件" -version: 3.0.2 -homepage: https://gitee.com/zengxingshun/flutter_plugin_pda_scanner +version: 3.0.4 +homepage: https://gitee.com/zengxingshun/flutter_plugin_pda_scanner/blob/master/README.md +repository: https://gitee.com/zengxingshun/flutter_plugin_pda_scanner environment: sdk: '>=3.2.3 <4.0.0' @@ -11,7 +12,7 @@ dependencies: audioplayers: 5.2.1 flutter: sdk: flutter - plugin_platform_interface: ^2.0.2 + plugin_platform_interface: ^2.1.8 dev_dependencies: flutter_test: